commit 7b54ba45a17548f2fab08895c604ac6d14eadfd6
Author: Pavel Suha <pavelsuha@Pavel--MacBook-Pro.local>
Date:   Fri Apr 25 16:31:48 2025 +0200

    test

diff --git a/addon.xml b/addon.xml
new file mode 100644
index 0000000..f1f1208
--- /dev/null
+++ b/addon.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='utf-8'?>
+<addon id="script.module.stream.resolver" name="Stream Resolver" provider-name="Gald" version="1.7.4">
+  <requires>
+    <import addon="xbmc.python" version="3.0.0" />
+    <import addon="script.common.plugin.cache" version="2.5.5"/>
+    <import addon="script.module.demjson" version="2.3.0" />
+    <import addon="script.module.beautifulsoup4" version="4.3.1"/>
+    <import addon="script.module.html5lib" version="0.999.0" />
+  </requires>
+  <extension library="lib" point="xbmc.python.module" />
+  <extension point="xbmc.addon.metadata">
+    <summary lang="cs">Kodi CZ/SK plugins common python modules mainly for resolving stream URLs 2025</summary>
+    <description lang="cs">Common python modules pack that is used by kodi cz/sk plugins</description>
+    <license>GNU GPL</license>
+    <platform>all</platform>
+  </extension>
+</addon>
diff --git a/changelog.txt b/changelog.txt
new file mode 100644
index 0000000..b8e90ff
--- /dev/null
+++ b/changelog.txt
@@ -0,0 +1,208 @@
+[B]1.6.62:[/B]
+- fix dailymotion auto quality stream
+[B]1.6.61:[/B]
+- fix youtube signature
+[B]1.6.60:[/B]
+- fix cloudflare scrape protection
+[B]1.6.59:[/B]
+- fix youtube signature
+[B]1.6.58:[/B]
+- preserve compatibility with older kodi versions
+[B]1.6.57:[/B]
+- youtube: age content
+[B]1.6.56:[/B]
+- fix youtube signature
+- recognize youtu.be scheme
+[B]1.6.55:[/B]
+- duration is now recognized as infolabels attribute
+[B]1.6.54:[/B]
+- add dailymotion resolver
+[B]1.6.52:[/B]
+- fix streamujtv resolver
+[B]1.6.48:[/B]
+- fixed video download code which was failing when there were subtitles to
+download
+[B]1.6.45:[/B]
+- support for filtering by language (needs to be passed by addon as 'lang' setting)
+[B]1.6.40:[/B]
+- add on_init hook to ContentProvider
+- fix hqq & nahnoji parsers, added sk translations (jose1711)
+[B]1.6.39:[/B]
+- Fixed Exashare, Openload and Youwatch resolvers
+- New resolver for Videram
+[B]1.6.37:[/B]
+- (for all plugins) search items can be now edited (Search Similar)
+[B]1.6.36:[/B]
+- fix streamujtv resolver to play videos with missing lang
+[B]1.6.34:[/B]
+- fix usage tracker issue on windows
+[B]1.6.30:[/B]
+- fix froto compatibility issue
+[B]1.6.29:[/B]
+- providers have now injected 'lang' - current language of xbmc/kodi user
+[B]1.6.24:[/B]
+- resolvers: support for displaying additional info (audio track language, etc)
+- streamujtv: return all possible streams (incl. audio track combinations) #223
+[B]1.6.16:[/B]
+- support for disabled subtitles by plugin setting
+- #217 - incorrect item title on some skins
+[B]1.6.15:[/B]
+- fix streamujtv resolver to correctly handle subtitles
+- another possible fix of showing captcha on windows
+[B]1.6.14:[/B]
+- fixed playedto resolver
+[B]1.6.12:[/B]
+- fixed streamujtv resolver
+- better support for dynamic context menu items
+[B]1.6.11:[/B]
+- fixed putlocker and flashx resolvers (ibv)
+[B]1.6.10:[/B]
+- attempt to fix showing captcha image on windows (when there are special
+chars in profile path)
+[B]1.6.9:[/B]
+- attempt to fix showing captcha image on windows (when there are special
+chars in xbmc profile path)
+- added anyfiles resolver
+[B]1.6.8:[/B]
+- added streamujtv resolver
+[B]1.6.7:[/B]
+- add ContentProvider.findstreams - wrapper for resolver.findstreams
+[B]1.6.6:[/B]
+- added koukejse resolver
+- improved @cached decorator
+- captcha image is now downloaded to file before showing up captcha dialog
+[B]1.6.5:[/B]
+- fixed youtube resolver (mx3L)
+- download is now more robust #174
+[B]1.6.4:[/B]
+- fixed youtube resolver (by mx3L)
+- added concurrent function (by mx3L)
+[B]1.6.2:[/B]
+- updated zkouknito resolver, added kset, publicvideohost resolvers (by mx3L)
+[B]1.6.1:[/B]
+- fixed downloading of files with special chars
+- support for @cached decorator for provider methods
+[B]1.5.6:[/B]
+- fixed koukni - works back with mp4
+[B]1.5.5:[/B]
+- contentprovider fixes (does not fail when item title starts with $, supports
+infolabels
+[B]1.5.4:[/B]
+- fixed koukni resolver to properly resolve rtmp
+- removed providers - moved to plugins
+[B]1.5.2:[/B]
+- fixed youtube resolver
+[B]1.5.1:[/B]
+- when downloaded file does not have extension, it is autoappened (.mp4)
+[B]1.5.0:[/B]
+- added resolvers flashx, videomail (ivo, mx3L)
+- resolvers can now return headers (if required for playing/downloading)
+- ContentProviders can now raise ResolveException
+- ulozto provider raises ResolveException when ulozto server is overloaded
+[B]1.4.6:[/B]
+- fixed youtube resolver
+- subtitles now work in munkvideo resolver
+[B]1.4.5:[/B]
+- ulozto provider can now search for all file types
+[B]1.4.4:[/B]
+- added munkvideo resolver
+[B]1.4.3:[/B]
+- fixed eserial resolver to load subs correctly #136
+[B]1.3.12:[/B]
+- fixed eserial resolver to support subtitles and work for more streams
+- fixed quality filtering: we always return exactly 1 stream unless user wants to select himself
+[B]1.3.11:[/B]
+- sledujuserialy resolver resolves mp4 videos as well
+- fixed #127 - searching does not work on frodo beta1
+- added eserialresolver
+- resolvers have now priority (higher=resolver is asked fist)
+[B]1.3.10:[/B]
+- fixed #127 - searching does not work on frodo beta1
+- fixed ulozto to show search results again
+- fixed sledujuserialy resolver (to resolve mp4 videos)
+[B]1.3.9:[/B]
+- got rid of old resolver API
+- fixed ulozto provider to be able to retrieve non-VIP files again
+- hellspy provider has now configurable server url and supports http://stiahnito.sk (slovak mirror)
+[B]1.3.8:[/B]
+- resolver.findstreams - prevent multiple resolving same url
+- added sledujuserialy resolver
+[B]1.3.7:[/B]
+- fixed vkontakte resolver
+[B]1.3.6:[/B]
+- fixed vkontakte resolver
+[B]1.3.4:[/B]
+- fixed youtube resolver
+- added streamcloud & gosuparg resolvers (Ivo)
+[B]1.3.3:[/B]
+- ulozto and hellspy fixed: login() failed when called repeatedly
+[B]1.3.2:[/B]
+- fixed bezvadata content provider
+- added support for delayed file download (bezvadata uses it)
+[B]1.3.1:[/B]
+- vkontakte resolver now supports 720p videos
+- added videonet resolver (thanks to Ivo Brhel), rutube resolver
+[B]1.3.0:[/B]
+- introduced ContentProvider API
+- util.py splitted to util.py and xbmcutil.py (so we're now able to run tests in non-xbmc environment)
+[B]1.2.8:[/B]
+- added nahnoji and moevideo resolvers by Ivo Brhel
+- fixed putlocker (by Ivo), videozer & videobb resolvers
+[B]1.2.7:[/B]
+- youtube resolver fixes
+- all resolvers now return non-empty 'subs' key within resolve2 or findstreams
+[B]1.2.6:[/B]
+- resolvers can now retrieve subtitles
+- added koukni.cz resovler (supports subtitles)
+[B]1.2.2:[/B]
+- bugfixes
+- search.py now supports multiple search items within one addon
+[B]1.2.0:[/B]
+- added method to prelace czech diaktitic chars
+- fixed divByZero when downloading, made notifications more robust
+[B]1.1.7:[/B]
+- new API for stream resolving - quality aware API
+- youtube and vkontakte now implement quality aware API, others have dummy
+impl only
+[B]1.1.6:[/B]
+- another small fix of youtuberesolver
+- fixed videobb and videozer resovlers, thanks to Lynx187
+[B]1.1.5:[/B]
+- added higher level searching API
+- fixed youtuberesolver
+[B]1.1.4:[/B]
+- added dependency on script.usage.tracker
+[B]1.1.3:[/B]
+- download notification: added EST
+[B]1.1.2:[/B]
+- saved searches can be removed now
+[B]1.1.0:[/B]
+- added new API for retrieving common icons from github
+- fixed downloading to report dialog on finish (when not playing)
+[B]1.0.8:[/B]
+- added new API for downloading, browsing local folders
+- fixed string encoding issues
+- fixed zideo resolver
+[B]1.0.7:[/B]
+- added servertip.cz resolver
+- fixed youtube
+- added api for search history
+- added simplejson dependency
+[B]1.0.6:[/B]
+- added zideo.nl
+- stagevu - do not fail if movie was removed
+- videobb - proper resolving
+[B]1.0.5:[/B]
+- added novamov, youtube, trivial - special does nothing
+- fixed megavideo and videozer
+[B]1.0.4:[/B]
+- added megavideo, videozer resolvers
+- fixed zkouknito
+[B]1.0.3:[/B]
+- added other resolvers
+- added simple debug logging
+- all resovlers renamed not to collide with other 3rd party on Camelot
+[B]1.0.1:[/B]
+ - added putlocker resolver
+[B]1.0.0:[/B]
+Initial version
diff --git a/install.sh b/install.sh
new file mode 100644
index 0000000..dd30da9
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,7 @@
+#/bin/sh
+# do NOT use this script from Kodi addons directory, it is intented for development only
+DESTDIR=~/.kodi/addons/script.module.stream.resolver
+
+rm -rf ${DESTDIR}
+mkdir -p ${DESTDIR}
+cp -a * ${DESTDIR}
diff --git a/lib/__init__.py b/lib/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/lib/__pycache__/aadecode.cpython-38.opt-1.pyc b/lib/__pycache__/aadecode.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..e82e104
Binary files /dev/null and b/lib/__pycache__/aadecode.cpython-38.opt-1.pyc differ
diff --git a/lib/__pycache__/cloudflare.cpython-38.opt-1.pyc b/lib/__pycache__/cloudflare.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..dbf9106
Binary files /dev/null and b/lib/__pycache__/cloudflare.cpython-38.opt-1.pyc differ
diff --git a/lib/__pycache__/resolver.cpython-38.opt-1.pyc b/lib/__pycache__/resolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..f9334f9
Binary files /dev/null and b/lib/__pycache__/resolver.cpython-38.opt-1.pyc differ
diff --git a/lib/__pycache__/search.cpython-38.opt-1.pyc b/lib/__pycache__/search.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..f201d3c
Binary files /dev/null and b/lib/__pycache__/search.cpython-38.opt-1.pyc differ
diff --git a/lib/__pycache__/util.cpython-38.opt-1.pyc b/lib/__pycache__/util.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..9383f77
Binary files /dev/null and b/lib/__pycache__/util.cpython-38.opt-1.pyc differ
diff --git a/lib/__pycache__/xbmcutil.cpython-38.opt-1.pyc b/lib/__pycache__/xbmcutil.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..bdcf05a
Binary files /dev/null and b/lib/__pycache__/xbmcutil.cpython-38.opt-1.pyc differ
diff --git a/lib/aadecode.py b/lib/aadecode.py
new file mode 100644
index 0000000..92135a2
--- /dev/null
+++ b/lib/aadecode.py
@@ -0,0 +1,209 @@
+#-*- coding: utf-8 -*-
+#
+# author : Djeman
+# Updated by Shani-08 (https://github.com/Shani-08/ShaniXBMCWork2)
+
+import re
+
+class AADecoder(object):
+    def __init__(self, aa_encoded_data):
+        self.encoded_str = aa_encoded_data.replace('/*´∇｀*/','')
+
+        self.b = ["(c^_^o)", "(ﾟΘﾟ)", "((o^_^o) - (ﾟΘﾟ))", "(o^_^o)",
+                  "(ﾟｰﾟ)", "((ﾟｰﾟ) + (ﾟΘﾟ))", "((o^_^o) +(o^_^o))", "((ﾟｰﾟ) + (o^_^o))",
+                  "((ﾟｰﾟ) + (ﾟｰﾟ))", "((ﾟｰﾟ) + (ﾟｰﾟ) + (ﾟΘﾟ))", "(ﾟДﾟ) .ﾟωﾟﾉ", "(ﾟДﾟ) .ﾟΘﾟﾉ",
+                  "(ﾟДﾟ) ['c']", "(ﾟДﾟ) .ﾟｰﾟﾉ", "(ﾟДﾟ) .ﾟДﾟﾉ", "(ﾟДﾟ) [ﾟΘﾟ]"]
+
+    def is_aaencoded(self):
+        idx = self.encoded_str.find("ﾟωﾟﾉ= /｀ｍ´）ﾉ ~┻━┻   //*´∇｀*/ ['_']; o=(ﾟｰﾟ)  =_=3; c=(ﾟΘﾟ) =(ﾟｰﾟ)-(ﾟｰﾟ); ")
+        if idx == -1:
+            return False
+
+        if self.encoded_str.find("(ﾟДﾟ)[ﾟoﾟ]) (ﾟΘﾟ)) ('_');", idx) == -1:
+            return False
+
+        return True
+
+    def base_repr(self, number, base=2, padding=0):
+        digits = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        if base > len(digits):
+            base = len(digits)
+
+        num = abs(number)
+        res = []
+        while num:
+            res.append(digits[num % base])
+            num //= base
+        if padding:
+            res.append('0' * padding)
+        if number < 0:
+            res.append('-')
+        return ''.join(reversed(res or '0'))
+
+    def decode_char(self, enc_char, radix):
+        end_char = "+ "
+        str_char = ""
+        while enc_char != '':
+            found = False
+
+            if not found:
+                for i in range(len(self.b)):             
+                    enc_char=enc_char.replace(self.b[i], str(i))
+                
+                startpos=0
+                findClose=True
+                balance=1
+                result=[]
+                if enc_char.startswith('('):
+                    l=0
+                    
+                    for t in enc_char[1:]:
+                        l+=1
+                        if findClose and t==')':
+                            balance-=1;
+                            if balance==0:
+                                result+=[enc_char[startpos:l+1]]
+                                findClose=False
+                                continue
+                        elif not findClose and t=='(':
+                            startpos=l
+                            findClose=True
+                            balance=1
+                            continue
+                        elif t=='(':
+                            balance+=1
+                 
+
+                if result is None or len(result)==0:
+                    return ""
+                else:
+                    
+                    for r in result:
+                        value = self.decode_digit(r, radix)
+                        if value == "":
+                            return ""
+                        else:
+                            str_char += value
+                            
+                    return str_char
+
+            enc_char = enc_char[len(end_char):]
+
+        return str_char
+
+        
+              
+    def decode_digit(self, enc_int, radix):
+
+        rr = '(\(.+?\)\))\+'
+        rerr=enc_int.split('))+')
+        v = ''
+        
+        #new mode
+
+        for c in rerr:
+            
+            if len(c)>0:
+                if c.strip().endswith('+'):
+                    c=c.strip()[:-1]
+
+                startbrackets=len(c)-len(c.replace('(',''))
+                endbrackets=len(c)-len(c.replace(')',''))
+                    
+                if startbrackets>endbrackets:
+                    c+=')'*startbrackets-endbrackets
+                    
+                c = c.replace('!+[]','1')
+                c = c.replace('-~','1+')
+                c = c.replace('[]','0')
+                    
+                v+=str(eval(c))
+                    
+        return v
+         
+        mode = 0
+        value = 0
+
+        while enc_int != '':
+            found = False
+            for i in range(len(self.b)):
+                if enc_int.find(self.b[i]) == 0:
+                    if mode == 0:
+                        value += i
+                    else:
+                        value -= i
+                    enc_int = enc_int[len(self.b[i]):]
+                    found = True
+                    break
+
+            if not found:
+                return ""
+
+            enc_int = re.sub('^\s+|\s+$', '', enc_int)
+            if enc_int.find("+") == 0:
+                mode = 0
+            else:
+                mode = 1
+
+            enc_int = enc_int[1:]
+            enc_int = re.sub('^\s+|\s+$', '', enc_int)
+
+        return self.base_repr(value, radix)
+
+    def decode(self):
+
+        self.encoded_str = re.sub('^\s+|\s+$', '', self.encoded_str)
+
+        # get data
+        pattern = (r"\(ﾟДﾟ\)\[ﾟoﾟ\]\+ (.+?)\(ﾟДﾟ\)\[ﾟoﾟ\]\)")
+        result = re.search(pattern, self.encoded_str, re.DOTALL)
+        if result is None:
+            print("AADecoder: data not found")
+            return False
+
+        data = result.group(1)
+
+        # hex decode string
+        begin_char = "(ﾟДﾟ)[ﾟεﾟ]+"
+        alt_char = "(oﾟｰﾟo)+ "
+
+        out = ''
+
+        while data != '':
+            # Check new char
+            if data.find(begin_char) != 0:
+                print("AADecoder: data not found")
+                return False
+
+            data = data[len(begin_char):]
+
+            # Find encoded char
+            enc_char = ""
+            if data.find(begin_char) == -1:
+                enc_char = data
+                data = ""
+            else:
+                enc_char = data[:data.find(begin_char)]
+                data = data[len(enc_char):]
+
+            
+            radix = 8
+            # Detect radix 16 for utf8 char
+            if enc_char.find(alt_char) == 0:
+                enc_char = enc_char[len(alt_char):]
+                radix = 16
+
+            str_char = self.decode_char(enc_char, radix)
+            
+            if str_char == "":
+                print("no match :  ")
+                print(data + "\nout = " + out + "\n")
+                return False
+            
+            out += chr(int(str_char, radix))
+
+        if out == "":
+            print("no match : " + data)
+            return False
+
+        return out
diff --git a/lib/cloudflare.py b/lib/cloudflare.py
new file mode 100644
index 0000000..855d90d
--- /dev/null
+++ b/lib/cloudflare.py
@@ -0,0 +1,189 @@
+# -*- coding: utf-8 -*-
+#
+#      Copyright (C) 2015 tknorris (Derived from Mikey1234's & Lambda's)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with XBMC; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+#
+#  This code is a derivative of the YouTube plugin for XBMC and associated works
+#  released under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 3
+
+import re
+import urllib.request, urllib.parse, urllib.error
+import urllib.parse
+import util
+import xbmc
+
+MAX_TRIES = 3
+COMPONENT = __name__
+
+
+class NoRedirection(urllib.request.HTTPErrorProcessor):
+
+    def http_response(self, request, response):
+        util.info('[CF] Stopping Redirect')
+        return response
+
+    https_response = http_response
+
+def solve_equation(equation):
+    try:
+        offset = (1 if equation[0] == '+' else 0)
+        ev = equation.replace('!+[]', '1').replace('!![]',
+                   '1').replace('[]', '0').replace('(', 'str(')[offset:]
+        ev = re.sub(r'^str', 'float', re.sub(r'\/(.)str', r'/\1float', ev))
+        # util.debug('[CF] eval: {0}'.format(ev))
+        return float(eval(ev))
+    except:
+        pass
+
+
+def solve(url, cj, user_agent=None, wait=True):
+    if user_agent is None:
+        user_agent = util.UA
+    headers = {'User-Agent': user_agent, 'Referer': url}
+    if cj is not None:
+        try:
+            cj.load(ignore_discard=True)
+        except:
+            pass
+        opener = urllib.request.build_opener(urllib.request.HTTPCookieProcessor(cj))
+        urllib.request.install_opener(opener)
+
+    scheme = urllib.parse.urlparse(url).scheme
+    domain = urllib.parse.urlparse(url).hostname
+    request = urllib.request.Request(url)
+    for key in headers:
+        request.add_header(key, headers[key])
+    try:
+        response = urllib.request.urlopen(request)
+        html = response.read()
+    except urllib.error.HTTPError as e:
+        html = e.read()
+
+    tries = 0
+    while tries < MAX_TRIES:
+        solver_pattern = \
+            'var (?:s,t,o,p,b,r,e,a,k,i,n,g|t,r,a),f,\s*([^=]+)'
+        solver_pattern += \
+            '={"([^"]+)":([^}]+)};.+challenge-form\'\);'
+        vc_pattern = \
+            'input type="hidden" name="jschl_vc" value="([^"]+)'
+        pass_pattern = 'input type="hidden" name="pass" value="([^"]+)'
+        s_pattern = 'input type="hidden" name="s" value="([^"]+)'
+        init_match = re.search(solver_pattern, html, re.DOTALL)
+        vc_match = re.search(vc_pattern, html)
+        pass_match = re.search(pass_pattern, html)
+        s_match = re.search(s_pattern, html)
+
+        if not init_match or not vc_match or not pass_match or not s_match:
+            msg = \
+                "[CF] Couldn't find attribute: init: |%s| vc: |%s| pass: |%s| No cloudflare check?"
+            util.info(msg % (init_match, vc_match, pass_match))
+            return False
+
+        (init_dict, init_var, init_equation) = \
+            init_match.groups()
+        vc = vc_match.group(1)
+        password = pass_match.group(1)
+        s = s_match.group(1)
+
+        equations = re.compile(r"challenge-form\'\);\s*(.*)a.v").findall(html)[0]
+        # util.info("[CF] VC is: %s" % (vc))
+        varname = (init_dict, init_var)
+        # util.info('[CF] init: [{0}]'.format((init_equation.rstrip())))
+        result = float(solve_equation(init_equation.rstrip()))
+        util.info('[CF] Initial value: [ {0} ] Result: [ {1} ]'.format(init_equation,
+                  result))
+
+        for equation in equations.split(';'):
+            equation = equation.rstrip()
+            if len(equation) > len('.'.join(varname)):
+                # util.debug('[CF] varname {0} line {1}'.format('.'.join(varname), equation))
+                if equation[:len('.'.join(varname))] != '.'.join(varname):
+                    util.info('[CF] Equation does not start with varname |%s|'
+                              % equation)
+                else:
+                    equation = equation[len('.'.join(varname)):]
+
+                expression = equation[2:]
+                operator = equation[0]
+                if operator not in ['+', '-', '*', '/']:
+                    util.info('[CF] Unknown operator: |%s|' % equation)
+                    continue
+
+                result = float(str(eval(str(result) + operator + str(solve_equation(
+                    expression)))))
+                #util.info('[CF] intermediate: %s = %s' % (equation, result))
+
+        #util.debug('[CF] POCET: {0} {1}'.format(result, len(domain)))
+        result = '{0:.10f}'.format(eval('float({0} + {1})'.format(result, len(domain))))
+        util.info('[CF] Final Result: |%s|' % result)
+
+        if wait:
+            util.info('[CF] Sleeping for 5 Seconds')
+            xbmc.sleep(5000)
+
+        url = \
+            '%s://%s/cdn-cgi/l/chk_jschl?s=%s&jschl_vc=%s&pass=%s&jschl_answer=%s' \
+            % (scheme, domain, urllib.parse.quote(s), urllib.parse.quote(vc), urllib.parse.quote(password), urllib.parse.quote(result))
+        # util.info('[CF] url: %s' % url)
+        # util.debug('[CF] headers: {0}'.format(headers))
+        request = urllib.request.Request(url)
+        for key in headers:
+            request.add_header(key, headers[key])
+
+        try:
+            opener = urllib.request.build_opener(NoRedirection)
+            urllib.request.install_opener(opener)
+            response = urllib.request.urlopen(request)
+            # util.info('[CF] code: {}'.format(response.getcode()))
+            while response.getcode() in [301, 302, 303, 307]:
+                if cj is not None:
+                    cj.extract_cookies(response, request)
+
+                redir_url = response.info().getheader('location')
+                if not redir_url.startswith('http'):
+                    base_url = '%s://%s' % (scheme, domain)
+                    redir_url = urllib.parse.urljoin(base_url, redir_url)
+
+                request = urllib.request.Request(redir_url)
+                for key in headers:
+                    request.add_header(key, headers[key])
+                if cj is not None:
+                    cj.add_cookie_header(request)
+
+                response = urllib.request.urlopen(request)
+            final = response.read()
+            if 'cf-browser-verification' in final:
+                util.info('[CF] Failure: html: %s url: %s' % (html, url))
+                tries += 1
+                html = final
+            else:
+                break
+        except urllib.error.HTTPError as e:
+            util.info('[CF] HTTP Error: %s on url: %s' % (e.code,
+                      url))
+            return False
+        except urllib.error.URLError as e:
+            util.info('[CF] URLError Error: %s on url: %s' % (e,
+                      url))
+            return False
+
+    if cj is not None:
+        util.cache_cookies()
+
+    return final
diff --git a/lib/contentprovider/__pycache__/provider.cpython-38.opt-1.pyc b/lib/contentprovider/__pycache__/provider.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..a2599ca
Binary files /dev/null and b/lib/contentprovider/__pycache__/provider.cpython-38.opt-1.pyc differ
diff --git a/lib/contentprovider/__pycache__/xbmcprovider.cpython-38.opt-1.pyc b/lib/contentprovider/__pycache__/xbmcprovider.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..11d95fb
Binary files /dev/null and b/lib/contentprovider/__pycache__/xbmcprovider.cpython-38.opt-1.pyc differ
diff --git a/lib/contentprovider/provider.py b/lib/contentprovider/provider.py
new file mode 100644
index 0000000..8536a39
--- /dev/null
+++ b/lib/contentprovider/provider.py
@@ -0,0 +1,230 @@
+# *      Copyright (C) 2012 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+from collections import defaultdict
+
+import util
+import resolver
+
+
+try:
+    import StorageServer
+except ImportError:
+    print('Using dummy storage server')
+    import storageserverdummy as StorageServer
+
+
+class ResolveException(Exception):
+    pass
+
+
+class ContentProvider(object):
+    """
+    ContentProvider class provides an internet content. It should NOT have any xbmc-related imports
+    and must be testable without XBMC runtime. This is a basic/dummy implementation.
+    """
+
+    def __init__(self, name='dummy', base_url='/', username=None, password=None, filter=None, tmp_dir='.'):
+        """
+        ContentProvider constructor
+        Args:
+            name (str): name of provider
+            base_url (str): base url of site being accessed
+            username (str): login username
+            password (str): login password
+            filter (func{item}): function to filter results returned by search or list methods
+            tmp_dir (str): temporary dir where provider can store/cache files
+        """
+        self.name = name
+        self.username = username
+        self.password = password
+        if not base_url[-1] == '/':
+            base_url += '/'
+        self.base_url = base_url
+        self.filter = filter
+        self.tmp_dir = tmp_dir
+        self.cache = StorageServer.StorageServer(self.name, 24)
+        self.lang = 'cs' # initialize, current language could be set by XBMContentProvider
+
+    def __str__(self):
+        return 'ContentProvider' + self.name
+
+    def on_init(self):
+        """
+        This function gets called by XbmcContentProvider after it initializes itself
+        and sets eveything up (especially 'lang' property of ContentProvider which gets detected
+        from kodi)
+        """
+        pass
+
+    def capabilities(self):
+        """
+        This way class defines which capabilities it provides ['login','search','resolve','categories']
+        It may also contain '!download' when provider does not support downloading
+        """
+        return []
+
+    def video_item(self, url='', img='', quality='???'):
+        """
+        Returns empty video item - contains all required fields
+        """
+        return {'type': 'video', 'title': '', 'rating': 0, 'year': 0, 'size': '0MB', 'url': url, 'img': img,
+                'length': '', 'quality': quality, 'subs': '', 'surl': '', 'lang': ''}
+
+    def dir_item(self, title='', url='', type='dir'):
+        """
+        Returns empty directory item
+        """
+        return {'type': type, 'title': title, 'size': '0', 'url': url}
+
+    def login(self):
+        """
+        A login method returns True on successfull login, False otherwise
+        """
+        return False
+
+    def search(self, keyword):
+        """
+        Search for a keyword on a site
+        Args:
+                    keyword (str)
+
+        returns:
+            array of video or directory items
+        """
+        return []
+
+    def list(self, url):
+        """
+        Lists content on given url
+        Args:
+                    url (str): either relative or absolute provider URL
+
+        Returns:
+            array of video or directory items
+
+        """
+        return []
+
+    def categories(self):
+        """
+        Lists categories on provided site
+
+        Returns:
+            array of video or directory items
+        """
+        return []
+
+    def findstreams(self, data, regexes=None):
+        """
+        Finds streams in given data (see resovler.findstreams for more details)
+
+        :param data: A string (piece of HTML, for example) or an array of URLs
+        :param regexes: An array of regexes to be used for extracting URLs from
+                        'data' of type 'string'
+        :returns: An array of video items
+        """
+        resolved = resolver.findstreams(data, regexes)
+        if resolved is None:
+            raise ResolveException(
+                'Nelze ziskat video link [CR]zkontrolujte jestli video nebylo odstraneno')
+        elif isinstance(resolved, list) and not resolved:
+            raise ResolveException('Video je na serveru, ktery neni podporovan')
+        elif not resolved:
+            raise ResolveException(
+                'Nebyl nalezen zadny video embed [CR]zkontrolujte stranku pripadne nahlaste chybu pluginu')
+        result = []
+        for j in resolved:
+            i = defaultdict(lambda: '', j)
+            item = self.video_item()
+            item['title'] = i['name']
+            item['url'] = i['url']
+            item['quality'] = i['quality']
+            item['surl'] = i['surl']
+            item['subs'] = i['subs']
+            item['headers'] = i['headers']
+            item['lang'] = i['lang']
+            item['info'] = i['info']
+            result.append(item)
+        return result
+
+    def resolve(self, item, captcha_cb=None, select_cb=None, wait_cb=None):
+        """
+        Resolves given video item  to a downloable/playable file/stream URL
+
+        Args:
+            url (str): relative or absolute URL to be resolved
+            captcha_cb(func{obj}): callback function when user input is required (captcha, one-time passwords etc).
+            function implementation must be Provider-specific
+            select_cb(func{array}): callback function for cases when given url resolves to multiple streams,
+            provider class may call this function and require user interaction
+            wait_cb(func{obj}): callback function for cases when url resolves to stream which becomes available
+            somewhere in future (typically in several seconds). Provider may call this and require waiting.
+        Returns:
+            None - if ``url`` was not resolved. Video item with 'url' key pointing to resolved target
+        """
+        return None
+
+    def _url(self, url):
+        """
+        Transforms relative to absolute url based on ``base_url`` class property
+        """
+        if url.startswith('http'):
+            return url
+        return self.base_url + url.lstrip('./')
+
+    def _filter(self, result, item):
+        """
+        Applies filter, if filter passes `item` is appended to `result`
+
+        Args:
+            result (array) : target array
+            item (obj) : item that is being applied filter on
+        """
+        if self.filter:
+            if self.filter(item):
+                result.append(item)
+        else:
+            result.append(item)
+
+    def info(self, msg):
+        util.info('[%s] %s' % (self.name, msg))
+
+    def error(self, msg):
+        util.error('[%s] %s' % (self.name, msg))
+
+
+class cached(object):
+    """
+    A method decorator that can be used on any ContentProvider method
+    Having this decorator means that results of such method are going
+    to be cached for 24hours by default. You can pass number argument
+    to decorator, for example @cached(1) would cache for 1 hour.
+    """
+
+    def __init__(self, ttl=24):
+        self.ttl = ttl
+
+    def __call__(self, f):
+        def wrap(*args):
+            provider = args[0]
+            cache = StorageServer.StorageServer(provider.name + str(self.ttl), self.ttl)
+            return cache.cacheFunction(f, *args)
+
+        return wrap
diff --git a/lib/contentprovider/xbmcprovider.py b/lib/contentprovider/xbmcprovider.py
new file mode 100644
index 0000000..f7e1401
--- /dev/null
+++ b/lib/contentprovider/xbmcprovider.py
@@ -0,0 +1,464 @@
+# *      Copyright (C) 2012 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+
+import sys
+import os
+import re
+import traceback
+import util
+import xbmcutil
+import resolver
+import time
+import xbmcplugin
+import xbmc
+import xbmcvfs
+import xbmcgui
+import urllib.parse
+import urllib.request, urllib.parse, urllib.error
+from collections import defaultdict
+from provider import ResolveException
+
+
+class XBMContentProvider(object):
+    '''
+    ContentProvider class provides an internet content. It should NOT have any xbmc-related imports
+    and must be testable without XBMC runtime. This is a basic/dummy implementation.
+    '''
+
+    def __init__(self, provider, settings, addon):
+        '''
+        XBMContentProvider constructor
+        Args:
+            name (str): name of provider
+        '''
+        self.provider = provider
+        # inject current user language
+        try:  # not fully supported on Frodo
+            provider.lang = xbmc.getLanguage(xbmc.ISO_639_1)
+        except:
+            provider.lang = None
+            pass
+        self.settings = settings
+        # lang setting is optional for plugins
+        if not 'lang' in self.settings:
+            self.settings['lang'] = '0'
+
+        util.info('Initializing provider %s with settings %s' % (provider.name, settings))
+        self.addon = addon
+        self.addon_id = addon.getAddonInfo('id')
+        if '!download' not in self.provider.capabilities():
+            self.check_setting_keys(['downloads'])
+        self.cache = provider.cache
+        provider.on_init()
+
+    def check_setting_keys(self, keys):
+        for key in keys:
+            if not key in list(self.settings.keys()):
+                raise Exception('Invalid settings passed - [' + key + '] setting is required')
+
+    def params(self):
+        return {'cp': self.provider.name}
+
+    def run(self, params):
+        if params == {} or params == self.params():
+            return self.root()
+        if 'list' in list(params.keys()):
+            self.list(self.provider.list(params['list']))
+            return xbmcplugin.endOfDirectory(int(sys.argv[1]))
+        if 'down' in list(params.keys()):
+            return self.download({'url': params['down'], 'title': params['title']})
+        if 'play' in list(params.keys()):
+            return self.play({'url': params['play'], 'info': params})
+        if 'search-list' in list(params.keys()):
+            return self.search_list()
+        if 'search' in list(params.keys()):
+            return self.do_search(params['search'])
+        if 'search-remove' in list(params.keys()):
+            return self.search_remove(params['search-remove'])
+        if 'search-edit' in list(params.keys()):
+            return self.search_edit(params['search-edit'])
+        if self.run_custom:
+            return self.run_custom(params)
+
+    def search_list(self):
+        params = self.params()
+        params.update({'search': '#'})
+        menu1 = self.params()
+        menu2 = self.params()
+        xbmcutil.add_dir(xbmcutil.__lang__(30004), params, xbmcutil.icon('search.png'))
+        for what in xbmcutil.search_list(self.cache):
+            params['search'] = what
+            menu1['search-remove'] = what
+            menu2['search-edit'] = what
+            xbmcutil.add_dir(what, params, menuItems={xbmcutil.__lang__(
+                30016): menu2, xbmc.getLocalizedString(117): menu1})
+        xbmcplugin.endOfDirectory(int(sys.argv[1]))
+
+    def search_remove(self, what):
+        xbmcutil.search_remove(self.cache, what)
+        xbmc.executebuiltin('Container.Refresh')
+
+    def search_edit(self, what):
+        kb = xbmc.Keyboard(what, xbmcutil.__lang__(30003), False)
+        kb.doModal()
+        if kb.isConfirmed():
+            replacement = kb.getText()
+            xbmcutil.search_replace(self.cache, what, replacement)
+            params = self.params()
+            params.update({'search': replacement})
+            action = xbmcutil._create_plugin_url(params)
+            xbmc.executebuiltin('Container.Update(%s)' % action)
+
+    def do_search(self, what):
+        if what == '' or what == '#':
+            kb = xbmc.Keyboard('', xbmcutil.__lang__(30003), False)
+            kb.doModal()
+            if kb.isConfirmed():
+                what = kb.getText()
+        if not what == '':
+            maximum = 20
+            try:
+                maximum = int(self.settings['keep-searches'])
+            except:
+                util.error('Unable to parse convert addon setting to number')
+                pass
+            xbmcutil.search_add(self.cache, what, maximum)
+            self.search(what)
+
+    def root(self):
+        searches = xbmcutil.get_searches(self.addon, self.provider.name)
+        if len(searches) > 0:
+            self.provider.info('Upgrading to new saved search storage...')
+            for s in searches:
+                self.provider.info('Moving item %s' % s)
+                xbmcutil.search_add(self.cache, s, 9999999)
+            xbmcutil.delete_search_history(self.addon, self.provider.name)
+
+        if 'search' in self.provider.capabilities():
+            params = self.params()
+            params.update({'search-list': '#'})
+            xbmcutil.add_dir(xbmcutil.__lang__(30003), params, xbmcutil.icon('search.png'))
+        if not '!download' in self.provider.capabilities():
+            xbmcutil.add_local_dir(xbmcutil.__lang__(30006), self.settings[
+                                   'downloads'], xbmcutil.icon('download.png'))
+        self.list(self.provider.categories())
+        return xbmcplugin.endOfDirectory(int(sys.argv[1]))
+
+    def download(self, item):
+        downloads = self.settings['downloads']
+        if '' == downloads:
+            xbmcgui.Dialog().ok(self.provider.name, xbmcutil.__lang__(30009))
+            return
+        stream = self.resolve(item['url'])
+        if stream:
+            if not 'headers' in list(stream.keys()):
+                stream['headers'] = {}
+            xbmcutil.reportUsage(self.addon_id, self.addon_id + '/download')
+            # clean up \ and /
+            name = item['title'].replace('/', '_').replace('\\', '_')
+            if not stream['subs'] == '':
+                xbmcutil.save_to_file(stream['subs'], os.path.join(
+                    downloads, name + '.srt'), stream['headers'])
+            dot = name.find('.')
+            if dot <= 0:
+                # name does not contain extension, append some
+                name += '.mp4'
+            xbmcutil.download(self.addon, name, self.provider._url(
+                stream['url']), os.path.join(downloads, name), headers=stream['headers'])
+
+    def play(self, item):
+        stream = self.resolve(item['url'])
+        if stream:
+            xbmcutil.reportUsage(self.addon_id, self.addon_id + '/play')
+            if 'headers' in list(stream.keys()):
+                headerStr = '|' + urllib.parse.urlencode(stream['headers'])
+                if len(headerStr) > 1:
+                    stream['url'] += headerStr.encode('utf-8')
+            print('Sending %s to player' % stream['url'])
+            li = xbmcgui.ListItem(path=stream['url'])
+            li.setArt({'icon': 'DefaulVideo.png'})
+            il = self._extract_infolabels(item['info'])
+            if len(il) > 0:  # only set when something was extracted
+                li.setInfo('video', il)
+            try:
+                local_subs = xbmcutil.set_subtitles(li, stream['subs'], stream.get('headers'))
+            except:
+                xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, li)
+                xbmcutil.load_subtitles(stream['subs'], stream.get('headers'))
+            else:
+                xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, li)
+
+    def _handle_exc(self, e):
+        msg = e.message
+        if msg.find('$') == 0:
+            try:
+                msg = self.addon.getLocalizedString(int(msg[1:]))
+            except:
+                try:
+                    msg = xbmcutil.__lang__(int(msg[1:]))
+                except:
+                    pass
+        xbmcgui.Dialog().ok(self.provider.name, msg)
+
+    def resolve(self, url):
+        item = self.provider.video_item()
+        item.update({'url': url})
+        try:
+            return self.provider.resolve(item)
+        except ResolveException as e:
+            self._handle_exc(e)
+
+    def search(self, keyword):
+        self.list(self.provider.search(keyword))
+        return xbmcplugin.endOfDirectory(int(sys.argv[1]))
+
+    def list(self, items):
+        params = self.params()
+        for item in items:
+            if item['type'] == 'dir':
+                self.render_dir(item)
+            elif item['type'] == 'next':
+                params.update({'list': item['url']})
+                xbmcutil.add_dir(xbmcutil.__lang__(30007), params, xbmcutil.icon('next.png'))
+            elif item['type'] == 'prev':
+                params.update({'list': item['url']})
+                xbmcutil.add_dir(xbmcutil.__lang__(30008), params, xbmcutil.icon('prev.png'))
+            elif item['type'] == 'new':
+                params.update({'list': item['url']})
+                xbmcutil.add_dir(xbmcutil.__lang__(30012), params, xbmcutil.icon('new.png'))
+            elif item['type'] == 'top':
+                params.update({'list': item['url']})
+                xbmcutil.add_dir(xbmcutil.__lang__(30013), params, xbmcutil.icon('top.png'))
+            elif item['type'] == 'video':
+                self.render_video(item)
+            else:
+                self.render_default(item)
+
+    def render_default(self, item):
+        raise Exception("Unable to render item " + str(item))
+
+    def render_dir(self, item):
+        params = self.params()
+        params.update({'list': item['url']})
+        title = item['title']
+        img = None
+        if 'img' in list(item.keys()):
+            img = item['img']
+        if title.find('$') == 0:
+            try:
+                title = self.addon.getLocalizedString(int(title[1:]))
+            except:
+                pass
+        menuItems = {}
+        if 'menu' in list(item.keys()):
+            for ctxtitle, value in item['menu'].items():
+                if ctxtitle.find('$') == 0:
+                    try:
+                        ctxtitle = self.addon.getLocalizedString(int(ctxtitle[1:]))
+                    except:
+                        pass
+                menuItems[ctxtitle] = value
+        xbmcutil.add_dir(title, params, img, infoLabels=self._extract_infolabels(
+            item), menuItems=menuItems)
+
+    def _extract_infolabels(self, item):
+        infoLabels = {}
+        for label in ['title', 'plot', 'year', 'genre', 'rating', 'director',
+                      'votes', 'cast', 'trailer', 'tvshowtitle', 'season',
+                      'episode', 'duration']:
+            if label in list(item.keys()):
+                infoLabels[label] = util.decode_html(item[label])
+        return infoLabels
+
+    def render_video(self, item):
+        params = self.params()
+        params.update({'play': item['url']})
+        downparams = self.params()
+        downparams.update({'title': item['title'], 'down': item['url']})
+        def_item = self.provider.video_item()
+        if item['size'] == def_item['size']:
+            item['size'] = ''
+        else:
+            item['size'] = ' (%s)' % item['size']
+        title = '%s%s' % (item['title'], item['size'])
+        menuItems = {}
+        if "!download" not in self.provider.capabilities():
+            menuItems[xbmc.getLocalizedString(33003)] = downparams
+        if 'menu' in list(item.keys()):
+            for ctxtitle, value in item['menu'].items():
+                if ctxtitle.find('$') == 0:
+                    try:
+                        ctxtitle = self.addon.getLocalizedString(int(ctxtitle[1:]))
+                    except:
+                        pass
+                menuItems[ctxtitle] = value
+        xbmcutil.add_video(title,
+                           params,
+                           item['img'],
+                           infoLabels=self._extract_infolabels(item),
+                           menuItems=menuItems
+                           )
+
+    def categories(self):
+        self.list(self.provider.categories(keyword))
+        return xbmcplugin.endOfDirectory(int(sys.argv[1]))
+
+
+class XBMCMultiResolverContentProvider(XBMContentProvider):
+
+    def __init__(self, provider, settings, addon):
+        XBMContentProvider.__init__(self, provider, settings, addon)
+        self.check_setting_keys(['quality'])
+
+    def resolve(self, url):
+        item = self.provider.video_item()
+        item.update({'url': url})
+
+        def select_cb(resolved):
+
+            quality = self.settings['quality'] or '0'
+            filtered = resolver.filter_by_quality(resolved, quality)
+            lang = self.settings['lang'] or '0'
+            filtered = resolver.filter_by_language(filtered, lang)
+            # if user requested something but 'ask me' or filtered result is exactly 1
+            if len(filtered) == 1 or (int(quality) > 0 and int(lang) == 0):
+                return filtered[0]
+            # if user requested particular language and we have it
+            if len(filtered) > 0 and int(lang) > 0:
+                return filtered[0]
+            dialog = xbmcgui.Dialog()
+            opts = []
+            for r in resolved:
+                d = defaultdict(lambda: '', r)
+                opts.append('%s [%s] %s' % (d['title'], d['quality'], d['lang']))
+            ret = dialog.select(xbmcutil.__lang__(30005), opts)
+            if ret >= 0:
+                return resolved[ret]
+        try:
+            return self.provider.resolve(item, select_cb=select_cb)
+        except ResolveException as e:
+            self._handle_exc(e)
+
+
+class XBMCLoginRequiredContentProvider(XBMContentProvider):
+
+    def root(self):
+        if not self.provider.login():
+            xbmcgui.Dialog().ok(self.provider.name, xbmcutil.__lang__(30011))
+        else:
+            return XBMContentProvider.root(self)
+
+
+class XBMCLoginOptionalContentProvider(XBMContentProvider):
+
+    def __init__(self, provider, settings, addon):
+        XBMContentProvider.__init__(self, provider, settings, addon)
+        self.check_setting_keys(['vip'])
+
+    def ask_for_captcha(self, params):
+        img = os.path.join(str(xbmcvfs.translatePath(
+            self.addon.getAddonInfo('profile'))), 'captcha.png')
+        util.save_to_file(params['img'], img)
+        cd = CaptchaDialog('captcha-dialog.xml',
+                           xbmcutil.__addon__.getAddonInfo('path'), 'default', '0')
+        cd.image = img
+        xbmc.sleep(3000)
+        cd.doModal()
+        del cd
+        kb = xbmc.Keyboard('', self.addon.getLocalizedString(200), False)
+        kb.doModal()
+        if kb.isConfirmed():
+            print('got code ' + kb.getText())
+            return kb.getText()
+
+    def ask_for_account_type(self):
+        if len(self.provider.username) == 0:
+            util.info('Username is not set, NOT using VIP account')
+            return False
+        if self.settings['vip'] == '0':
+            util.info('Asking user whether to use VIP account')
+            ret = xbmcgui.Dialog().yesno(self.provider.name, xbmcutil.__lang__(30010))
+            return ret == 1
+        return self.settings['vip'] == '1'
+
+    def resolve(self, url):
+        item = self.provider.video_item()
+        item.update({'url': url})
+        if not self.ask_for_account_type():
+            # set user/pass to null - user does not want to use VIP at this time
+            self.provider.username = None
+            self.provider.password = None
+        else:
+            if not self.provider.login():
+                xbmcgui.Dialog().ok(self.provider.name, xbmcutil.__lang__(30011))
+                return
+        try:
+            return self.provider.resolve(item, captcha_cb=self.ask_for_captcha)
+        except ResolveException as e:
+            self._handle_exc(e)
+
+
+class XBMCLoginOptionalDelayedContentProvider(XBMCLoginOptionalContentProvider):
+
+    def wait_cb(self, wait):
+        left = wait
+        msg = xbmcutil.__lang__(30014).encode('utf-8')
+        while left > 0:
+            xbmc.executebuiltin("XBMC.Notification(%s,%s,1000,%s)" %
+                                (self.provider.name, msg % str(left), ''))
+            left -= 1
+            time.sleep(1)
+
+    def resolve(self, url):
+        item = self.video_item()
+        item.update({'url': url})
+        if not self.ask_for_account_type():
+            # set user/pass to null - user does not want to use VIP at this time
+            self.provider.username = None
+            self.provider.password = None
+        else:
+            if not self.provider.login():
+                xbmcgui.Dialog().ok(self.provider.name, xbmcutil.__lang__(30011))
+                return
+        try:
+            return self.provider.resolve(item, captcha_cb=self.ask_for_captcha, wait_cb=self.wait_cb)
+        except ResolveException as e:
+            self._handle_exc(e)
+
+
+class CaptchaDialog (xbmcgui.WindowXMLDialog):
+
+    def __init__(self, *args, **kwargs):
+        super(xbmcgui.WindowXMLDialog, self).__init__(args, kwargs)
+        self.image = None
+
+    def onFocus(self, controlId):
+        self.controlId = controlId
+
+    def onInit(self):
+        self.getControl(101).setImage(self.image)
+
+    def onAction(self, action):
+        if action.getId() in [9, 10]:
+            self.close()
+
+    def onClick(self, controlId):
+        if controlId == 102:
+            self.close()
diff --git a/lib/crypto/__init__.py b/lib/crypto/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/lib/crypto/__pycache__/__init__.cpython-38.opt-1.pyc b/lib/crypto/__pycache__/__init__.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..ea61905
Binary files /dev/null and b/lib/crypto/__pycache__/__init__.cpython-38.opt-1.pyc differ
diff --git a/lib/crypto/__pycache__/md5crypt.cpython-38.opt-1.pyc b/lib/crypto/__pycache__/md5crypt.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..dcc6efa
Binary files /dev/null and b/lib/crypto/__pycache__/md5crypt.cpython-38.opt-1.pyc differ
diff --git a/lib/crypto/md5crypt.py b/lib/crypto/md5crypt.py
new file mode 100644
index 0000000..8023187
--- /dev/null
+++ b/lib/crypto/md5crypt.py
@@ -0,0 +1,75 @@
+import hashlib
+
+MAGIC = '$1$'
+ITOA64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+
+def to64(v, n):
+    ret = ''
+    while n > 0:
+        ret += ITOA64[v & 0x3f]
+        v >>= 6
+        n -= 1
+    return ret
+
+def apache_md5_crypt(pw, salt):
+    return unix_md5_crypt(pw, salt, '$apr1$')
+
+def unix_md5_crypt(pw, salt, magic=None):
+    if magic is None:
+        magic = MAGIC
+
+    if salt.startswith(magic):
+        salt = salt[len(magic):]
+
+    salt = salt.split('$', 1)[0][:8]
+
+    pw_bytes = pw.encode('utf-8')
+    salt_bytes = salt.encode('utf-8')
+    magic_bytes = magic.encode('utf-8')
+
+    ctx = pw_bytes + magic_bytes + salt_bytes
+    final = hashlib.md5(pw_bytes + salt_bytes + pw_bytes).digest()
+
+    for pl in range(len(pw_bytes), 0, -16):
+        ctx += final[:min(16, pl)]
+
+    i = len(pw_bytes)
+    while i:
+        if i & 1:
+            ctx += b'\x00'
+        else:
+            ctx += pw_bytes[:1]
+        i >>= 1
+
+    final = hashlib.md5(ctx).digest()
+
+    for i in range(1000):
+        ctx1 = b''
+        if i & 1:
+            ctx1 += pw_bytes
+        else:
+            ctx1 += final
+        if i % 3:
+            ctx1 += salt_bytes
+        if i % 7:
+            ctx1 += pw_bytes
+        if i & 1:
+            ctx1 += final
+        else:
+            ctx1 += pw_bytes
+        final = hashlib.md5(ctx1).digest()
+
+    passwd = ''
+    passwd += to64((final[0] << 16) | (final[6] << 8) | final[12], 4)
+    passwd += to64((final[1] << 16) | (final[7] << 8) | final[13], 4)
+    passwd += to64((final[2] << 16) | (final[8] << 8) | final[14], 4)
+    passwd += to64((final[3] << 16) | (final[9] << 8) | final[15], 4)
+    passwd += to64((final[4] << 16) | (final[10] << 8) | final[5], 4)
+    passwd += to64(final[11], 2)
+
+    return magic + salt + '$' + passwd
+
+md5crypt = unix_md5_crypt
+
+if __name__ == "__main__":
+    print(unix_md5_crypt("cat", "hat"))
diff --git a/lib/resolver.py b/lib/resolver.py
new file mode 100644
index 0000000..063f107
--- /dev/null
+++ b/lib/resolver.py
@@ -0,0 +1,289 @@
+# -*- coding: UTF-8 -*-
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+
+import sys
+import os
+import re
+import traceback
+
+import util
+
+sys.path.append(os.path.join(os.path.dirname(__file__), 'server'))
+
+RESOLVERS = []
+util.debug('%s searching for modules' % __name__)
+for module in os.listdir(os.path.join(os.path.dirname(__file__), 'server')):
+    if module == '__init__.py' or module[-3:] != '.py':
+        continue
+    module = module[:-3]
+    exec('import %s' % module)
+    resolver = eval(module)
+    util.debug('found %s %s' % (resolver, dir(resolver)))
+
+    if not hasattr(resolver, '__priority__'):
+        resolver.__priority__ = 0
+    RESOLVERS.append(resolver)
+    del module
+RESOLVERS = sorted(RESOLVERS, key=lambda m: -m.__priority__)
+util.debug('done')
+
+
+def item():
+    return {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {}}
+
+
+def resolve(url):
+    """
+        resolves given url by asking all resolvers
+
+        returns None if no resolver advised to be able to resolve this url
+        returns False if resolver did his job, but did not return any value (thus failed)
+        returns Array of resolved objects in positive usecase
+    """
+    url = util.decode_html(url)
+    util.info('Resolving ' + url)
+    resolver = _get_resolver(url)
+    value = None
+    if resolver is None:
+        return None
+    util.info('Using resolver \'%s\'' % str(resolver.__name__));
+    try:
+        value = resolver.resolve(url)
+    except:
+        traceback.print_exc()
+    if value is None:
+        return False
+    default = item()
+
+    def fix_stream(i, url, resolver, default):
+        """ fix  missing but required values """
+        if 'name' not in list(i.keys()):
+            i['name'] = resolver.__name__
+        if 'surl' not in list(i.keys()):
+            i['surl'] = url
+        for key in list(default.keys()):
+            if key not in list(i.keys()):
+                i[key] = default[key]
+
+    [fix_stream(i, url, resolver, default) for i in value]
+    return sorted(value, key=lambda i: i['quality'])
+
+
+def _get_resolver(url):
+    util.debug('Get resolver for ' + url)
+    for r in RESOLVERS:
+        util.debug('querying %s' % r)
+        if r.supports(url):
+            return r
+
+
+def can_resolve(url):
+    """ Returns true if we are able to resolve stream by given URL """
+    return _get_resolver(url) is not None
+
+
+def filter_resolvable(url):
+    if url.find('facebook') > 0 or url.find('yield') > 0:
+        return
+    return url.strip('\'\"')
+
+
+def findstreams(data, regexes=None):
+    """
+    Finds streams in given data. Respects caller add-on settings about
+    quality and asks user if necessary.
+
+    :param data: A string (piece of text / HTML code), an array of URLs or an
+                 array of dictionaries, where 'url' key stores actual URL and
+                 all other keys not present in item() are being copied to the
+                 resolved stream dictionary
+    :param regexes: An array of strings - regular expressions, each MUST define
+                    named group called 'url', which retrieves resolvable URL
+                    (that one is passed to resolve operation); only used
+                    with 'data' of type 'string'
+    :returns: An array of resolved objects, None if at least 1 resolver failed
+              to resolve and nothing else was found, an empty array if no
+              resolvers for URLs has been found or False if none of regexes
+              found anything
+    """
+
+    def get_url(obj):
+        return obj['url'] if isinstance(obj, dict) else obj
+
+    urls = []
+    resolvables = []
+    resolved = []
+    not_found = False
+    if isinstance(data, str) and regexes:
+        for regex in regexes:
+            for match in re.finditer(regex, data, re.IGNORECASE | re.DOTALL):
+                urls.append(match.group('url'))
+    elif isinstance(data, list):
+        urls = data
+    else:
+        raise TypeError
+    for url in urls:
+        if isinstance(url, dict):
+            url['url'] = filter_resolvable(url['url'])
+        else:
+            url = filter_resolvable(url)
+        if url and url not in resolvables:
+            util.info('Found resolvable ' + get_url(url))
+            resolvables.append(url)
+    if len(resolvables) == 0:
+        util.info('No resolvables found!')
+        return False
+    for url in resolvables:
+        streams = resolve(get_url(url))
+        if streams is None:
+            util.info('No resolver found for ' + get_url(url))
+            not_found = True
+        elif not streams:
+            util.info('There was an error resolving ' + get_url(url))
+        elif len(streams) > 0:
+            for stream in streams:
+                if isinstance(url, dict):
+                    for key in list(url.keys()):
+                        if key not in stream:
+                            stream[key] = url[key]
+                        elif key not in item():
+                            if isinstance(stream[key], str) and \
+                                    isinstance(url[key], str):
+                                stream[key] = url[key] + ' +' + stream[key]
+                            elif isinstance(stream[key], list) and \
+                                    isinstance(url[key], list):
+                                stream[key] = url[key] + stream[key]
+                            elif isinstance(stream[key], dict) and \
+                                    isinstance(url[key], dict):
+                                stream[key].update(url[key])
+                resolved.append(stream)
+    if len(resolved) == 0:
+        if not_found:
+            return []
+        return None
+    resolved = sorted(resolved, key=lambda i: i['quality'])
+    resolved = sorted(resolved, key=lambda i: len(i['quality']))
+    resolved.reverse()
+    return resolved
+
+
+q_map = {'3': '720p', '4': '480p', '5': '360p'}
+
+
+def filter_by_quality(resolved, q):
+    util.info('filtering by quality setting ' + q)
+    if q == '0':
+        return resolved
+    sources = {}
+    ret = []
+    # first group streams by source url
+    for item in resolved:
+        if item['surl'] in list(sources.keys()):
+            sources[item['surl']].append(item)
+        else:
+            sources[item['surl']] = [item]
+    if q == '1':
+        # always return best quality from each source
+        for key in list(sources.keys()):
+            ret.append(sources[key][0])
+    elif q == '2':
+        # always return worse quality from each source
+        for key in list(sources.keys()):
+            ret.append(sources[key][-1])
+    else:
+        # we try to select sources of desired qualities
+        quality = q_map[q]
+        # 3,4,5 are 720,480,360
+        for key in list(sources.keys()):
+            added = False
+            for item in sources[key]:
+                if quality == item['quality']:
+                    ret.append(item)
+                    added = True
+            if not added:
+                util.debug('Desired quality %s not found, adding best found' % quality)
+                ret.append(sources[key][-1])
+    # sort results again, so best quality streams appear first
+    ret = sorted(ret, key=lambda i: i['quality'])
+    if not q == '2':
+        ret.reverse()
+    return ret
+
+def filter_by_language(resolved, lang):
+    util.info('filtering by language setting ' + lang)
+    if lang == '0':
+        return resolved
+    ret = []
+    # first group streams by source url
+    for item in resolved:
+        if 'lang' in item and item['lang'] != '':
+            util.info(item)
+            if lang == '1' and re.match('en', item['lang'], re.IGNORECASE):
+                ret.append(item)
+            if lang == '2' and re.match('cs|cz|čeština', item['lang'], re.IGNORECASE):
+                ret.append(item)
+    return ret
+
+def findstreams_multi(data, regexes):
+    """
+    Finds streams in given data according to given regexes
+    respects caller addon's setting about desired quality, asks user if needed
+    assumes, that all resolvables need to be returned, but in particular quality
+    @param data piece of text (HTML code) to search in
+    @param regexes - array of strings - regular expressions, each MUST define named group called 'url'
+    which retrieves resolvable URL (that one is passsed to resolve operation)
+    @return array of dictionaries with keys: name,url,quality,surl
+    @return None if at least 1 resoler failed to resolve and nothing else has been found
+    @return [] if no resolvable URLs or no resolvers for URL has been found
+    """
+    resolved = []
+    # keep list of found urls to aviod having duplicates
+    urls = []
+    error = False
+    for regex in regexes:
+        for match in re.finditer(regex, data, re.IGNORECASE | re.DOTALL):
+            print('Found resolvable %s ' % match.group('url'))
+            streams = resolve(match.group('url'))
+            if isinstance(streams, list) and streams:
+                util.debug('There was an error resolving ' + match.group('url'))
+                error = True
+            if streams is not None:
+                if len(streams) > 0:
+                    for stream in streams:
+                        resolved.append(stream)
+    if error and len(resolved) == 0:
+        return None
+    if len(resolved) == 0:
+        return []
+    resolved = sorted(resolved, key=lambda i: i['quality'])
+    resolved = sorted(resolved, key=lambda i: len(i['quality']))
+    resolved2 = resolved
+    resolved2.reverse()
+    qualities = {}
+    for item in resolved2:
+        if item['quality'] in list(qualities.keys()):
+            qualities[item['quality']].append(item)
+        else:
+            qualities[item['quality']] = [item]
+    # now .. we must sort items to be in same order as they were found on page
+    for q in list(qualities.keys()):
+        qualities[q] = sorted(qualities[q], key=lambda i: resolved.index(i))
+    return qualities
diff --git a/lib/search.py b/lib/search.py
new file mode 100644
index 0000000..69b727f
--- /dev/null
+++ b/lib/search.py
@@ -0,0 +1,76 @@
+
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import os,re,sys
+import xbmcplugin,xbmcaddon,xbmc
+import xbmcutil,util
+
+def _list(addon,history,key,value):
+	params = {}
+	menuItems = {}
+	if key:
+		params[key] = value
+		menuItems[key] = value
+	params['search'] = '#'
+	xbmcutil.add_dir(xbmcutil.__lang__(30004),params,xbmcutil.icon('search.png'))
+	for what in xbmcutil.get_searches(addon,history):
+		params['search'] = what
+		menuItems['search-remove'] = what
+		xbmcutil.add_dir(what,params,menuItems={xbmc.getLocalizedString(117):menuItems})
+	xbmcplugin.endOfDirectory(int(sys.argv[1]))
+
+def _remove(addon,history,search):
+	xbmcutil.remove_search(addon,history,search)
+	xbmc.executebuiltin('Container.Refresh')
+
+def _search(addon,history,what,update_history,callback):
+	if what == '' or what == '#':
+		kb = xbmc.Keyboard('',xbmcutil.__lang__(30003),False)
+		kb.doModal()
+		if kb.isConfirmed():
+			what = kb.getText()
+	if not what == '':
+		maximum = 20
+		try:
+			maximum = int(addon.getSetting('keep-searches'))
+		except:
+			util.error('Unable to parse convert addon setting to number')
+			pass
+		if update_history:
+			xbmcutil.add_search(addon,history,what,maximum)
+		callback(what)
+
+def item(items={},label=xbmcutil.__lang__(30003)):
+	items['search-list'] = '#'
+	xbmcutil.add_dir(label,items,xbmcutil.icon('search.png'))
+
+def main(addon,history,p,callback,key=None,value=None):
+	if (key==None) or (key in p and p[key] == value):
+		if 'search-list' in list(p.keys()):
+			_list(addon,history,key,value)
+		if 'search' in list(p.keys()):
+			update_history=True
+			if 'search-no-history' in list(p.keys()):
+				update_history=False
+			_search(addon,history,p['search'],update_history,callback)
+		if 'search-remove' in list(p.keys()):
+			_remove(addon,history,p['search-remove'])
diff --git a/lib/server/__init__.py b/lib/server/__init__.py
new file mode 100644
index 0000000..56e0887
--- /dev/null
+++ b/lib/server/__init__.py
@@ -0,0 +1,31 @@
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+
+
+##########################################################3
+# all resolvers modules in this directory must have following methods:
+
+# __name__ - name of the resolver module - can override module filename
+# def supports(url) - returns true iff resolver is able to resolve url to stream otherwise false
+# def resolve(url) - returns array of all hashmaps that were resolved
+#   - if resolving fails, nothing is returned
+#   - a hash MUST contain key 'url' - it's value is stream URL
+#   - optional keys are 'subs' (link to subtitle), 'quality' (quality string like '240p' or just 'HD'
diff --git a/lib/server/__pycache__/anyfilesresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/anyfilesresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..5d00482
Binary files /dev/null and b/lib/server/__pycache__/anyfilesresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/dailymotionresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/dailymotionresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..a522930
Binary files /dev/null and b/lib/server/__pycache__/dailymotionresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/divxstageresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/divxstageresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..503d788
Binary files /dev/null and b/lib/server/__pycache__/divxstageresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/eserialresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/eserialresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..0335f11
Binary files /dev/null and b/lib/server/__pycache__/eserialresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/exashareresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/exashareresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..3fe3e38
Binary files /dev/null and b/lib/server/__pycache__/exashareresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/flashxresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/flashxresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..aef6817
Binary files /dev/null and b/lib/server/__pycache__/flashxresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/gosuparkresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/gosuparkresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..9394260
Binary files /dev/null and b/lib/server/__pycache__/gosuparkresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/hqqresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/hqqresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..2b06755
Binary files /dev/null and b/lib/server/__pycache__/hqqresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/koukejseresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/koukejseresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..da93aaf
Binary files /dev/null and b/lib/server/__pycache__/koukejseresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/koukniresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/koukniresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..73fdbb3
Binary files /dev/null and b/lib/server/__pycache__/koukniresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/ksetresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/ksetresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..5e7dd9b
Binary files /dev/null and b/lib/server/__pycache__/ksetresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/letwatch.cpython-38.opt-1.pyc b/lib/server/__pycache__/letwatch.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..600508d
Binary files /dev/null and b/lib/server/__pycache__/letwatch.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/mixturevideoresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/mixturevideoresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..a7cf04c
Binary files /dev/null and b/lib/server/__pycache__/mixturevideoresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/moevideoresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/moevideoresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..a9409da
Binary files /dev/null and b/lib/server/__pycache__/moevideoresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/mojevideosk.cpython-38.opt-1.pyc b/lib/server/__pycache__/mojevideosk.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..e42f064
Binary files /dev/null and b/lib/server/__pycache__/mojevideosk.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/movshareresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/movshareresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..aed5b98
Binary files /dev/null and b/lib/server/__pycache__/movshareresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/munkvideoresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/munkvideoresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..24adaeb
Binary files /dev/null and b/lib/server/__pycache__/munkvideoresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/myviruresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/myviruresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..f538c42
Binary files /dev/null and b/lib/server/__pycache__/myviruresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/nahnojiresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/nahnojiresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..d7f5911
Binary files /dev/null and b/lib/server/__pycache__/nahnojiresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/novamovresovler.cpython-38.opt-1.pyc b/lib/server/__pycache__/novamovresovler.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..944d12d
Binary files /dev/null and b/lib/server/__pycache__/novamovresovler.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/openload.cpython-38.opt-1.pyc b/lib/server/__pycache__/openload.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..fd96ad2
Binary files /dev/null and b/lib/server/__pycache__/openload.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/playedtoresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/playedtoresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..04ba62f
Binary files /dev/null and b/lib/server/__pycache__/playedtoresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/playmdresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/playmdresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..481c619
Binary files /dev/null and b/lib/server/__pycache__/playmdresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/publicvideohostresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/publicvideohostresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..c216658
Binary files /dev/null and b/lib/server/__pycache__/publicvideohostresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/putlockerresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/putlockerresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..df68aca
Binary files /dev/null and b/lib/server/__pycache__/putlockerresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/rutuberesolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/rutuberesolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..d117486
Binary files /dev/null and b/lib/server/__pycache__/rutuberesolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/servertipczresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/servertipczresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..d3f48c5
Binary files /dev/null and b/lib/server/__pycache__/servertipczresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/sledujuserialyresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/sledujuserialyresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..a0fb6cc
Binary files /dev/null and b/lib/server/__pycache__/sledujuserialyresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/stagevuresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/stagevuresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..4aa8c81
Binary files /dev/null and b/lib/server/__pycache__/stagevuresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/streamcloudresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/streamcloudresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..592973e
Binary files /dev/null and b/lib/server/__pycache__/streamcloudresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/streamintoresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/streamintoresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..5f8114b
Binary files /dev/null and b/lib/server/__pycache__/streamintoresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/streamujtvresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/streamujtvresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..9b170a8
Binary files /dev/null and b/lib/server/__pycache__/streamujtvresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/trivialresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/trivialresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..4e20ed5
Binary files /dev/null and b/lib/server/__pycache__/trivialresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/videobbresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/videobbresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..16ce114
Binary files /dev/null and b/lib/server/__pycache__/videobbresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/videomailresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/videomailresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..35820c9
Binary files /dev/null and b/lib/server/__pycache__/videomailresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/videonetresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/videonetresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..da71741
Binary files /dev/null and b/lib/server/__pycache__/videonetresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/videoweedresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/videoweedresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..2e4d672
Binary files /dev/null and b/lib/server/__pycache__/videoweedresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/videozerresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/videozerresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..547c3f2
Binary files /dev/null and b/lib/server/__pycache__/videozerresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/videram.cpython-38.opt-1.pyc b/lib/server/__pycache__/videram.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..bfeed34
Binary files /dev/null and b/lib/server/__pycache__/videram.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/vimeoresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/vimeoresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..13ba13f
Binary files /dev/null and b/lib/server/__pycache__/vimeoresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/vkontakteresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/vkontakteresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..5cf3ed8
Binary files /dev/null and b/lib/server/__pycache__/vkontakteresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/vuuzlaresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/vuuzlaresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..1970332
Binary files /dev/null and b/lib/server/__pycache__/vuuzlaresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/youtuberesolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/youtuberesolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..7fa170c
Binary files /dev/null and b/lib/server/__pycache__/youtuberesolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/youwatch.cpython-38.opt-1.pyc b/lib/server/__pycache__/youwatch.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..63e4e6e
Binary files /dev/null and b/lib/server/__pycache__/youwatch.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/zideonlresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/zideonlresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..08a0b43
Binary files /dev/null and b/lib/server/__pycache__/zideonlresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/__pycache__/zkouknitoresolver.cpython-38.opt-1.pyc b/lib/server/__pycache__/zkouknitoresolver.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..53df311
Binary files /dev/null and b/lib/server/__pycache__/zkouknitoresolver.cpython-38.opt-1.pyc differ
diff --git a/lib/server/anyfilesresolver.py b/lib/server/anyfilesresolver.py
new file mode 100644
index 0000000..c6fec63
--- /dev/null
+++ b/lib/server/anyfilesresolver.py
@@ -0,0 +1,104 @@
+# -*- coding: UTF-8 -*-
+# *  GNU General Public License for more details.
+# *
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# *
+# *  thanks to http://code.google.com/p/sd-xbmc/
+# */
+
+import re
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
+import random
+import decimal
+
+import util
+
+__name__='anyfiles'
+
+BASE_URL = 'http://video.anyfiles.pl'
+
+def supports(url):
+    return not _regex(url) == None
+
+def _gen_random_decimal(i, d):
+        return decimal.Decimal('%d.%d' % (random.randint(0, i), random.randint(0, d)))
+
+
+def _decode(param):
+    #-- define variables
+    loc_3 = [0,0,0,0]
+    loc_4 = [0,0,0]
+    loc_2 = ''
+    #-- define hash parameters for decoding
+    dec = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
+    hash1 = ["L", "y", "c", "X", "2", "M", "a", "l", "p", "5", "Q", "e", "R", "t", "Z", "Y", "9", "m", "d", "0", "s", "V", "b", "3", "7", "="]
+    hash2 = ["i", "B", "v", "U", "H", "4", "D", "n", "k", "8", "x", "T", "u", "G", "w", "f", "N", "J", "6", "W", "1", "g", "z", "o", "I", "r"]
+    hash1 = ["c", "u", "4", "V", "z", "5", "k", "m", "y", "p", "L", "J", "I", "d", "0", "M", "9", "e", "3", "8", "v", "l", "i", "7", "n", "="];
+    hash2 = ["t", "Y", "T", "x", "B", "g", "G", "b", "2", "X", "1", "R", "a", "N", "w", "Q", "f", "W", "U", "D", "Z", "s", "6", "H", "o", "r"]
+
+    #-- decode
+    for i in range(0, len(hash1)):
+        re1 = hash1[i]
+        re2 = hash2[i]
+
+        param = param.replace(re1, '___')
+        param = param.replace(re2, re1)
+        param = param.replace('___', re2)
+
+    i = 0
+    while i < len(param):
+        j = 0
+        while j < 4 and i+j < len(param):
+            loc_3[j] = dec.find(param[i+j])
+            j = j + 1
+
+        loc_4[0] = (loc_3[0] << 2) + ((loc_3[1] & 48) >> 4);
+        loc_4[1] = ((loc_3[1] & 15) << 4) + ((loc_3[2] & 60) >> 2);
+        loc_4[2] = ((loc_3[2] & 3) << 6) + loc_3[3];
+
+        j = 0
+        while j < 3:
+            if loc_3[j + 1] == 64:
+                break
+            try:
+                loc_2 += chr(loc_4[j])
+            except:
+                pass
+            j = j + 1
+
+        i = i + 4;
+
+    return loc_2
+
+def resolve(url):
+    m = _regex(url)
+    if m:
+        resp = urllib.request.urlopen(url)
+        sessc = resp.headers.get('Set-Cookie').split(';')[0]
+        resp.close()
+        furl = "%s/w.jsp?id=%s&width=620&height=349&pos=&skin=0" % (BASE_URL,m.group('id'))
+        headers = {'Cookie':sessc, 'Referer':url}
+        data = util.request(furl,headers)
+        m1 = re.search('document.cookie = "([^"]+?)"',data)
+        m2 = re.search('src="(\/pcsevlet\?code=[^"]+)', data)
+        if m1 and m2:
+            headers['Cookie'] = headers['Cookie'] + '; ' + m1.group(1)
+            headers['Referer'] = BASE_URL + '/flowplayer/flowplayer.commercial-3.2.16.swf'
+            data = util.request(BASE_URL + m2.group(1),headers)
+            m_vurl = re.search("'url':.*?'(http[^']+?mp4)'", data, re.DOTALL)
+            m_surl = re.search("'captionUrl':.*?'(http[^']+)'",data, re.DOTALL)
+            if m_vurl:
+                resolved = {'url':m_vurl.group(1).strip(),'quality':'???'}
+                if m_surl:
+                    resolved['subs'] = m_surl.group(1).strip()
+                return [resolved]
+            else:
+                return []
+def _regex(url):
+    return re.search('video\.anyfiles\.pl/w\.jsp\?id=(?P<id>\d+)',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/dailymotionresolver.py b/lib/server/dailymotionresolver.py
new file mode 100644
index 0000000..538db52
--- /dev/null
+++ b/lib/server/dailymotionresolver.py
@@ -0,0 +1,91 @@
+# -*- coding: UTF-8 -*-
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+
+import re
+from xml.etree import ElementTree
+import util
+from copy import deepcopy
+import json
+
+__name__ = 'dailymotion'
+
+
+def supports(url):
+    return re.search(r'dailymotion.com/embed', url) is not None
+
+
+def resolve(url):
+    print('The url is ::', url)
+    id = re.search(r'dailymotion.com/embed/video/(.+)', url).group(1)
+    print('The id is ::', id)
+    headers = {'User-Agent': 'Android'}
+    cookie = {'Cookie': "lang=en; ff=off"}
+    r = util.request("http://www.dailymotion.com/player/metadata/video/" + id,
+                     headers)
+    content = json.loads(r)
+    cc = content['qualities']
+    cc = list(cc.items())
+
+    cc = sorted(cc, reverse=True)
+    m_url = ''
+    other_playable_url = []
+
+    items = []
+    result = []
+
+    for source, json_source in cc:
+        source = source.split("@")[0]
+        for item in json_source:
+
+            m_url = item.get('url', None)
+            # xbmc.log("DAILYMOTION - m_url = %s" % m_url, xbmc.LOGNOTICE)
+            if m_url:
+                if source == "auto":
+                    continue
+
+                elif '.mnft' in m_url:
+                    continue
+
+                if 'video' in item.get('type', None):
+                    item = {}
+                    item['url'] = m_url
+                    item['quality'] = source
+                    item['title'] = 'video'
+                    items.append(item)
+
+                other_playable_url.append(m_url)
+
+        if items:
+            for item in items:
+                newitem = deepcopy(item)
+                item['lang'] = '???'
+                item['headers'] = headers
+                result.append(newitem)
+    if not result and cc[0][0]=='auto':
+        json_source=cc[0][1]
+        m_url=json_source[0].get('url', None)
+        r = util.request(m_url)
+        streams = re.compile(r'RESOLUTION=\d+x(\d+).*\n([^\s]+)').findall(r)   
+        for quality, url in streams:
+            item = {}
+            item['url'] = url
+            item['quality'] = quality + 'p'
+            item['title'] = 'video'
+            result.append(item)
+    return result
diff --git a/lib/server/divxstageresolver.py b/lib/server/divxstageresolver.py
new file mode 100644
index 0000000..44d520d
--- /dev/null
+++ b/lib/server/divxstageresolver.py
@@ -0,0 +1,36 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util,resolver
+__name__ = 'divxstage'
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def resolve(url):
+    if not _regex(url) == None:
+        data = util.substr(util.request(url),'<embed type=\"video/divx','>')
+        link = re.search('src=\"([^\"]+)',data,re.IGNORECASE | re.DOTALL)
+        if link:
+            return [{'url':link.group(1)}]
+
+def _regex(url):
+    return re.search('embed.divxstage.eu/(.+?)',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/eserialresolver.py b/lib/server/eserialresolver.py
new file mode 100644
index 0000000..0b8dc80
--- /dev/null
+++ b/lib/server/eserialresolver.py
@@ -0,0 +1,27 @@
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re
+__name__='eserial'
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def resolve(url):
+    m = _regex(url)
+    if m:
+        stream = re.search('(?P<url>.+?)(\&|$)',m.group('url')).group('url')
+        show = re.search('serial=(?P<url>.+?)(\&|$)',m.group('url'))
+        tit = re.search('srt=(?P<url>.+?)(\&|$)',m.group('url'))
+        if show and tit:
+            return [{'url':stream,'subs':'http://www.eserial.cz/titulky/%s/%s.srt' % (show.group('url'),tit.group('url'))}]
+        return [{'url':stream}]
+
+def _regex(url):
+    return re.search('eserial\.cz/video\.php\?file=(?P<url>.+?)$',url,re.IGNORECASE | re.DOTALL)
+
diff --git a/lib/server/exashareresolver.py b/lib/server/exashareresolver.py
new file mode 100644
index 0000000..5ccccd0
--- /dev/null
+++ b/lib/server/exashareresolver.py
@@ -0,0 +1,53 @@
+# -*- coding: UTF-8 -*-
+# /*
+# *      Copyright (C) 2015 Lubomir Kucera
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re
+import util
+from demjson import demjson
+
+__author__ = 'Jose Riha/Lubomir Kucera'
+__name__ = 'exashare'
+
+
+def supports(url):
+    return re.search(r'exashare\.com/embed\-[^\.]+\.html', url) is not None
+
+
+def resolve(url):
+    realurl = re.search(r'<iframe src="([^"]+)".*', util.request(url), re.I | re.S).group(1)
+    data = re.search(r'<script[^\.]+?\.setup\((.+?)\);', util.request(realurl), re.I | re.S)
+    if data:
+        data = data.group(1).decode('string_escape')
+        data = re.sub(r'\w+\(([^\)]+?)\)', r'\1', data) # Strip JS functions
+        data = re.sub(r': *([^"][a-zA-Z]+)',r':"\1"', data) # Fix incorrect JSON
+        data = demjson.decode(data)
+        if 'sources' in data:
+            result = []
+            for source in data['sources']:           
+                if 'tracks' in data:                                                        
+                    for track in data['tracks']:                                            
+                        result.append({
+                                       'url': source['file'],
+                                      'subs': track['file'],
+                                      'lang': ' %s subtitles' % track['label']
+                                       })
+            return result
+    return None
diff --git a/lib/server/flashxresolver.py b/lib/server/flashxresolver.py
new file mode 100644
index 0000000..8768584
--- /dev/null
+++ b/lib/server/flashxresolver.py
@@ -0,0 +1,60 @@
+# -*- coding: UTF-8 -*-
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+
+import re
+from xml.etree import ElementTree
+import util
+from copy import deepcopy
+
+__name__ = 'flashx'
+
+
+def supports(url):
+    return re.search(r'flashx\.tv/embed\-[^\.]+\.html', url) is not None
+
+
+def resolve(url):
+    data = util.extract_jwplayer_setup(util.request(url))
+    if data and 'sources' in data:
+        result = []
+        for source in data['sources']:
+            items = []
+            if source['file'].endswith('.smil'):
+                tree = ElementTree.fromstring(util.request(source['file']))
+                base_path = tree.find('./head/meta').get('base')
+                for video in tree.findall('./body/switch/video'):
+                    items.append({
+                        'url': '%s playpath=%s pageUrl=%s swfUrl=%s swfVfy=true' %
+                               (base_path, video.get('src'), url,
+                                'http://static.flashx.tv/player6/jwplayer.flash.swf'),
+                        'quality': video.get('height') + 'p'
+                    })
+            else:
+                items.append({'url': source['file']})
+            if len(data['tracks']) > 0:
+                for item in items:
+                    for track in data['tracks']:
+                        new_item = deepcopy(item)
+                        new_item['subs'] = track['file']
+                        new_item['lang'] = ' %s subtitles' % track['label']
+                        result.append(new_item)
+            else:
+                result += items
+        return result
+    return None
diff --git a/lib/server/gosuparkresolver.py b/lib/server/gosuparkresolver.py
new file mode 100644
index 0000000..c32d62c
--- /dev/null
+++ b/lib/server/gosuparkresolver.py
@@ -0,0 +1,42 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+__name__ = 'gosupark'
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def resolve(url):
+    m = _regex(url)
+    if m:
+        #http://gosupark.com/embed-j3erxu8i2o30-630x320.html
+        data = util.request('http://gosupark.com/'+m.group('url'))
+        n = re.search('file: \"(.+?)\"',data,re.IGNORECASE | re.DOTALL)
+        quality = '???'
+        q = re.search('x(\d+)\.html',url)
+        if q:
+            quality = q.group(1)+'p'
+        if not n == None:
+            return [{'quality':quality,'url':n.group(1).strip()}]
+
+def _regex(url):
+    return re.search('gosupark\.com/(?P<url>.+?)$',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/hqqresolver.py b/lib/server/hqqresolver.py
new file mode 100644
index 0000000..d503fb6
--- /dev/null
+++ b/lib/server/hqqresolver.py
@@ -0,0 +1,220 @@
+# -*- coding: UTF-8 -*-
+# *  GNU General Public License for more details.
+# *
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# *
+# *  original based on https://gitorious.org/iptv-pl-dla-openpli/ urlresolver
+# *  update based on https://github.com/LordVenom/
+# */
+from io import StringIO
+import json
+import util
+import re
+import base64
+import urllib.request, urllib.parse, urllib.error
+
+__name__ = 'hqq'
+
+def supports(url):
+    return _regex(url) is not None
+
+
+def _decode(data):
+    def O1l(string):
+        ret = ""
+        i = len(string) - 1
+        while i >= 0:
+            ret += string[i]
+            i -= 1
+        return ret
+
+    def l0I(string):
+        enc = ""
+        dec = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="
+        i = 0
+        while True:
+            h1 = dec.find(string[i])
+            i += 1
+            h2 = dec.find(string[i])
+            i += 1
+            h3 = dec.find(string[i])
+            i += 1
+            h4 = dec.find(string[i])
+            i += 1
+            bits = h1 << 18 | h2 << 12 | h3 << 6 | h4
+            o1 = bits >> 16 & 0xff
+            o2 = bits >> 8 & 0xff
+            o3 = bits & 0xff
+            if h3 == 64:
+                enc += chr(o1)
+            else:
+                if h4 == 64:
+                    enc += chr(o1) + chr(o2)
+                else:
+                    enc += chr(o1) + chr(o2) + chr(o3)
+            if i >= len(string):
+                break
+        return enc
+
+    escape = re.search("var _escape=\'([^\']+)", l0I(O1l(data))).group(1)
+    return escape.replace('%', '\\').decode('unicode-escape')
+
+
+def _decode2(file_url):
+    def K12K(a, typ='b'):
+        codec_a = ["G", "L", "M", "N", "Z", "o", "I", "t", "V", "y", "x", "p", "R", "m", "z", "u",
+                   "D", "7", "W", "v", "Q", "n", "e", "0", "b", "="]
+        codec_b = ["2", "6", "i", "k", "8", "X", "J", "B", "a", "s", "d", "H", "w", "f", "T", "3",
+                   "l", "c", "5", "Y", "g", "1", "4", "9", "U", "A"]
+        if 'd' == typ:
+            tmp = codec_a
+            codec_a = codec_b
+            codec_b = tmp
+        idx = 0
+        while idx < len(codec_a):
+            a = a.replace(codec_a[idx], "___")
+            a = a.replace(codec_b[idx], codec_a[idx])
+            a = a.replace("___", codec_b[idx])
+            idx += 1
+        return a
+
+    def _xc13(_arg1):
+        _lg27 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="
+        _local2 = ""
+        _local3 = [0, 0, 0, 0]
+        _local4 = [0, 0, 0]
+        _local5 = 0
+        while _local5 < len(_arg1):
+            _local6 = 0
+            while _local6 < 4 and (_local5 + _local6) < len(_arg1):
+                _local3[_local6] = _lg27.find(_arg1[_local5 + _local6])
+                _local6 += 1
+            _local4[0] = ((_local3[0] << 2) + ((_local3[1] & 48) >> 4))
+            _local4[1] = (((_local3[1] & 15) << 4) + ((_local3[2] & 60) >> 2))
+            _local4[2] = (((_local3[2] & 3) << 6) + _local3[3])
+
+            _local7 = 0
+            while _local7 < len(_local4):
+                if _local3[_local7 + 1] == 64:
+                    break
+                _local2 += chr(_local4[_local7])
+                _local7 += 1
+            _local5 += 4
+        return _local2
+
+    return _xc13(K12K(file_url, 'e'))
+
+
+def _decode3(w, i, s, e):
+    var1 = 0
+    var2 = 0
+    var3 = 0
+    var4 = []
+    var5 = []
+    while (True):
+        if (var1 < 5):
+            var5.append(w[var1])
+        elif (var1 < len(w)):
+            var4.append(w[var1])
+        var1 += 1
+        if (var2 < 5):
+            var5.append(i[var2])
+        elif (var2 < len(i)):
+            var4.append(i[var2])
+        var2 += 1
+        if (var3 < 5):
+            var5.append(s[var3])
+        elif (var3 < len(s)):
+            var4.append(s[var3])
+        var3 += 1
+        if (len(w) + len(i) + len(s) + len(e) == len(var4) + len(var5) + len(e)):
+            break
+    var6 = ''.join(var4)
+    var7 = ''.join(var5)
+    var2 = 0
+    result = []
+    for var1 in range(0, len(var4), 2):
+        ll11 = -1
+        if (ord(var7[var2]) % 2):
+            ll11 = 1
+        result.append(chr(int(var6[var1:var1 + 2], 36) - ll11))
+        var2 += 1
+        if (var2 >= len(var5)):
+            var2 = 0
+    return ''.join(result)
+
+def _decode_data(data):
+    valuesPattern = r";}\('(\w+)','(\w*)','(\w*)','(\w*)'\)\)"
+    values = re.search(valuesPattern, data, re.DOTALL)
+    return _decode3(values.group(1), values.group(2), values.group(3), values.group(4))
+
+def resolve(url):
+    m = _regex(url)
+    if m:
+        vid = m.group('vid')
+        headers = {'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+                   'Content-Type': 'text/html; charset=utf-8'}
+
+        player_url = "http://hqq.tv/player/embed_player.php?vid=%s&autoplay=no" % vid
+        data = util.request(player_url, headers)
+
+        data = _decode_data(data)
+        data = _decode_data(data)
+        blocs = data.split(';; ')
+        data = _decode_data(blocs[1])
+
+        jsonInfo = util.request("http://hqq.tv/player/ip.php?type=json", headers)
+        jsonIp = json.loads(jsonInfo)['ip']
+        at = re.search(r'at = "(\w+)";', data, re.DOTALL)
+        if jsonIp and at:
+            get_data = {'iss': jsonIp, 'vid': vid, 'at': at.group(1), 'autoplayed': 'yes', 'referer': 'on',
+                        'http_referer': '', 'pass': '', 'embed_from' : '', 'need_captcha' : '0' }
+
+            data = urllib.parse.unquote(util.request("http://hqq.tv/sec/player/embed_player.php?" +
+                                               urllib.parse.urlencode(get_data), headers))
+
+            l = re.search(r'link_1: ([a-zA-Z]+), server_1: ([a-zA-Z]+)', data)
+            vid_server = re.search(r'var ' + l.group(2) + ' = "([^"]+)"', data).group(1)
+            vid_link = re.search(r'var ' + l.group(1) + ' = "([^"]+)"', data).group(1)
+
+            if vid_server and vid_link:
+                get_data = {'server_1': vid_server, 'link_1': vid_link, 'at': at.group(1), 'adb': '0/',
+                            'b': '1', 'vid': vid }
+                headers['x-requested-with'] = 'XMLHttpRequest'
+                data = util.request("http://hqq.tv/player/get_md5.php?" + urllib.parse.urlencode(get_data), headers)
+                jsonData = json.loads(data)
+                encodedm3u = jsonData['file']
+                decodedm3u = _decode2(encodedm3u.replace('\\', ''))
+
+                agent = 'User-Agent=Mozilla/5.0 (iPhone; CPU iPhone OS 5_0_1 like Mac OS X)'
+                return [{'url': decodedm3u + '|' + agent, 'quality': '360p'}]
+    return None
+
+
+def _regex(url):
+    match = re.search("(hqq|netu)\.tv/watch_video\.php\?v=(?P<vid>[0-9A-Za-z]+)", url)
+    if match:
+        return match
+    match = re.search(r'(hqq|netu)\.tv/player/embed_player\.php\?vid=(?P<vid>[0-9A-Za-z]+)', url)
+    if match:
+        return match
+    match = re.search(r'(hqq|netu)\.tv/player/hash\.php\?hash=\d+', url)
+    if match:
+        match = re.search(r'var\s+vid\s*=\s*\'(?P<vid>[^\']+)\'', urllib.parse.unquote(util.request(url)))
+        if match:
+            return match
+    b64enc = re.search(r'data:text/javascript\;charset\=utf\-8\;base64([^\"]+)', url)
+    b64dec = b64enc and base64.decodestring(b64enc.group(1))
+    enc = b64dec and re.search(r"\'([^']+)\'", b64dec).group(1)
+    if enc:
+        decoded = _decode(enc)
+        match = re.search(r'<input name="vid"[^>]+? value="(?P<vid>[^"]+?)">', decoded)
+        if re.search(r'<form(.+?)action="[^"]*(hqq|netu)\.tv/player/embed_player\.php"[^>]*>',
+                     decoded) and match:
+            return match
+    return None
diff --git a/lib/server/koukejseresolver.py b/lib/server/koukejseresolver.py
new file mode 100644
index 0000000..fc62b0e
--- /dev/null
+++ b/lib/server/koukejseresolver.py
@@ -0,0 +1,36 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2013 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util,urllib.request,urllib.error,urllib.parse,traceback
+__name__ = 'koukejse.cz'
+def supports(url):
+    return not _regex(url) == None
+
+def resolve(url):
+    m = _regex(url)
+    if not m == None:
+        data = util.request(url)
+        stream = re.search('_video_file = \'(?P<url>[^\']+)',data)
+        if stream:
+            return [{'name':__name__,'quality':'360p','url':stream.group('url'),'surl':url}]
+
+def _regex(url):
+    return re.search('koukejse\.cz/(.+?)',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/koukniresolver.py b/lib/server/koukniresolver.py
new file mode 100644
index 0000000..e9a0a38
--- /dev/null
+++ b/lib/server/koukniresolver.py
@@ -0,0 +1,88 @@
+# -*- coding: UTF-8 -*-
+# /*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re, util, urllib.request, urllib.error, urllib.parse, traceback
+__name__ = 'koukni.cz'
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def url(url):
+    m = _regex(url)
+    if not m == None:
+        iframe = _iframe(url)
+        if iframe:
+            return iframe[0]['url']
+
+def resolve(url):
+    m = _regex(url)
+    if not m == None:
+        try:
+            iframe = _iframe(url)
+        except:
+            traceback.print_exc()
+            return
+        if iframe:
+            return iframe
+        # else:
+        #    return [{'name':__name__,'quality':'720p','url':url,'surl':url}]
+
+def _furl(url):
+    if url.startswith('http'):
+        return url
+    url = url.lstrip('./')
+    return 'http://www.koukni.cz/' + url
+
+def _iframe(url):
+    index = url.find('&')
+    if index > 0:
+        url = url[:index]
+    iframe = re.search('(\d+)$', url, re.IGNORECASE | re.DOTALL)
+    if iframe:
+        data = util.request(url)
+        ress = re.search('var api = flowplayer\(\),\s+resolutions = \{([^\}]+)\}', data, re.IGNORECASE | re.DOTALL)
+        valid_ress = re.compile("<span[^>]*>([^<]+)</span>", re.IGNORECASE | re.DOTALL).findall(data)
+        subs = re.search('<track.+?src=\"(?P<url>[^\"]+)', data, re.IGNORECASE | re.DOTALL)
+        if ress:
+            ret = []
+            ress = ress.group(1).strip().split(',')
+            for r in ress:
+                r = r.replace('"', '').split(':')
+                res = r[0].strip()
+                vurl = _furl(r[1].strip())
+                if res in valid_ress:
+                    v = {'name':__name__, 'url':vurl, 'quality':res, 'surl':url,'subs':''}
+                    if subs:
+                        v['subs'] = _furl(subs.group('url'))
+                    ret.append(v)
+            if len(ret)>0:
+                return ret
+        video = re.search('url\: \'(?P<url>mp4[^\']+)', data, re.IGNORECASE | re.DOTALL)
+        subs = re.search('captionUrl\: \'(?P<url>[^\']+)', data, re.IGNORECASE | re.DOTALL)
+        if video:
+            ret = {'name':__name__, 'quality':'720p', 'surl':url}
+            ret['url'] = 'rtmp://koukni.cz/mp4 playpath=%s' % video.group('url')
+            if subs:
+                ret['subs'] = _furl(subs.group('url'))
+            return [ret]
+
+def _regex(url):
+    return re.search('(www\.)?koukni.cz/(.+?)', url, re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/ksetresolver.py b/lib/server/ksetresolver.py
new file mode 100644
index 0000000..4d4db7c
--- /dev/null
+++ b/lib/server/ksetresolver.py
@@ -0,0 +1,54 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2013 mx3L
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re, util, decimal, random, base64, urllib.request, urllib.parse, urllib.error
+
+__name__ = 'kset'
+def supports(url):
+    return not _regex(url) == None
+
+def gen_random_decimal(i, d):
+    return decimal.Decimal('%d.%d' % (random.randint(0, i), random.randint(0, d)))
+
+# returns the steam url
+def resolve(url):
+    m = _regex(url)
+    if m:
+        id = int(m.group('id'))
+        headers = {
+                   "Referer":"http://st.kset.kz/pl/pl.swf"
+                   }
+        
+        params = {
+                  'id':id,
+                  'ref':'http://kset.kz/video_frame.php?id=%d' % id,
+                  'r':gen_random_decimal(0, 99999999999999)
+                  }
+        quality = "480p"
+        data = util.request("http://kset.kz/v.php?" + urllib.parse.urlencode(params), headers=headers)
+        item = util.json.loads(base64.decodestring(data))
+        return [{'quality':quality, 'url':item['file']}]
+    
+    
+def _regex(url):
+    m = re.search('http://kset\.kz/video_frame\.php\?id=(?P<id>[0-9]+)', url, re.IGNORECASE | re.DOTALL)
+    return m
+    
diff --git a/lib/server/letwatch.py b/lib/server/letwatch.py
new file mode 100644
index 0000000..7a15f8c
--- /dev/null
+++ b/lib/server/letwatch.py
@@ -0,0 +1,43 @@
+# -*- coding: UTF-8 -*-
+# /*
+# *      Copyright (C) 2015 Lubomir Kucera
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re
+import util
+from demjson import demjson
+
+__author__ = 'Lubomir Kucera'
+__name__ = 'letwatch'
+
+
+def supports(url):
+    return re.search(r'letwatch\.us/embed\-[^\.]+\.html', url) is not None
+
+
+def resolve(url):
+    data = re.search(r'<script[^\.]+?\.setup\(([^\)]+?)\);', util.request(url), re.I | re.S)
+    if data:
+        data = demjson.decode(data.group(1).decode('string_escape'))
+        if 'sources' in data:
+            result = []
+            for source in data['sources']:
+                result.append({'url': source['file'], 'quality': source['label']})
+            return result
+    return None
diff --git a/lib/server/mixturevideoresolver.py b/lib/server/mixturevideoresolver.py
new file mode 100644
index 0000000..027696e
--- /dev/null
+++ b/lib/server/mixturevideoresolver.py
@@ -0,0 +1,68 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util,urllib.request,urllib.error,urllib.parse,traceback,resolver
+
+__name__ = 'mixturecloud'
+
+def supports(url):
+    return not _regex(url) == None
+
+class MyHTTPRedirectHandler(urllib.request.HTTPRedirectHandler):
+
+    def http_error_302(self, req, fp, code, msg, headers):
+        self.location = headers.getheader('Location')
+        return urllib.request.HTTPRedirectHandler.http_error_302(self, req, fp, code, msg, headers)
+
+# returns the steam url
+def resolve(url):
+    m = _regex(url)
+    if m:
+        defrhandler = urllib.request.HTTPRedirectHandler
+        cookieprocessor = urllib.request.HTTPCookieProcessor()
+        redirecthandler = MyHTTPRedirectHandler()
+        opener = urllib.request.build_opener(redirecthandler, cookieprocessor)
+        urllib.request.install_opener(opener)
+        req = urllib.request.Request(url)
+        response = urllib.request.urlopen(req)
+        response.close()
+        urllib.request.install_opener(urllib.request.build_opener(defrhandler,cookieprocessor))
+        # mixturevideo uses REDIRECT to 'secret url' ;-)
+        url = redirecthandler.location
+        item = resolver.item()
+        item['surl'] = url
+        item['name'] = __name__
+        try:
+            ishd = re.search('hd\.state=([^\&]+)',url).group(1)
+            streamer = re.search('streamer=([^$]+)',url).group(1)+'&start=0&'
+            if ishd == 'true':
+                item['url'] = streamer + 'hd.file=' +re.search('hd\.file=([^\&]+)',url).group(1)
+                item['quality'] = 'hd'
+            else:
+                item['url'] = streamer + 'file=' +re.search('file=([^\&]+)',url).group(1)
+            return [item]
+        except:
+            traceback.print_exc()
+            pass
+
+def _regex(url):
+    return re.search('player\.mixturecloud\.com',url,re.IGNORECASE | re.DOTALL)
+
diff --git a/lib/server/moevideoresolver.py b/lib/server/moevideoresolver.py
new file mode 100644
index 0000000..27f213a
--- /dev/null
+++ b/lib/server/moevideoresolver.py
@@ -0,0 +1,41 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util,urllib.request,urllib.error,urllib.parse,urllib.parse
+__name__ = 'moevideo'
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def url(url):
+    m = _regex(url)
+    if m:
+        id = m.group('id')
+        post = {'r':'["tVL0gjqo5",["preview/flv_image",{"uid":"'+id+'"}],["preview/flv_link",{"uid":"'+id+'"}]]'}
+        data = util.post('http://api.letitbit.net',post)
+        data = data.replace('\\','')
+        print(data)
+        link = re.search('link\"\:\"(?P<link>[^\"]+)',data)
+        if link:
+            return [{'url':link.group('link')}]
+
+def _regex(url):
+    return re.search('moevideo.net/video\.php\?file=(?P<id>[^\&]+)',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/mojevideosk.py b/lib/server/mojevideosk.py
new file mode 100644
index 0000000..dca6a6d
--- /dev/null
+++ b/lib/server/mojevideosk.py
@@ -0,0 +1,47 @@
+# -*- coding: UTF-8 -*-
+# /*
+# *      Copyright (C) 2016 Jose Riha
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re
+import util
+import time
+import pickle
+
+__author__ = 'Jose Riha'
+__name__ = 'mojevideo.sk'
+
+
+def supports(url):
+    return re.search(r'mojevideo\.sk/video/\w+/.+\.html', url) is not None
+
+
+def resolve(url):
+    cookies = {}
+    util.init_urllib(cookies)
+    data = util.request(url)
+    view = list(pickle.loads(util._cookie_jar.dump())[
+        '.mojevideo.sk']['/'].keys())[0]
+    st = re.search(r'vHash=\[\'([^\']+)', data)
+    if not st:
+        return None
+    st = st.group(1)
+    tim = int(time.time())
+    base = 'http://fs5.mojevideo.sk:8080/securevd/'
+    return [{'url': base + view.replace('view', '') + '.mp4?st=%s&e=%s|Cookie=%s=1' % (st, tim, view)}]
diff --git a/lib/server/movshareresolver.py b/lib/server/movshareresolver.py
new file mode 100644
index 0000000..dede2dc
--- /dev/null
+++ b/lib/server/movshareresolver.py
@@ -0,0 +1,35 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+__name__='movshare'
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def resolve(url):
+    if not _regex(url) == None:
+        data = util.substr(util.request(url),'<embed type=\"video/divx','>')
+        stream = re.search('src=\"([^\"]+)',data,re.IGNORECASE | re.DOTALL).group(1)
+        return [{'url':stream}]
+
+def _regex(url):
+    return re.search('movshare.net/(.+?)',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/munkvideoresolver.py b/lib/server/munkvideoresolver.py
new file mode 100644
index 0000000..3fbd18a
--- /dev/null
+++ b/lib/server/munkvideoresolver.py
@@ -0,0 +1,45 @@
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+
+__name__='munkvideo'
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def resolve(url):
+    m = _regex(url)
+    if m:
+        data = util.request(url)
+        streams = re.search('res0\:[^\"]*\"([^\"]+)',data,re.IGNORECASE|re.DOTALL)
+        subs = re.search('sub0\:[^\"]*\".*?(http[^\"]*)',data,re.IGNORECASE|re.DOTALL)
+        rn = re.search('rn\:[^\"]*\"([^\"]*)',data,re.IGNORECASE|re.DOTALL)
+        if streams and subs and rn:
+            streams = streams.group(1).split(',')
+            subs = subs.group(1)
+            rn = rn.group(1).split(',')
+            index = 0
+            result = []
+            headers = {'Referer':'me'}
+            for stream in streams:
+                q = rn[index]
+                if q == 'HD':
+                    q = '720p'
+                else:
+                    q = '???'
+                if len(subs) > 0:
+                    result.append({'url':stream,'quality':q,'subs':subs,'headers':headers})
+                else:
+                    result.append({'url':stream,'quality':q,'headers':headers})
+                index+=1
+            return result
+
+def _regex(url):
+    return re.search('munkvideo\.cz/video/',url,re.IGNORECASE | re.DOTALL)
+
diff --git a/lib/server/myviruresolver.py b/lib/server/myviruresolver.py
new file mode 100644
index 0000000..3706a3d
--- /dev/null
+++ b/lib/server/myviruresolver.py
@@ -0,0 +1,59 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# /*
+# *      Copyright (C) 2015 Lubomir Kucera
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+
+import re
+import util
+import urllib.request, urllib.parse, urllib.error
+import pickle
+from demjson import demjson
+
+__author__ = 'Jose Riha'
+__name__ = 'myviru'
+
+UA = urllib.parse.quote(util.UA)
+
+
+def supports(url):
+    return re.search(r'http://myvi.ru/player/flash', url) is not None
+
+
+def resolve(url):
+    cookies = {}
+    result = []
+    util.init_urllib(cookies)
+    id = re.search(r'.*player/flash/(?P<url>.+)', url).group('url')
+    r = util.request('http://myvi.ru/player/api/Video/Get/%s?sig' % id)
+    jsondata = demjson.decode(r)
+    playlist = jsondata['sprutoData']['playlist'][0]
+    uuid = pickle.loads(util._cookie_jar.dump())[
+        '.myvi.ru']['/']['UniversalUserID']
+    for f in playlist['video']:
+        streamurl = f['url']
+        streamurl += '|Cookie=UniversalUserID%3D' + urllib.parse.quote(uuid.value)
+        streamurl += '&User-Agent=' + UA
+        result.append({'url': streamurl})
+    if result:
+        return result
+    else:
+        return None
diff --git a/lib/server/nahnojiresolver.py b/lib/server/nahnojiresolver.py
new file mode 100644
index 0000000..299e40a
--- /dev/null
+++ b/lib/server/nahnojiresolver.py
@@ -0,0 +1,29 @@
+# *	 GNU General Public License for more details.
+# *
+# *	 You should have received a copy of the GNU General Public License
+# *	 along with this program; see the file COPYING.	 If not, write to
+# *	 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *	 http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+__name__='nahnoji'
+__priiority__=-1
+
+def supports(url):
+    return re.search(r'nahnoji\.cz/.+', url) is not None
+
+def resolve(url):
+    # returns the stream url
+    stream = []
+    if url.endswith('.flv'):
+        stream = [url]
+    else:
+        page = util.parse_html(url)
+        stream = ['http://nahnoji.cz'+x['src'] for x in page.select('source[type=video/mp4]')]
+    if stream:
+        result=[]
+        for streamurl in stream:
+            result.append({'name':__name__,'quality':'360p','url':streamurl,'surl':url})
+        return result
+
diff --git a/lib/server/novamovresovler.py b/lib/server/novamovresovler.py
new file mode 100644
index 0000000..e40f6a2
--- /dev/null
+++ b/lib/server/novamovresovler.py
@@ -0,0 +1,36 @@
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import util,re
+__name__ = 'novamov'
+def supports(url):
+    return not _regex(url) == None
+
+def resolve(url):
+    if supports(url):
+        data = util.request(url)
+        m = re.search('flashvars.file=\"([^\"]+)',data,re.IGNORECASE | re.DOTALL)
+        n = re.search('flashvars.filekey=\"([^\"]+)',data,re.IGNORECASE | re.DOTALL)
+        if not m == None and not n == None:
+            data = util.request('http://www.novamov.com/api/player.api.php?key=%s&file=%s&user=undefined&pass=undefined&codes=1' % (n.group(1),m.group(1)))
+            stream = re.search('url=([^\&]+)',data).group(1)
+            return [{'url':stream}]
+
+def _regex(url):
+    return re.search('novamov\.com',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/openload.py b/lib/server/openload.py
new file mode 100644
index 0000000..4556342
--- /dev/null
+++ b/lib/server/openload.py
@@ -0,0 +1,276 @@
+# -*- coding: UTF-8 -*-
+# /*
+# *      Copyright (C) 2015 Lubomir Kucera
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+# uses code fragments from https://github.com/LordVenom/venom-xbmc-addons
+import re
+import util
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
+from aadecode import AADecoder
+
+class cRequestHandler:
+    REQUEST_TYPE_GET = 0
+    REQUEST_TYPE_POST = 1
+
+    def __init__(self, sUrl):
+        self.__sUrl = sUrl
+        self.__sRealUrl = ''
+        self.__cType = 0
+        self.__aParamaters = {}
+        self.__aHeaderEntries = []
+        self.removeBreakLines(True)
+        self.removeNewLines(True)
+        self.__setDefaultHeader()
+
+    def removeNewLines(self, bRemoveNewLines):
+        self.__bRemoveNewLines = bRemoveNewLines
+
+    def removeBreakLines(self, bRemoveBreakLines):
+        self.__bRemoveBreakLines = bRemoveBreakLines
+
+    def setRequestType(self, cType):
+        self.__cType = cType
+
+    def addHeaderEntry(self, sHeaderKey, sHeaderValue):
+        aHeader = {sHeaderKey : sHeaderValue}
+        self.__aHeaderEntries.append(aHeader)
+
+    def addParameters(self, sParameterKey, mParameterValue):
+        self.__aParamaters[sParameterKey] = mParameterValue
+
+    def getResponseHeader(self):
+        return self.__sResponseHeader
+
+    # url after redirects
+    def getRealUrl(self):
+        return self.__sRealUrl;
+
+    def request(self):
+        self.__sUrl = self.__sUrl.replace(' ', '+')
+        return self.__callRequest()
+
+    def getRequestUri(self):
+        return self.__sUrl + '?' + urllib.parse.urlencode(self.__aParamaters)
+
+    def __setDefaultHeader(self):
+        UA = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; de-DE; rv:1.9.0.3) Gecko/2008092417 Firefox/3.0.3'
+        self.addHeaderEntry('User-Agent', UA)
+        self.addHeaderEntry('Accept-Language', 'de-DE,de;q=0.8,en-US;q=0.6,en;q=0.4')
+        self.addHeaderEntry('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7')
+
+    def __callRequest(self):
+        sParameters = urllib.parse.urlencode(self.__aParamaters)
+
+        if (self.__cType == cRequestHandler.REQUEST_TYPE_GET):
+            if (len(sParameters) > 0):
+                if (self.__sUrl.find('?') == -1):
+                    self.__sUrl = self.__sUrl + '?' + str(sParameters)
+                    sParameters = ''
+                else:
+                    self.__sUrl = self.__sUrl + '&' + str(sParameters)
+                    sParameters = ''
+
+        if (len(sParameters) > 0):
+            oRequest = urllib.request.Request(self.__sUrl, sParameters)
+        else:
+            oRequest = urllib.request.Request(self.__sUrl)
+
+        for aHeader in self.__aHeaderEntries:
+                for sHeaderKey, sHeaderValue in list(aHeader.items()):
+                    oRequest.add_header(sHeaderKey, sHeaderValue)
+
+        sContent = ''
+
+        try:
+            oResponse = urllib.request.urlopen(oRequest, timeout=30)
+            sContent = oResponse.read()
+
+            self.__sResponseHeader = oResponse.info()
+            self.__sRealUrl = oResponse.geturl()
+
+            oResponse.close()
+
+        except urllib.error.HTTPError as e:
+            if e.code == 503:
+                if cloudflare.CheckIfActive(e.headers):
+                    cookies = e.headers['Set-Cookie']
+                    cookies = cookies.split(';')[0]
+                    from resources.lib.cloudflare import CloudflareBypass
+                    sContent = CloudflareBypass().GetHtml(self.__sUrl,e.read(),cookies)
+
+                    self.__sResponseHeader = ''
+                    self.__sRealUrl = ''
+
+            if not  sContent:
+                cConfig().error("%s,%s" % (cConfig().getlanguage(30205), self.__sUrl))
+                return ''
+
+        if (self.__bRemoveNewLines == True):
+            sContent = sContent.replace("\n","")
+            sContent = sContent.replace("\r\t","")
+
+        if (self.__bRemoveBreakLines == True):
+            sContent = sContent.replace("&nbsp;","")
+
+        return sContent
+
+    def getHeaderLocationUrl(self):
+        opened = urllib.request.urlopen(self.__sUrl)
+        return opened.geturl()
+
+class cParser:
+
+    def parseSingleResult(self, sHtmlContent, sPattern):
+        aMatches = re.compile(sPattern).findall(sHtmlContent)
+        if (len(aMatches) == 1):
+                aMatches[0] = self.__replaceSpecialCharacters(aMatches[0])
+                return True, aMatches[0]
+        return False, aMatches
+
+    def __replaceSpecialCharacters(self, sString):
+        res=sString.replace('\\/','/').replace('&amp;','&').replace('\xc9','E').replace('&#8211;', '-')
+        res=res.replace('&#038;', '&').replace('&rsquo;','\'').replace('\r','').replace('\n','')
+        res=res.replace('\t','').replace('&#039;',"'")
+        return res
+
+    def parse(self, sHtmlContent, sPattern, iMinFoundValue = 1):
+        sHtmlContent = self.__replaceSpecialCharacters(str(sHtmlContent))
+        aMatches = re.compile(sPattern, re.IGNORECASE).findall(sHtmlContent)
+        if (len(aMatches) >= iMinFoundValue):
+            return True, aMatches
+        return False, aMatches
+
+    def replace(self, sPattern, sReplaceString, sValue):
+         return re.sub(sPattern, sReplaceString, sValue)
+
+    def escape(self, sValue):
+        return re.escape(sValue)
+
+    def getNumberFromString(self, sValue):
+        sPattern = "\d+"
+        aMatches = re.findall(sPattern, sValue)
+        if (len(aMatches) > 0):
+            return aMatches[0]
+        return 0
+
+
+__author__ = 'Jose Riha/Lubomir Kucera'
+__name__ = 'openload'
+
+
+def supports(url):
+    return re.search(r'openload\.\w+/embed/.+', url) is not None
+
+def base10toN(num, n):
+    """Change a  to a base-n number.
+    Up to base-36 is supported without special notation."""
+
+    new_num_string = ''
+    current = num
+
+    while current != 0:
+        remainder = current % n
+        if 36 > remainder > 9:
+            remainder_string = chr(remainder + 87)
+        elif remainder >= 36:
+            remainder_string = '(' + str(remainder) + ')'
+        else:
+            remainder_string = str(remainder)
+        new_num_string = remainder_string + new_num_string
+        current = current / n
+    return new_num_string
+
+def resolve(url):
+
+    oRequest = cRequestHandler(url)
+    sHtmlContent = oRequest.request()
+
+    oParser = cParser()
+    string = ''
+
+    sPattern = '<script type="text\/javascript">(ﾟωﾟ.+?)<\/script>'
+    aResult = oParser.parse(sHtmlContent, sPattern)
+
+    vid = 'XXXXXX'
+    string2=[]
+
+    for aEntry in aResult[1]:
+        s = AADecoder(aEntry).decode()
+        string2.append(s)
+
+        if 'welikekodi_ya_rly' in s:
+            c0 = re.search('welikekodi_ya_rly = ([^<>;"]+);', s)
+            if c0:
+                c = c0.group(1)
+                c = c.replace('Math.round','int')
+                cc = str(eval(c))
+                vid = '[' + cc + ']'
+
+    for string3 in string2:
+        if ('toString' in string3) and (vid in string3):
+            base = int(re.findall('toString\(a\+([0-9]+)\)',string3)[0])
+            table = re.findall('(\([0-9][^)]+\))',string3)
+
+            for str1 in table:
+                val = re.findall('([0-9]+),([0-9]+)',str1)
+                base2 = base + int(val[0][0])
+                str2 = base10toN(int(val[0][1]), base2)
+                string3 = string3.replace(str1, str2)
+
+            #clean up
+            string3 = string3.replace('+', '')
+            string3 = string3.replace('"', '')
+            string3 = string3.replace('', '')
+
+            #a hack for not having to recode everything
+            url = re.findall('(http[^<>}]+)',string3)[0]
+            string = 'src="' + url + '?mime=true"'
+
+    if (string):
+        sContent = string.replace('\\','')
+
+        api_call = ''
+
+        sPattern = 'src=\s*?"(.*?)\?'
+        aResult = oParser.parse(sContent, sPattern)
+
+        if (aResult[0] == True):
+            api_call = aResult[1][0]
+
+        if not api_call:
+            sPattern = 'window\.vr *=["\'](.+?)["\']'
+            aResult = oParser.parse(sContent, sPattern)
+            if (aResult[0] == True):
+                api_call = aResult[1][0]
+
+    if (api_call):
+
+        if 'openload.co/stream' in api_call:
+            UA = 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:39.0) Gecko/20100101 Firefox/39.0'
+            headers = {'User-Agent': UA }
+
+            req = urllib.request.Request(api_call,None,headers)
+            res = urllib.request.urlopen(req)
+            finalurl = res.geturl()
+            api_call = finalurl
+
+    return [{'url': api_call}]
+
diff --git a/lib/server/playedtoresolver.py b/lib/server/playedtoresolver.py
new file mode 100644
index 0000000..3db0468
--- /dev/null
+++ b/lib/server/playedtoresolver.py
@@ -0,0 +1,42 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2013 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+__name__ = 'played.to'
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def resolve(url):
+    m = _regex(url)
+    if m:
+        surl = m.group('url').replace('embed','iframe')
+        data = util.request('http://played.to/%s' % surl)
+        n = re.search('file: \"(.+?)\"',data,re.IGNORECASE | re.DOTALL)
+        quality = '???'
+        q = re.search('x(\d+)\.html',url)
+        if q:
+            quality = q.group(1)+'p'
+        if not n == None:
+            return [{'quality':quality,'url':n.group(1).strip()}]
+
+def _regex(url):
+    return re.search('played\.to/(?P<url>(embed|iframe)-.+?)$',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/playmdresolver.py b/lib/server/playmdresolver.py
new file mode 100644
index 0000000..6b26018
--- /dev/null
+++ b/lib/server/playmdresolver.py
@@ -0,0 +1,28 @@
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+
+__name__='play.md'
+def supports(url):
+    return not _regex(url) == None
+
+
+def resolve(link):
+    if _regex(link):
+        data = util.request(link)
+        url = re.search('base_url\: \"(?P<url>[^\"]+)',data)
+        file = re.search('file_name\: \"(?P<url>[^\"]+)',data)
+        res = re.search('resolutions\: \"(?P<url>[^\"]+)',data)
+        if url and file and res:
+            url = '%s/%s/%s' % (url.group('url'),res.group('url'),file.group('url'))
+            return [{'quality':res.group('url'),'url':url}]
+
+def _regex(url):
+    return re.search('play\.md',url,re.IGNORECASE | re.DOTALL)
+
diff --git a/lib/server/publicvideohostresolver.py b/lib/server/publicvideohostresolver.py
new file mode 100644
index 0000000..6bbd178
--- /dev/null
+++ b/lib/server/publicvideohostresolver.py
@@ -0,0 +1,48 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2013 mx3L
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re, util, decimal, random, base64, urllib.request, urllib.parse, urllib.error
+
+__name__ = 'publicvideohost'
+def supports(url):
+    return not _regex(url) == None
+
+def gen_random_decimal(i, d):
+    return decimal.Decimal('%d.%d' % (random.randint(0, i), random.randint(0, d)))
+
+# returns the steam url
+def resolve(url):
+    m = _regex(url)
+    if m:
+        id = int(m.group('v'))
+        params = {
+                  'v':id,
+                  }
+        quality = "480p"
+        data = util.request("http://embed.publicvideohost.org/v.php?" + urllib.parse.urlencode(params))
+        vurl = re.search('file\:(.*?)\"(?P<url>[^"]+)',data, re.IGNORECASE | re.DOTALL).group('url')
+        return [{'quality':quality, 'url':vurl}]
+    
+    
+def _regex(url):
+    m = re.search('http://embed\.publicvideohost\.org/v\.php\?(.+?)v=(?P<v>[0-9]+)', url, re.IGNORECASE | re.DOTALL)
+    return m
+    
diff --git a/lib/server/putlockerresolver.py b/lib/server/putlockerresolver.py
new file mode 100644
index 0000000..08192bd
--- /dev/null
+++ b/lib/server/putlockerresolver.py
@@ -0,0 +1,159 @@
+# -*- coding: UTF-8 -*-
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# *
+# */
+
+# thanks to:
+#   https://github.com/Eldorados
+
+import re,util,os
+__name__ = 'putlocker'
+
+
+def supports(url):
+    return not _regex(url) == None
+
+            
+def get_host_and_id(url):
+        r = re.search('//(.+?)/(?:file|embed)/([0-9A-Z]+)', url)
+        if r:
+                return r.groups()
+        else:
+                return False
+                
+def get_host(host,media_id):
+    #host,media_id=get_host_and_id(url)
+        if 'putlocker' in host:
+            host = 'www.putlocker.com'
+        else:
+            host = 'www.sockshare.com'
+        return 'http://%s/file/%s' % (host, media_id)
+                
+            
+
+def login_stale():
+        url = 'http://www.putlocker.com/cp.php'
+        if not os.path.exists(cookie_file):
+            return True
+    #self.net.set_cookies(cookie_file)
+        source =  util.request(url)
+        if re.search('(?:<span class=pro_user>\( Pro \)</span>|<span class="free_user">\( Free \)</span>)', source):
+            print ('Putlocker account appears to be logged in.')
+            return False
+        else:
+            return True
+
+                
+                
+# returns the steam url
+def url(url):
+    if supports(url):
+    
+        '''
+        if self.get_setting('login') == 'true':
+            if login_stale():
+                login()
+        #self.net.set_cookies(cookie_file)
+        '''
+        
+        host,media_id=get_host_and_id(url)
+        web_url = get_host(host,media_id)
+
+        #find session_hash
+        try:
+            html = util.request(web_url)
+        except urllib.error.URLError as e:
+            print(('putlocker: got http error %d fetching %s' % (e.code, web_url)))
+            return False
+        
+        #Shortcut for logged in users
+        pattern = '<a href="(/.+?)" class="download_file_link" style="margin:0px 0px;">Download File</a>'
+        link = re.search(pattern, html)
+        if link:
+            print('Direct link found: %s' %link.group(1))
+            return 'http://www.putlocker.com%s' %link.group(1)
+
+        r = re.search('value="([0-9a-f]+?)" name="hash"', html)
+        if r:
+            session_hash = r.group(1)
+        else:
+            print ('putlocker: session hash not found')
+            return False
+
+        #post session_hash
+        try:
+            html = util.post(web_url, {'hash': session_hash,'confirm': 'Continue as Free User'})
+        except urllib.error.URLError as e:
+            print(('putlocker: got http error %d posting %s' %(e.code, web_url)))
+            return False
+        
+        #find playlist code  
+        r = re.search('\?stream=(.+?)\'', html)
+        if r:
+            playlist_code = r.group(1)
+        else:
+            r = re.search('key=(.+?)&',html)
+            playlist_code = r.group(1)
+        
+        #find download link
+        #q = self.get_setting('quality')
+        q = '1'
+        
+        #Try to grab highest quality link available
+        if q == '1':
+            #download & return link.
+            if 'putlocker' in host:
+                Avi = "http://putlocker.com/get_file.php?stream=%s&original=1"%playlist_code
+                html = util.request(Avi)
+                final=re.compile('url="(.+?)"').findall(html)[0].replace('&amp;','&')
+                return [final]
+            else:
+                Avi = "http://sockshare.com/get_file.php?stream=%s&original=1"%playlist_code
+                html = util.request(Avi)
+                final=re.compile('url="(.+?)"').findall(html)[0].replace('&amp;','&')
+                return [final]
+
+        #Else grab standard flv link
+        else:
+            xml_url = re.sub('/(file|embed)/.+', '/get_file.php?stream=', web_url)
+            xml_url += playlist_code
+            try:
+                html = util.request(xml_url)
+            except urllib.error.URLError as e:
+                pritn ('putlocker: got http error %d fetching %s'(e.code, xml_url))
+                return False
+    
+            r = re.search('url="(.+?)"', html)
+            if r:
+                flv_url = r.group(1)
+            else:
+                print ('putlocker: stream url not found')
+                return False
+            
+            return [flv_url.replace('&amp;','&')]
+                
+                
+def resolve(u):
+    stream = url(u)
+    if stream:
+        return [{'name':__name__,'quality':'360p','url':stream[0],'surl':u}]
+                 
+                
+def _regex(url):
+    return re.search('http://(www.)?(putlocker|sockshare).com/' +  '(file|embed)/[0-9A-Z]+', url,re.IGNORECASE | re.DOTALL) 
\ No newline at end of file
diff --git a/lib/server/rutuberesolver.py b/lib/server/rutuberesolver.py
new file mode 100644
index 0000000..4076680
--- /dev/null
+++ b/lib/server/rutuberesolver.py
@@ -0,0 +1,41 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+__name__ = 'rutube'
+def supports(url):
+	return not _regex(url) == None
+
+# returns the steam url
+def url(url):
+	m = _regex(url)
+	if m:
+		data = util.request('http://rutube.ru/trackinfo/'+m.group('id')+'.xml')
+		n = re.search('<m3u8>([^<]+)',data,re.IGNORECASE | re.DOTALL)
+		if not n == None:
+			return [n.group(1).strip()]
+
+def resolve(u):
+	stream = url(u)
+	if stream:
+		return [{'name':__name__,'quality':'640p','url':stream[0],'surl':u}]
+def _regex(url):
+	return re.search('rutube\.ru/(video/embed|embed)/(?P<id>[^$]+)',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/servertipczresolver.py b/lib/server/servertipczresolver.py
new file mode 100644
index 0000000..462e7cc
--- /dev/null
+++ b/lib/server/servertipczresolver.py
@@ -0,0 +1,40 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util,urllib.request,urllib.parse,urllib.error
+__name__ = 'servertip'
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def resolve(url):
+    if supports(url):
+        data = util.request(url)
+        data = util.substr(data,'<div id=\"player_code','</div')
+        try:
+            video_id = re.search('flv\|\|([^\|]+)',data).group(1)
+            return [{'url':'http://servertip.cz/cgi-bin/dl.cgi/%s/video.flv' % video_id}]
+        except:
+            pass
+
+def _regex(url):
+    return re.search('servertip\.cz',url,re.IGNORECASE | re.DOTALL)
+
diff --git a/lib/server/sledujuserialyresolver.py b/lib/server/sledujuserialyresolver.py
new file mode 100644
index 0000000..f781e44
--- /dev/null
+++ b/lib/server/sledujuserialyresolver.py
@@ -0,0 +1,50 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util,urllib.request,urllib.error,urllib.parse,traceback
+__name__ = 'zkouknito.cz'
+def supports(url):
+    return not _regex(url) == None
+
+def resolve(url):
+    m = _regex(url)
+    if not m == None:
+        data = util.request(url)
+        if data.find('jwplayer(\'mediaplayer') > 0:
+            video = re.search('\'file\'\: \'(?P<url>.+?[flv|mp4])\'',data)
+            if video:
+                
+                item = {}
+                item['url'] = video.group('url')
+                subs = re.search('\'file\'\: \'(?P<url>.+?srt)',data)
+                if subs:
+                    item['subs'] = _furl(subs.group('url'))
+                print(item)
+                return [item]
+
+def _furl(url):
+    if url.startswith('http'):
+        return url
+    url = url.lstrip('./')
+    return 'http://www.sledujuserialy.cz/'+url
+
+def _regex(url):
+    return re.search('(www\.)?sledujuserialy.cz/(.+?)',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/stagevuresolver.py b/lib/server/stagevuresolver.py
new file mode 100644
index 0000000..ab7033b
--- /dev/null
+++ b/lib/server/stagevuresolver.py
@@ -0,0 +1,36 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+__name__ = 'stagevu'
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def resolve(url):
+    if supports(url):
+        data = util.substr(util.request(url),'<body>','</script>')
+        m = re.search('url\[[\d]+\] = \'([^\']+)',data,re.IGNORECASE | re.DOTALL)
+        if not m == None:
+            return [{'url':m.group(1)}]
+
+def _regex(url):
+    return re.search('(www\.)?stagevu.com/(.+?)uid=(?P<id>(.+?))',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/streamcloudresolver.py b/lib/server/streamcloudresolver.py
new file mode 100644
index 0000000..bb3fe59
--- /dev/null
+++ b/lib/server/streamcloudresolver.py
@@ -0,0 +1,61 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+__name__ = 'streamcloud'
+def supports(url):
+	return not _regex(url) == None
+
+	
+	
+	
+# returns the steam url
+def url(url):
+	m = _regex(url)
+	if not m == None:
+
+		data = util.substr(util.request(url),'class=\"proform\"','</form>')
+		#print data
+		form_values = {}
+		pattern = '<input.+?name="(?P<name>.*?)".+?value="(?P<value>.*?)"'
+		for n in re.finditer(pattern,data,re.IGNORECASE | re.DOTALL ):
+			form_values[n.group('name')] = n.group('value')
+		#print form_values
+		try:
+			#time.sleep(10)
+			resp = util.post(url,form_values)
+		except:
+			util.error('streamcloud: got http error fetching %s' % (url))
+			return False
+
+		r = re.search('file: "(.+?)",', resp)
+		if r:
+			return [r.group(1)]
+				
+			
+def resolve(u):
+	stream = url(u)
+	if stream:
+		return [{'name':__name__,'quality':'640p','url':stream[0],'surl':u}]
+
+		
+def _regex(url):
+	return re.search('http://(www.)?streamcloud.eu/[0-9A-Za-z]+',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/streamintoresolver.py b/lib/server/streamintoresolver.py
new file mode 100644
index 0000000..e7c5cdd
--- /dev/null
+++ b/lib/server/streamintoresolver.py
@@ -0,0 +1,43 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2013 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+__name__ = 'streamin.to'
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def resolve(url):
+    m = _regex(url)
+    if m:
+        data = util.request('http://streamin.to/'+m.group('url'))
+        n = re.search('config:{file:\'(.+?)\'',data,re.IGNORECASE | re.DOTALL)
+        k = re.search('streamer: \"(.+?)\"',data,re.IGNORECASE | re.DOTALL)
+        quality = '???'
+        q = re.search('x(\d+)\.html',url)
+        if q:
+            quality = q.group(1)+'p'
+        if n and k:
+            url = '%s playpath=%s' % (k.group(1).strip(),n.group(1).strip())
+            return [{'quality':quality,'url':url}]
+
+def _regex(url):
+    return re.search('streamin\.to/(?P<url>.+?)$',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/streamujtvresolver.py b/lib/server/streamujtvresolver.py
new file mode 100644
index 0000000..9ff5664
--- /dev/null
+++ b/lib/server/streamujtvresolver.py
@@ -0,0 +1,78 @@
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re
+import util
+import json
+from base64 import b64decode, b64encode
+
+__name__ = 'streamujtv'
+
+
+def supports(url):
+    return _regex(url) is not None
+
+
+def resolve(url):
+    m = _regex(url)
+    if m:
+        util.init_urllib()
+        data = util.request(url)
+        if data.find('Toto video neexistuje') > 0:
+            util.error('Video bylo smazano ze serveru')
+            return
+        player = 'http://www.streamuj.tv/new-flash-player/mplugin4.swf'
+        headers = {
+            'User-Agent': util.UA,
+            'Referer': 'http://www.streamuj.tv/mediaplayer/player.swf',
+            'Cookie': ','.join("%s=%s" % (c.name, c.value) for c in util._cookie_jar)
+        }
+        index = 0
+        result = []
+        qualities = re.search(r'rn\:[^\"]*\"([^\"]*)', data, re.IGNORECASE | re.DOTALL)
+        langs = re.search(r'langs\:[^\"]*\"([^\"]+)', data, re.IGNORECASE | re.DOTALL)
+        languages = ['']  # pretend there is at least language so we read 1st stream info
+        if langs:
+            languages = langs.group(1).split(',')
+        for language in languages:
+            streams = re.search(r'res{index}\:[^\"]*\"([^\"]+)'.format(index=index),
+                                data, re.IGNORECASE | re.DOTALL)
+            subs = re.search(r'sub{index}\:[^\"]*\"([^\"]+)'.format(index=index),
+                             data, re.IGNORECASE | re.DOTALL)
+            if subs:
+                subs = re.search(r'[^>]+>([^,$]+)', subs.group(1), re.IGNORECASE | re.DOTALL)
+            else:
+                subs = None
+            if streams and qualities:
+                streams = streams.group(1).split(',')
+                rn = qualities.group(1).split(',')
+                qindex = 0
+                for stream in streams:
+                    q = rn[qindex]
+                    if q == 'HD':
+                        q = '720p'
+                    else:
+                        q = 'SD'
+                    item = {
+                        'url': stream,
+                        'quality': q,
+                        'headers': headers,
+                        'lang': language
+                    }
+                    if subs:
+                        link = subs.group(1)
+                        item['lang'] += ' + subs'
+                        item['subs'] = link
+                    result.append(item)
+                    qindex += 1
+            index += 1
+        return result
+
+
+def _regex(url):
+    return re.search(r'streamuj\.tv/video/', url, re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/trivialresolver.py b/lib/server/trivialresolver.py
new file mode 100644
index 0000000..89e6857
--- /dev/null
+++ b/lib/server/trivialresolver.py
@@ -0,0 +1,22 @@
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re
+__name__='simple'
+__priority__ = -2
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def resolve(url):
+    if supports(url):
+        return [{'url':url}]
+
+def _regex(url):
+    return re.search('\.(flv|mp4|avi|wmv)$',url,re.IGNORECASE | re.DOTALL)
+
diff --git a/lib/server/videobbresolver.py b/lib/server/videobbresolver.py
new file mode 100644
index 0000000..b1659c1
--- /dev/null
+++ b/lib/server/videobbresolver.py
@@ -0,0 +1,158 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# thanks to Lynx187 and his fix in https://github.com/t0mm0/xbmc-urlresolver
+import util,re,base64
+
+from base64 import b64decode
+from binascii import unhexlify
+__name__ = 'videobb'
+def supports(url):
+    return not _regex(url) == None
+
+def _regex(url):
+    return re.search('http://(www\.)?videobb.com/[\w\d]+/(?P<id>[^$]+)', url, re.IGNORECASE | re.DOTALL)
+
+def resolve(url):
+    m = _regex(url)
+    if not m == None:
+        util.init_urllib()
+        data = util.request('http://videobb.com/player_control/settings.php?v=%s&em=TRUE&fv=v1.1.67' % m.group('id'))
+        json = data.replace('false','False').replace('true','True').replace('null','None')
+        aData = eval('('+json+')')
+        max_res = 99999
+        r = re.finditer('"l".*?:.*?"(.+?)".+?"u".*?:.*?"(.+?)"', json)
+        chosen_res = 0
+        stream_url = False
+        stream_url_part1 = False 
+        if r:
+
+            for match in r:
+                print(match.groups())
+                res, url = match.groups()
+                res = int(res.strip('p'))
+                if res > chosen_res and res <= max_res:
+                    stream_url_part1 = url.decode('base-64')
+                    chosen_res = res
+        else:
+            return
+
+        if not stream_url_part1:
+            return
+        # Decode the link from the json data settings
+        spn_ik = unhexlify(__decrypt(aData["settings"]["login_status"]["spen"], aData["settings"]["login_status"]["salt"], 950569)).split(';')
+        spn = spn_ik[0].split('&')
+        ik = spn_ik[1]
+
+        for item in ik.split('&') :
+            temp = item.split('=')
+            if temp[0] == 'ik' : 
+                key = __get_key(temp[1])
+
+        sLink = ""
+        for item in spn :
+            item = item.split('=')
+            if(int(item[1])==1):
+                sLink = sLink + item[0]+ '=' + __decrypt(aData["settings"]["info"]["sece2"], aData["settings"]["config"]["rkts"], key) + '&'  #decrypt32byte
+            elif(int(item[1]==2)):
+                sLink = sLink + item[0]+ '=' + __decrypt(aData["settings"]["banner"]["g_ads"]["url"],aData["settings"]["config"]["rkts"], key) + '&'	
+            elif(int(item[1])==3):
+                sLink = sLink + item[0]+ '=' + __decrypt(aData["settings"]["banner"]["g_ads"]["type"],aData["settings"]["config"]["rkts"], key,26,25431,56989,93,32589,784152) + '&'	
+            elif(int(item[1])==4):
+                sLink = sLink + item[0]+ '=' + __decrypt(aData["settings"]["banner"]["g_ads"]["time"],aData["settings"]["config"]["rkts"], key,82,84669,48779,32,65598,115498) + '&'
+            elif(int(item[1])==5):
+                sLink = sLink + item[0]+ '=' + __decrypt(aData["settings"]["login_status"]["euno"],aData["settings"]["login_status"]["pepper"], key,10,12254,95369,39,21544,545555) + '&'
+            elif(int(item[1])==6):
+                sLink = sLink + item[0]+ '=' + __decrypt(aData["settings"]["login_status"]["sugar"],aData["settings"]["banner"]["lightbox2"]["time"], key,22,66595,17447,52,66852,400595) + '&'			
+
+        sLink = sLink + "start=0"
+
+        stream_url = stream_url_part1 + '&' + sLink
+
+        return [{'url':stream_url}]
+
+def __decrypt(str, k1, k2, p4 = 11, p5 = 77213, p6 = 81371, p7 = 17, p8 = 92717, p9 = 192811):
+    tobin = hex2bin(str,len(str)*4)
+    tobin_lenght = len(tobin)
+    keys = []
+    index = 0
+
+    while (index < tobin_lenght*3):
+        k1 = ((int(k1) * p4) + p5) % p6
+        k2 = ((int(k2) * p7) + p8) % p9
+        keys.append((int(k1) + int(k2)) % tobin_lenght)
+        index += 1
+
+    index = tobin_lenght*2
+
+    while (index >= 0):
+        val1 = keys[index]
+        mod  = index%tobin_lenght
+        val2 = tobin[val1]
+        tobin[val1] = tobin[mod]
+        tobin[mod] = val2
+        index -= 1
+
+    index = 0
+    while(index < tobin_lenght):
+        tobin[index] = int(tobin[index]) ^ int(keys[index+(tobin_lenght*2)]) & 1
+        index += 1
+        decrypted = bin2hex(tobin)
+    return decrypted
+
+def hex2bin(val,fill):
+    bin_array = []
+    string =  bin(int(val, 16))[2:].zfill(fill)
+    for value in string:
+        bin_array.append(value)
+    return bin_array
+
+def bin2hex(val):
+    string = str("")
+    for char in val:
+        string+=str(char)
+    return "%x" % int(string, 2)
+
+def bin( x):
+    '''
+    bin(number) -> string
+    Stringifies an int or long in base 2.
+    '''
+    if x < 0:
+        return '-' + bin(-x)
+    out = []
+    if x == 0: out.append('0')
+    while x > 0:
+        out.append('01'[x & 1])
+        x >>= 1
+        pass
+    try:
+        return '0b' + ''.join(reversed(out))
+    except NameError as ne2:
+        out.reverse()
+    return '0b' + ''.join(out)
+
+def __get_key(nbr):
+    if nbr == '1': return 226593
+    elif nbr == '2': return 441252
+    elif nbr == '3': return 301517
+    elif nbr == '4': return 596338
+    elif nbr == '5': return 852084
+    else: return False
diff --git a/lib/server/videomailresolver.py b/lib/server/videomailresolver.py
new file mode 100644
index 0000000..a3be844
--- /dev/null
+++ b/lib/server/videomailresolver.py
@@ -0,0 +1,56 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2016 mx3L & lzoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re, util,urllib.request,urllib.error,urllib.parse
+__name__ = 'videomail'
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def resolve(url):
+    m = _regex(url)
+    if m:
+        items = []
+        vurl = m.group('url')
+        vurl = re.sub('\&[^$]*','',vurl)
+        vurl = re.sub('/embed','',vurl)
+        vurl = 'http://videoapi.my.mail.ru/' + vurl + '.json'
+
+        util.init_urllib()
+        req = urllib.request.Request(vurl)
+        req.add_header('User-Agent', util.UA)
+        resp = urllib.request.urlopen(req)
+        data = resp.read()
+        vkey = []
+        for cookie in re.finditer('(video_key=[^\;]+)',resp.headers.get('Set-Cookie'),re.IGNORECASE | re.DOTALL):
+            vkey.append(cookie.group(1))
+        headers = {'Cookie':vkey[-1]}
+        item = util.json.loads(data)
+        for v in item['videos']:
+            quality = v['key']
+            link = v['url']
+            items.append({'quality':quality, 'url':link, 'headers':headers})
+        return items
+
+def _regex(url):
+    m1 = re.search('http://.+?mail\.ru.+?<param.+?value=\"movieSrc=(?P<url>[^\"]+)', url, re.IGNORECASE | re.DOTALL)
+    m2 = re.search('://video.+?\.mail\.ru\/(?P<url>.+?)\.html', url, re.IGNORECASE | re.DOTALL)
+    return m1 or m2
diff --git a/lib/server/videonetresolver.py b/lib/server/videonetresolver.py
new file mode 100644
index 0000000..cad97e3
--- /dev/null
+++ b/lib/server/videonetresolver.py
@@ -0,0 +1,67 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+__name__ = '24video'
+def supports(url):
+	return not _regex(url) == None
+
+	
+def latin2text(word):
+    dict_hex = {'&#xe1;' : 'á',
+                '&#x10d;': 'č',
+                '&#x10f;': 'ď',
+                '&#xe9;' : 'é',
+                '&#x11b;': 'ě',
+                '&#xed;' : 'í',
+                '&#xf1;' : 'ñ',
+                '&#xf3;' : 'ó',
+                '&#x159;': 'ř',
+                '&#x161;': 'š',
+                '&#x165;': 'ť',
+                '&#xfa;' : 'ú',
+                '&#xfc;' : 'ü',
+                '&#xfd;' : 'ý',
+                '&#x17e;': 'ž',
+                }
+    for key in list(dict_hex.keys()):
+        word = word.replace(key,dict_hex[key])
+    return word
+	
+	
+	
+# returns the steam url
+def url(url):
+	m = _regex(url)
+	if not m == None:
+		data = latin2text(util.request('%s%s%s?mode=play' % (m.group('url') ,m.group('html'),m.group('id'))))
+		f = re.search('<videos><video url=\'(.+?)[^ ] rating',data,re.IGNORECASE | re.DOTALL)
+		if f:
+			return [f.group(1)]
+
+def resolve(u):
+	stream = url(u)
+	if stream:
+		return [{'name':__name__,'quality':'480p','url':stream[0],'surl':u}]
+			
+			
+def _regex(url):
+	return re.search('id=(?P<id>.+?)&idHtml=(?P<html>.+?)&.*rootUrl=(?P<url>.+?)&',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/videoweedresolver.py b/lib/server/videoweedresolver.py
new file mode 100644
index 0000000..c8d1a21
--- /dev/null
+++ b/lib/server/videoweedresolver.py
@@ -0,0 +1,40 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+__name__ = 'videoweed'
+def supports(data):
+    return not _regex(data) == None
+
+def resolve(url):
+    if not _regex(url) == None:
+        data = util.request(url.replace('&#038;','&'))
+        data = util.substr(data,'flashvars','params')
+        domain = re.search('flashvars\.domain=\"([^\"]+)',data,re.IGNORECASE | re.DOTALL).group(1)
+        file = re.search('flashvars\.file=\"([^\"]+)',data,re.IGNORECASE | re.DOTALL).group(1)
+        key = re.search('flashvars\.filekey=\"([^\"]+)',data,re.IGNORECASE | re.DOTALL).group(1)
+        data = util.request('%s/api/player.api.php?key=%s&file=%s&user=undefined&codes=undefined&pass=undefined'% (domain,key,file))
+        m = re.search('url=(?P<url>[^\&]+)',data,re.IGNORECASE | re.DOTALL)
+        if not m == None:
+            return [{'url':m.group('url')}]
+
+def _regex(data):
+    return re.search('http\://embed.videoweed.com(.+?)', data, re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/videozerresolver.py b/lib/server/videozerresolver.py
new file mode 100644
index 0000000..6f59739
--- /dev/null
+++ b/lib/server/videozerresolver.py
@@ -0,0 +1,158 @@
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+# thanks to Lynx187 and his fix in https://github.com/t0mm0/xbmc-urlresolver
+
+import re,util,base64
+
+from base64 import b64decode
+from binascii import unhexlify
+__name__ = 'videozer'
+def supports(url):
+    return not _regex(url) == None
+
+def _regex(url):
+    return  re.search('videozer.com/embed/(?P<id>[_\-\w\d]+)',url,re.IGNORECASE | re.DOTALL)
+
+def resolve(url):
+    m = _regex(url)
+    if not m == None:
+        stream = None
+        data = util.request('http://www.videozer.com/player_control/settings.php?v=%s&em=TRUE&fv=v1.1.12' % m.group('id'))
+        json = data.replace('false','False').replace('true','True').replace('null','None')
+        aData = eval('('+json+')')
+        max_res = 99999
+        r = re.finditer('"l".*?:.*?"(.+?)".+?"u".*?:.*?"(.+?)"', json)
+        chosen_res = 0
+        stream_url_part1 = False
+        if r:
+            for match in r:
+                res, url = match.groups()
+                if (res == 'LQ' ): res = 240
+                elif (res == 'SD') : res = 480
+            else: 
+                res = 720
+                if res > chosen_res and res <= max_res:
+                    stream_url_part1 = url.decode('base-64')
+                    chosen_res = res
+        else:
+            return
+        if not stream_url_part1:
+            return
+
+    # Decode the link from the json data settings.
+        spn_ik = unhexlify(__decrypt(aData["cfg"]["login"]["spen"], aData["cfg"]["login"]["salt"], 950569)).split(';')
+        spn = spn_ik[0].split('&')
+        ik = spn_ik[1]
+
+        for item in ik.split('&') :
+            temp = item.split('=')
+            if temp[0] == 'ik' : 
+                key = __get_key(temp[1])
+
+        sLink = ""
+        for item in spn :
+            item = item.split('=')
+            if(int(item[1])==1):
+                sLink = sLink + item[0]+ '=' + __decrypt(aData["cfg"]["info"]["sece2"], aData["cfg"]["environment"]["rkts"], key) + '&'  #decrypt32byte
+            elif(int(item[1]==2)):
+                sLink = sLink + item[0]+ '=' + __decrypt(aData["cfg"]["ads"]["g_ads"]["url"],aData["cfg"]["environment"]["rkts"], key) + '&'	
+            elif(int(item[1])==3):
+                sLink = sLink + item[0]+ '=' + __decrypt(aData["cfg"]["ads"]["g_ads"]["type"],aData["cfg"]["environment"]["rkts"], key,26,25431,56989,93,32589,784152) + '&'	
+            elif(int(item[1])==4):
+                sLink = sLink + item[0]+ '=' + __decrypt(aData["cfg"]["ads"]["g_ads"]["time"],aData["cfg"]["environment"]["rkts"], key,82,84669,48779,32,65598,115498) + '&'
+            elif(int(item[1])==5):
+                sLink = sLink + item[0]+ '=' + __decrypt(aData["cfg"]["login"]["euno"],aData["cfg"]["login"]["pepper"], key,10,12254,95369,39,21544,545555) + '&'
+            elif(int(item[1])==6):
+                sLink = sLink + item[0]+ '=' + __decrypt(aData["cfg"]["login"]["sugar"],aData["cfg"]["ads"]["lightbox2"]["time"], key,22,66595,17447,52,66852,400595) + '&'			
+
+        sLink = sLink + "start=0"
+
+        sMediaLink = stream_url_part1 + '&' + sLink
+
+        return [{'url':sMediaLink}]
+
+def __decrypt(str, k1, k2, p4 = 11, p5 = 77213, p6 = 81371, p7 = 17, p8 = 92717, p9 = 192811):
+    tobin = hex2bin(str,len(str)*4)
+    tobin_lenght = len(tobin)
+    keys = []
+    index = 0
+
+    while (index < tobin_lenght*3):
+        k1 = ((int(k1) * p4) + p5) % p6
+        k2 = ((int(k2) * p7) + p8) % p9
+        keys.append((int(k1) + int(k2)) % tobin_lenght)
+        index += 1
+
+    index = tobin_lenght*2
+
+    while (index >= 0):
+        val1 = keys[index]
+        mod  = index%tobin_lenght
+        val2 = tobin[val1]
+        tobin[val1] = tobin[mod]
+        tobin[mod] = val2
+        index -= 1
+
+    index = 0
+    while(index < tobin_lenght):
+        tobin[index] = int(tobin[index]) ^ int(keys[index+(tobin_lenght*2)]) & 1
+        index += 1
+        decrypted = bin2hex(tobin)
+    return decrypted
+
+def hex2bin(val,fill):
+    bin_array = []
+    string =  bin(int(val, 16))[2:].zfill(fill)
+    for value in string:
+        bin_array.append(value)
+    return bin_array
+
+def bin2hex(val):
+    string = str("")
+    for char in val:
+        string+=str(char)
+    return "%x" % int(string, 2)
+
+def bin( x):
+    '''
+    bin(number) -> string
+    Stringifies an int or long in base 2.
+    '''
+    if x < 0:
+        return '-' + bin(-x)
+    out = []
+    if x == 0: out.append('0')
+    while x > 0:
+        out.append('01'[x & 1])
+        x >>= 1
+        pass
+    try:
+        return '0b' + ''.join(reversed(out))
+    except NameError as ne2:
+        out.reverse()
+    return '0b' + ''.join(out)
+
+def __get_key(nbr):
+    if nbr == '1': return 215678
+    elif nbr == '2': return 516929
+    elif nbr == '3': return 962043
+    elif nbr == '4': return 461752
+    elif nbr == '5': return 141994
+    else: return False
diff --git a/lib/server/videram.py b/lib/server/videram.py
new file mode 100644
index 0000000..2f3b2b3
--- /dev/null
+++ b/lib/server/videram.py
@@ -0,0 +1,39 @@
+# -*- coding: UTF-8 -*-
+# /*
+# *      Copyright (C) 2015 Lubomir Kucera
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re
+import util
+
+__author__ = 'Jose Riha'
+__name__ = 'videram'
+
+
+def supports(url):
+    return re.search(r'play\.videram\.com', url) is not None
+
+
+def resolve(url):
+    try:
+        data=[x for x in util.request('http:'+url).splitlines() if 'file:' in x and '.mp4' in x][0]
+    except:
+        return None 
+    streamurl = re.search(r'.*file: *"([^"]+?)".*', data).group(1)
+    return [{'url': streamurl}]
diff --git a/lib/server/vimeoresolver.py b/lib/server/vimeoresolver.py
new file mode 100644
index 0000000..492f6cd
--- /dev/null
+++ b/lib/server/vimeoresolver.py
@@ -0,0 +1,53 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2014 mx3L
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+
+import re
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
+import random
+import decimal
+
+import util
+
+__name__='vimeo'
+
+def supports(url):
+    return not _regex(url) == None
+
+def resolve(url):
+    m = _regex(url)
+    if m:
+        ret = []
+        data = util.request("http://player.vimeo.com/v2/video/%s/config?type=moogaloop&referrer=&player_url=player.vimeo.com&v=1.0.0&cdn_url=http://a.vimeocdn.com"%m.group('id'))
+        data = util.json.loads(data)
+        h264 = data["request"]["files"]["h264"]
+        for quality in h264.keys():
+            item = {}
+            item['title'] = data['video']['title']
+            item['length'] = data['video']['duration']
+            item['quality'] = quality == 'hd' and '720p' or '480p'
+            item['url'] = h264[quality]['url']
+            ret.append(item)
+        return ret
+
+def _regex(url):
+    return re.search('player.vimeo.com/video/(?P<id>\d+)',url,re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/vkontakteresolver.py b/lib/server/vkontakteresolver.py
new file mode 100644
index 0000000..ecced42
--- /dev/null
+++ b/lib/server/vkontakteresolver.py
@@ -0,0 +1,57 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+__name__ = 'vkontakte'
+def supports(url):
+    return not _regex(url) == None
+
+def resolve(link):
+    if not _regex(link) == None:
+        data = util.request(link)
+        data = util.substr(data,'div id=\"playerWrap\"','<embed>')
+        if len(data) > 0:
+            host = re.search('host=([^\&]+)',data,re.IGNORECASE | re.DOTALL).group(1)
+            oid = re.search('oid=([^\&]+)',data,re.IGNORECASE | re.DOTALL).group(1)
+            uid = re.search('uid=([^\&]+)',data,re.IGNORECASE | re.DOTALL).group(1)
+            vtag = re.search('vtag=([^\&]+)',data,re.IGNORECASE | re.DOTALL).group(1)
+            hd = re.search('hd_def=([^\&]+)',data,re.IGNORECASE | re.DOTALL).group(1)
+            max_hd = re.search('hd=([^\&]+)',data,re.IGNORECASE | re.DOTALL).group(1)
+            no_flv = re.search('no_flv=([^\&]+)',data,re.IGNORECASE | re.DOTALL).group(1)
+            url = '%su%s/videos/%s' % (host,uid,vtag)
+            if no_flv != '1':
+                return [{'name':__name__,'quality':'???','url':url+'.flv','surl':link,'subs':''}]
+            if no_flv == '1':
+                res=int(hd)
+                if max_hd:
+                    res=int(max_hd)
+                if res < 0:
+                    return [{'name':__name__,'quality':'240p','url':url+'.flv','surl':link,'subs':''}]
+                resolutions=['240','360','480','720','1080']
+                ret = []
+                for index,resolution in enumerate(resolutions):
+                    if index>res:
+                        return ret
+                    ret.append({'name':__name__,'quality':resolution+'p','url':url+'.'+resolution+'.mp4','surl':link,'subs':''})
+                return ret
+
+def _regex(data):
+    return re.search('http\://(vkontakte.ru|vk.com)/(.+?)', data, re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/vuuzlaresolver.py b/lib/server/vuuzlaresolver.py
new file mode 100644
index 0000000..ea92b33
--- /dev/null
+++ b/lib/server/vuuzlaresolver.py
@@ -0,0 +1,29 @@
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+
+__name__='vuuzla'
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def resolve(url):
+    m = _regex(url)
+    if m:
+        data = util.request(url)
+        sid = re.search('sid=(?P<sid>[^\&]+)',data)
+        if sid:
+            data = util.request('http://www.vuuzla.com/app/deliver/playlist/%s?sid=%s' % (m.group('id'),sid.group('sid')))
+            link = re.search('<video.+?url=\"(?P<url>[^\"]+)',data)
+            if link:
+                return [{'url':link.group('url')}]
+
+def _regex(url):
+    return re.search('www\.vuuzla\.com.+?playerFrame/(?P<id>[^$]+)',url,re.IGNORECASE | re.DOTALL)
+
diff --git a/lib/server/youtuberesolver.py b/lib/server/youtuberesolver.py
new file mode 100644
index 0000000..7e5a22a
--- /dev/null
+++ b/lib/server/youtuberesolver.py
@@ -0,0 +1,577 @@
+# -*- coding: UTF-8 -*-
+import operator
+
+
+#source from https://github.com/rg3/youtube-dl/blob/master/youtube_dl/utils.py
+class ExtractorError(Exception):
+    """Error during info extraction."""
+
+    def __init__(self, msg, tb=None, expected=False, cause=None, video_id=None):
+        """ tb, if given, is the original traceback (so that it can be printed out).
+        If expected is set, this is a normal error message and most likely not a bug in youtube-dl.
+        """
+
+        if sys.exc_info()[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError):
+            expected = True
+        if video_id is not None:
+            msg = video_id + ': ' + msg
+        if cause:
+            msg += ' (caused by %r)' % cause
+        if not expected:
+            msg += bug_reports_message()
+        super(ExtractorError, self).__init__(msg)
+
+        self.traceback = tb
+        self.exc_info = sys.exc_info()  # preserve original exception
+        self.cause = cause
+        self.video_id = video_id
+
+    def format_traceback(self):
+        if self.traceback is None:
+            return None
+        return ''.join(traceback.format_tb(self.traceback))
+
+_OPERATORS = [
+    ('|', operator.or_),
+    ('^', operator.xor),
+    ('&', operator.and_),
+    ('>>', operator.rshift),
+    ('<<', operator.lshift),
+    ('-', operator.sub),
+    ('+', operator.add),
+    ('%', operator.mod),
+    ('/', operator.truediv),
+    ('*', operator.mul),
+]
+_ASSIGN_OPERATORS = [(op + '=', opfunc) for op, opfunc in _OPERATORS]
+_ASSIGN_OPERATORS.append(('=', lambda cur, right: right))
+
+_NAME_RE = r'[a-zA-Z_$][a-zA-Z_$0-9]*'
+
+
+# source from https://github.com/rg3/youtube-dl/blob/master/youtube_dl/jsinterp.py
+class JSInterpreter(object):
+    def __init__(self, code, objects=None):
+        if objects is None:
+            objects = {}
+        self.code = code
+        self._functions = {}
+        self._objects = objects
+
+    def remove_quotes(self, s):
+        if s is None or len(s) < 2:
+            return s
+        for quote in ('"', "'", ):
+            if s[0] == quote and s[-1] == quote:
+                return s[1:-1]
+        return s
+
+    def interpret_statement(self, stmt, local_vars, allow_recursion=100):
+        if allow_recursion < 0:
+            raise ExtractorError('Recursion limit reached')
+
+        should_abort = False
+        stmt = stmt.lstrip()
+        stmt_m = re.match(r'var\s', stmt)
+        if stmt_m:
+            expr = stmt[len(stmt_m.group(0)):]
+        else:
+            return_m = re.match(r'return(?:\s+|$)', stmt)
+            if return_m:
+                expr = stmt[len(return_m.group(0)):]
+                should_abort = True
+            else:
+                # Try interpreting it as an expression
+                expr = stmt
+
+        v = self.interpret_expression(expr, local_vars, allow_recursion)
+        return v, should_abort
+
+    def interpret_expression(self, expr, local_vars, allow_recursion):
+        expr = expr.strip()
+        if expr == '':  # Empty expression
+            return None
+
+        if expr.startswith('('):
+            parens_count = 0
+            for m in re.finditer(r'[()]', expr):
+                if m.group(0) == '(':
+                    parens_count += 1
+                else:
+                    parens_count -= 1
+                    if parens_count == 0:
+                        sub_expr = expr[1:m.start()]
+                        sub_result = self.interpret_expression(
+                            sub_expr, local_vars, allow_recursion)
+                        remaining_expr = expr[m.end():].strip()
+                        if not remaining_expr:
+                            return sub_result
+                        else:
+                            expr = json.dumps(sub_result) + remaining_expr
+                        break
+            else:
+                raise ExtractorError('Premature end of parens in %r' % expr)
+
+        for op, opfunc in _ASSIGN_OPERATORS:
+            m = re.match(r'''(?x)
+                (?P<out>%s)(?:\[(?P<index>[^\]]+?)\])?
+                \s*%s
+                (?P<expr>.*)$''' % (_NAME_RE, re.escape(op)), expr)
+            if not m:
+                continue
+            right_val = self.interpret_expression(
+                m.group('expr'), local_vars, allow_recursion - 1)
+
+            if m.groupdict().get('index'):
+                lvar = local_vars[m.group('out')]
+                idx = self.interpret_expression(
+                    m.group('index'), local_vars, allow_recursion)
+                assert isinstance(idx, int)
+                cur = lvar[idx]
+                val = opfunc(cur, right_val)
+                lvar[idx] = val
+                return val
+            else:
+                cur = local_vars.get(m.group('out'))
+                val = opfunc(cur, right_val)
+                local_vars[m.group('out')] = val
+                return val
+
+        if expr.isdigit():
+            return int(expr)
+
+        var_m = re.match(
+            r'(?!if|return|true|false)(?P<name>%s)$' % _NAME_RE,
+            expr)
+        if var_m:
+            return local_vars[var_m.group('name')]
+
+        try:
+            return json.loads(expr)
+        except ValueError:
+            pass
+
+        m = re.match(
+            r'(?P<in>%s)\[(?P<idx>.+)\]$' % _NAME_RE, expr)
+        if m:
+            val = local_vars[m.group('in')]
+            idx = self.interpret_expression(
+                m.group('idx'), local_vars, allow_recursion - 1)
+            return val[idx]
+
+        m = re.match(
+            r'(?P<var>%s)(?:\.(?P<member>[^(]+)|\[(?P<member2>[^]]+)\])\s*(?:\(+(?P<args>[^()]*)\))?$' % _NAME_RE,
+            expr)
+        if m:
+            variable = m.group('var')
+            member = self.remove_quotes(m.group('member') or m.group('member2'))
+            arg_str = m.group('args')
+
+            if variable in local_vars:
+                obj = local_vars[variable]
+            else:
+                if variable not in self._objects:
+                    self._objects[variable] = self.extract_object(variable)
+                obj = self._objects[variable]
+
+            if arg_str is None:
+                # Member access
+                if member == 'length':
+                    return len(obj)
+                return obj[member]
+
+            assert expr.endswith(')')
+            # Function call
+            if arg_str == '':
+                argvals = tuple()
+            else:
+                argvals = tuple([
+                    self.interpret_expression(v, local_vars, allow_recursion)
+                    for v in arg_str.split(',')])
+
+            if member == 'split':
+                assert argvals == ('',)
+                return list(obj)
+            if member == 'join':
+                assert len(argvals) == 1
+                return argvals[0].join(obj)
+            if member == 'reverse':
+                assert len(argvals) == 0
+                obj.reverse()
+                return obj
+            if member == 'slice':
+                assert len(argvals) == 1
+                return obj[argvals[0]:]
+            if member == 'splice':
+                assert isinstance(obj, list)
+                index, howMany = argvals
+                res = []
+                for i in range(index, min(index + howMany, len(obj))):
+                    res.append(obj.pop(index))
+                return res
+
+            return obj[member](argvals)
+
+        for op, opfunc in _OPERATORS:
+            m = re.match(r'(?P<x>.+?)%s(?P<y>.+)' % re.escape(op), expr)
+            if not m:
+                continue
+            x, abort = self.interpret_statement(
+                m.group('x'), local_vars, allow_recursion - 1)
+            if abort:
+                raise ExtractorError(
+                    'Premature left-side return of %s in %r' % (op, expr))
+            y, abort = self.interpret_statement(
+                m.group('y'), local_vars, allow_recursion - 1)
+            if abort:
+                raise ExtractorError(
+                    'Premature right-side return of %s in %r' % (op, expr))
+            return opfunc(x, y)
+
+        m = re.match(
+            r'^(?P<func>%s)\((?P<args>[a-zA-Z0-9_$,]*)\)$' % _NAME_RE, expr)
+        if m:
+            fname = m.group('func')
+            argvals = tuple([
+                int(v) if v.isdigit() else local_vars[v]
+                for v in m.group('args').split(',')]) if len(m.group('args')) > 0 else tuple()
+            if fname not in self._functions:
+                self._functions[fname] = self.extract_function(fname)
+            return self._functions[fname](argvals)
+
+        raise ExtractorError('Unsupported JS expression %r' % expr)
+
+    def extract_object(self, objname):
+        _FUNC_NAME_RE = r'''(?:[a-zA-Z$0-9]+|"[a-zA-Z$0-9]+"|'[a-zA-Z$0-9]+')'''
+        obj = {}
+        obj_m = re.search(
+            r'''(?x)
+                (?<!this\.)%s\s*=\s*{\s*
+                    (?P<fields>(%s\s*:\s*function\s*\(.*?\)\s*{.*?}(?:,\s*)?)*)
+                }\s*;
+            ''' % (re.escape(objname), _FUNC_NAME_RE),
+            self.code)
+        fields = obj_m.group('fields')
+        # Currently, it only supports function definitions
+        fields_m = re.finditer(
+            r'''(?x)
+                (?P<key>%s)\s*:\s*function\s*\((?P<args>[a-z,]+)\){(?P<code>[^}]+)}
+            ''' % _FUNC_NAME_RE,
+            fields)
+        for f in fields_m:
+            argnames = f.group('args').split(',')
+            obj[self.remove_quotes(f.group('key'))] = self.build_function(argnames, f.group('code'))
+
+        return obj
+
+    def extract_function(self, funcname):
+        func_m = re.search(
+            r'''(?x)
+                (?:function\s+%s|[{;,]\s*%s\s*=\s*function|var\s+%s\s*=\s*function)\s*
+                \((?P<args>[^)]*)\)\s*
+                \{(?P<code>[^}]+)\}''' % (
+                re.escape(funcname), re.escape(funcname), re.escape(funcname)),
+            self.code)
+        if func_m is None:
+            raise ExtractorError('Could not find JS function %r' % funcname)
+        argnames = func_m.group('args').split(',')
+
+        return self.build_function(argnames, func_m.group('code'))
+
+    def call_function(self, funcname, *args):
+        f = self.extract_function(funcname)
+        return f(args)
+
+    def build_function(self, argnames, code):
+        def resf(args):
+            local_vars = dict(list(zip(argnames, args)))
+            for stmt in code.split(';'):
+                res, abort = self.interpret_statement(stmt, local_vars)
+                if abort:
+                    break
+            return res
+        return resf
+
+
+# inspired by https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/youtube.py
+import urllib.request, urllib.error, urllib.parse
+class SignatureExtractor:
+
+    def __init__(self):
+        self.algoCache = {}
+
+    def decryptSignature(self, s, playerUrl):
+        util.debug("decrypt_signature sign_len[%d] playerUrl[%s]" % (len(s), playerUrl))
+
+        if playerUrl is None:
+            raise ExtractorError('Cannot decrypt signature without playerUrl')
+
+        if playerUrl.startswith('//'):
+            playerUrl = 'https:' + playerUrl
+        elif playerUrl.startswith('/'):
+            playerUrl = 'https://youtube.com' + playerUrl
+
+        # use algoCache
+        if playerUrl not in self.algoCache:
+            # get player HTML 5 sript
+            request = urllib.request.Request(playerUrl)
+            try:
+                self.playerData = urllib.request.urlopen(request).read()
+                self.playerData = self.playerData.decode('utf-8', 'ignore')
+            except:
+                util.debug('Unable to download playerUrl webpage')
+                return ''
+
+            patterns = [
+                r'\b[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*encodeURIComponent\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+                r'\b[a-zA-Z0-9]+\s*&&\s*[a-zA-Z0-9]+\.set\([^,]+\s*,\s*encodeURIComponent\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+                r'(?P<sig>[a-zA-Z0-9$]+)\s*=\s*function\(\s*a\s*\)\s*{\s*a\s*=\s*a\.split\(\s*""\s*\)',
+                # Obsolete patterns
+                r'(["\'])signature\1\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+                r'\.sig\|\|(?P<sig>[a-zA-Z0-9$]+)\(',
+                r'yt\.akamaized\.net/\)\s*\|\|\s*.*?\s*[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*(?:encodeURIComponent\s*\()?\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+                r'\b[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+                r'\b[a-zA-Z0-9]+\s*&&\s*[a-zA-Z0-9]+\.set\([^,]+\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+                r'\bc\s*&&\s*a\.set\([^,]+\s*,\s*\([^)]*\)\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+                r'\bc\s*&&\s*[a-zA-Z0-9]+\.set\([^,]+\s*,\s*\([^)]*\)\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+                r'\bc\s*&&\s*[a-zA-Z0-9]+\.set\([^,]+\s*,\s*\([^)]*\)\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\('
+            ]
+
+            match = None
+            for pattern in patterns:
+                match = re.search(pattern, self.playerData)
+                if match is not None:
+                    break
+                    
+            if match:
+                mainFunName = match.group('sig')
+                util.debug('Main signature function name = "%s"' % mainFunName)
+            else:
+                util.debug('Can not get main signature function name')
+                return ''
+
+            jsi = JSInterpreter(self.playerData)
+            initial_function = jsi.extract_function(mainFunName)
+            algoCodeObj = lambda s: initial_function([s])
+        else:
+            # get algoCodeObj from algoCache
+            util.debug('Algo taken from cache')
+            algoCodeObj = self.algoCache[playerUrl]
+
+        signature = algoCodeObj(s)
+
+        util.debug('Decrypted signature = [%s]' % signature)
+        # if algo seems ok and not in cache, add it to cache
+        if playerUrl not in self.algoCache and '' != signature:
+            util.debug('Algo from player [%s] added to cache' % playerUrl)
+            self.algoCache[playerUrl] = algoCodeObj
+
+        return signature
+
+decryptor = SignatureExtractor()
+
+'''
+   YouTube plugin for XBMC
+    Copyright (C) 2010-2012 Tobias Ussing And Henrik Mosgaard Jensen
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+'''
+
+import sys
+import cgi
+import json
+
+class YoutubePlayer(object):
+    fmt_value = {
+            5: "240p",
+            18: "360p",
+            22: "720p",
+            26: "???",
+            33: "???",
+            34: "360p",
+            35: "480p",
+            37: "1080p",
+            38: "720p",
+            43: "360p",
+            44: "480p",
+            45: "720p",
+            46: "520p",
+            59: "480",
+            78: "400",
+            82: "360p",
+            83: "240p",
+            84: "720p",
+            85: "520p",
+            100: "360p",
+            101: "480p",
+            102: "720p",
+            120: "hd720",
+            121: "hd1080"
+            }
+
+    # YouTube Playback Feeds
+    urls = {}
+    urls['video_stream'] = "http://www.youtube.com/watch?v=%s&safeSearch=none"
+    urls['embed_stream'] = "http://www.youtube.com/embed/%s"
+    urls['video_info'] = "http://www.youtube.com/get_video_info?video_id=%s" \
+                         "&eurl=https://youtube.googleapis.com/v/%s&sts=%s"
+
+    def __init__(self):
+        pass
+
+    def removeAdditionalEndingDelimiter(self, data):
+        pos = data.find("};")
+        if pos != -1:
+            data = data[:pos + 1]
+        return data
+
+    def extractFlashVars(self, data, assets):
+        flashvars = {}
+        found = False
+
+        for line in data.split("\n"):
+            if line.strip().find(";ytplayer.config = ") > 0:
+                found = True
+                p1 = line.find(";ytplayer.config = ") + len(";ytplayer.config = ") - 1
+                p2 = line.rfind(";")
+                if p1 <= 0 or p2 <= 0:
+                    continue
+                data = line[p1 + 1:p2]
+                break
+        data = self.removeAdditionalEndingDelimiter(data)
+
+        if found:
+            data = json.loads(data)
+            if assets:
+                flashvars = data["assets"]
+            else:
+                flashvars = data["args"]
+        return flashvars
+
+    def scrapeWebPageForVideoLinks(self, result, video, video_id):
+        links = {}
+        if re.search(r'player-age-gate-content">', result) is not None:
+            # We simulate the access to the video from www.youtube.com/v/{video_id}
+            # this can be viewed without login into Youtube
+            embed_webpage = util.request(self.urls["embed_stream"] % video_id)
+
+            sts = re.search('"sts"\s*:\s*(\d+)', embed_webpage).group().replace('"sts":', '')
+            result = util.request(self.urls["video_info"] % (video_id, video_id, sts))
+
+            flashvars = cgi.parse_qs(result)
+            flashvars["url_encoded_fmt_stream_map"] = flashvars["url_encoded_fmt_stream_map"][0]
+            flashvars["title"] = flashvars["title"][0]
+        else:
+            flashvars = self.extractFlashVars(result, 0)
+
+        if "url_encoded_fmt_stream_map" not in flashvars:
+            return links
+
+        if "ttsurl" in flashvars:
+            video["ttsurl"] = flashvars["ttsurl"]
+        if "title" in flashvars:
+            video["title"] = flashvars["title"]
+
+        for url_desc in flashvars["url_encoded_fmt_stream_map"].split(","):
+            url_desc_map = cgi.parse_qs(url_desc)
+            if not ("url" in url_desc_map or "stream" in url_desc_map):
+                continue
+
+            key = int(url_desc_map["itag"][0])
+            url = ""
+            if "url" in url_desc_map:
+                url = urllib.parse.unquote(url_desc_map["url"][0])
+            elif "conn" in url_desc_map and "stream" in url_desc_map:
+                url = urllib.parse.unquote(url_desc_map["conn"][0])
+                if url.rfind("/") < len(url) - 1:
+                    url = url + "/"
+                url = url + urllib.parse.unquote(url_desc_map["stream"][0])
+            elif "stream" in url_desc_map and "conn" not in url_desc_map:
+                url = urllib.parse.unquote(url_desc_map["stream"][0])
+
+            if "sig" in url_desc_map:
+                url = url + "&sig=" + url_desc_map["sig"][0]
+            elif "s" in url_desc_map:
+                sig = url_desc_map["s"][0]
+                flashvars = self.extractFlashVars(result, 1)
+                js = flashvars["js"]
+                url = url + "&sig=" + self.decrypt_signature(sig, js)
+
+            links[key] = url
+
+        return links
+
+    def decrypt_signature(self, s, js):
+        return decryptor.decryptSignature(s, js)
+
+
+    def extractVideoLinksFromYoutube(self, url, videoid, video):
+        result = util.request(self.urls["video_stream"] % videoid)
+        links = self.scrapeWebPageForVideoLinks(result, video, videoid)
+        if len(links) == 0:
+            util.error("Couldn't find video url- or stream-map.")
+        return links
+# /*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re, util, urllib.request, urllib.parse, urllib.error
+__name__ = 'youtube'
+
+
+def supports(url):
+    return not _regex(url) == None
+
+def resolve(url):
+    m = _regex(url)
+    if not m == None:
+        player = YoutubePlayer()
+        video = {'title':'žádný název'}
+        index = url.find('&')  # strip out everytihing after &
+        if index > 0:
+            url = url[:index]
+        links = player.extractVideoLinksFromYoutube(url, m.group('id'), video)
+        resolved = []
+        for q in links:
+            if q in list(player.fmt_value.keys()):
+                quality = player.fmt_value[q]
+                item = {}
+                item['name'] = __name__
+                item['url'] = links[q]
+                item['quality'] = quality
+                item['surl'] = url
+                item['subs'] = ''
+                item['title'] = video['title']
+                item['fmt'] = q
+                resolved.append(item)
+        return resolved
+
+def _regex(url):
+    return re.search('(www\.youtube\.com/(watch\?v=|v/|embed/)|youtu\.be/)(?P<id>.+?)(\?|$|&)', url, re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/youwatch.py b/lib/server/youwatch.py
new file mode 100644
index 0000000..03385db
--- /dev/null
+++ b/lib/server/youwatch.py
@@ -0,0 +1,41 @@
+# -*- coding: UTF-8 -*-
+# /*
+# *      Copyright (C) 2015 Lubomir Kucera
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re
+import util
+
+__author__ = 'Jose Riha/Lubomir Kucera'
+__name__ = 'youwatch'
+
+
+def supports(url):
+    return re.search(r'youwatch\.org/embed\-[^\.]+\.html', url) is not None
+
+
+def resolve(url):
+    refererurl = re.search(r'<iframe src="([^"]+)".*', util.request(url), re.I | re.S).group(1)
+    try:
+        data=[x for x in util.request(refererurl).splitlines() if 'file:' in x and '.mp4' in x][0]
+    except:
+        return None
+    streamurl = re.search(r'.*file:"([^"]+?)".*', data).group(1)
+    headers={'Referer': refererurl}
+    return [{'url': streamurl, 'headers': headers}]
diff --git a/lib/server/zideonlresolver.py b/lib/server/zideonlresolver.py
new file mode 100644
index 0000000..56969d9
--- /dev/null
+++ b/lib/server/zideonlresolver.py
@@ -0,0 +1,43 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+
+import util,re
+__name__ = 'zideo'
+def supports(url):
+    return not _regex(url) == None
+
+def resolve(url):
+    m = _regex(url)
+    if not m == None:
+        url = re.sub('.*player.swf\?','',url)
+        data = util.request('http://www.zideo.nl/player/config?'+url)
+        try:
+            link = re.search('<file>([^<]+)',data).group(1)
+        #	hd = re.search('<hd\.state>([^<]+)',data).group(1)
+        #	if hd == 'true':
+        #		link = re.search('<hd\.file>([^<]+)',data).group(1)
+            return [{'url':link}]
+        except:
+            pass
+
+def _regex(url):
+    return re.search('http://(www\.)?zideo.nl/player.swf', url, re.IGNORECASE | re.DOTALL)
diff --git a/lib/server/zkouknitoresolver.py b/lib/server/zkouknitoresolver.py
new file mode 100644
index 0000000..131a1e6
--- /dev/null
+++ b/lib/server/zkouknitoresolver.py
@@ -0,0 +1,45 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import re,util
+__name__ = 'zkouknito'
+def supports(url):
+    return not _regex(url) == None
+
+# returns the steam url
+def resolve(url):
+    m = _regex(url)
+    f=None
+    if not m is None:
+        try:
+            data = util.request('http://www.zkouknito.cz/player/scripts/videoinfo_externi.php?id=%s' % m.group('id'))
+            f = re.search('<file>([^<]+)', data, re.IGNORECASE | re.DOTALL)
+        except Exception:
+            data = util.request(url)
+            f = re.search("\'file\':.*?'([^']+)", data, re.IGNORECASE | re.DOTALL)
+        if f:
+            return [{'url':f.group(1)}] 
+
+
+def _regex(url):
+    m1 = re.search('(www\.)zkouknito.cz/(.+?)vid=(?P<id>[\d]+)', url, re.IGNORECASE | re.DOTALL)
+    m2 = re.search('(www\.)zkouknito.cz/(.+?)', url, re.IGNORECASE | re.DOTALL)
+    return m1 or m2
diff --git a/lib/storageserverdummy.py b/lib/storageserverdummy.py
new file mode 100644
index 0000000..df2fc85
--- /dev/null
+++ b/lib/storageserverdummy.py
@@ -0,0 +1,30 @@
+'''
+     StorageServer override.
+     Version: 1.0
+'''
+
+
+class StorageServer:
+    def __init__(self, table, timeout=24):
+        return None
+
+    def cacheFunction(self, funct=False, *args):
+        return funct(*args)
+
+    def set(self, name, data):
+        return ""
+
+    def get(self, name):
+        return ""
+
+    def setMulti(self, name, data):
+        return ""
+
+    def getMulti(self, name, items):
+        return ""
+
+    def lock(self, name):
+        return False
+
+    def unlock(self, name):
+        return False
diff --git a/lib/usage/__pycache__/googletracker.cpython-38.opt-1.pyc b/lib/usage/__pycache__/googletracker.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..0a3e26e
Binary files /dev/null and b/lib/usage/__pycache__/googletracker.cpython-38.opt-1.pyc differ
diff --git a/lib/usage/__pycache__/tracker.cpython-38.opt-1.pyc b/lib/usage/__pycache__/tracker.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..1c73d0d
Binary files /dev/null and b/lib/usage/__pycache__/tracker.cpython-38.opt-1.pyc differ
diff --git a/lib/usage/__pycache__/utmain.cpython-38.opt-1.pyc b/lib/usage/__pycache__/utmain.cpython-38.opt-1.pyc
new file mode 100644
index 0000000..1d290e7
Binary files /dev/null and b/lib/usage/__pycache__/utmain.cpython-38.opt-1.pyc differ
diff --git a/lib/usage/googletracker.py b/lib/usage/googletracker.py
new file mode 100644
index 0000000..622ce11
--- /dev/null
+++ b/lib/usage/googletracker.py
@@ -0,0 +1,74 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import os,re,sys,urllib.request,urllib.parse,urllib.error,urllib.request,urllib.error,urllib.parse,traceback,http.cookiejar,random,time
+UA='Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.0.3) Gecko/2008092417 Firefox/3.0.3'
+
+TRACKER_URL='http://www.google-analytics.com/__utm.gif'
+__name__ = 'google'
+##
+# initializes urllib cookie handler
+def init_urllib():
+    cj = http.cookiejar.LWPCookieJar()
+    opener = urllib.request.build_opener(urllib.request.HTTPCookieProcessor(cj))
+    urllib.request.install_opener(opener)
+
+def _request(url,info):
+    # setup useragent!!
+    print('[google] Submiting usage')
+    req = urllib.request.Request(url)
+    req.add_header('User-Agent',info['useragent'])
+    response = urllib.request.urlopen(req)
+    data = response.read()
+    if 200 == response.code:
+        print('[google] Usage has been submitted')
+    response.close()
+
+def _get_cookie(info):
+    return '__utma='+'.'.join(info['instanceid'])+'.8;+__utmz='+info['instanceid'][0]+'.'+info['instanceid'][-1]+'.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none)|utmctr=(none)'
+
+def createInstanceID():
+    return [str(random.randint(0,99999999)),str(random.randint(0,9999999999)),str(random.randint(0,9999999999)),str(random.randint(0,9999999999)),str(random.randint(0,9999999999))]
+
+
+def track_usage(url,action,trackingCode,dry,info):
+    params = {
+            'utmac':trackingCode,
+            'utms':'1', # number of 'clicks'
+            'utmcs':'UTF-8', # system encoding
+            'utmdt':action, # page title
+            'utmhn':url, # url-encoded target url
+            'utmhid':random.randint(0,9999999999), #random number
+            'utmje':'0', # do we have java? 1 = yes, 0 = no
+            'utmn':time.time(), # unique for each request to avoid caching
+            'utmp':'/'+action, # page that has been visited
+            'utmsc':info['colordepth'], # color depth
+            'utmsr':info['resolution'], # screen resolution
+            'utmul':info['language'], # system language
+            'utmr':'-', # referal - 0 = none
+            'utmwv':'5.2.2', # version of tracking client
+            'utmcc':_get_cookie(info),
+            'utmu':'q~' # what is this about?
+            }
+    req = TRACKER_URL+'?'+urllib.parse.urlencode(params)
+    if not dry:
+        _request(req,info)
+
diff --git a/lib/usage/tracker.py b/lib/usage/tracker.py
new file mode 100644
index 0000000..112bbe2
--- /dev/null
+++ b/lib/usage/tracker.py
@@ -0,0 +1,231 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import json
+import xbmc
+import xbmcvfs
+import os
+import random
+import sys
+import traceback
+import xbmcutil
+
+import googletracker
+
+
+class TrackerSettings(object):
+
+    def __init__(self, addon):
+        self.services = [googletracker]
+        local = xbmcvfs.translatePath(addon.getAddonInfo('profile'))
+        if not os.path.exists(local):
+            os.makedirs(local)
+        self.settingFile = os.path.join(local, 'tracking.json')
+
+        if os.path.exists(self.settingFile):
+            f = open(self.settingFile, 'r')
+            file_content = f.read()
+            f.close()
+            try:
+                self.data = json.loads(file_content)
+            except:
+                self.data = {}
+                self.data['id'] = {}
+                for serv in self.services:
+                    self.data['id'][serv.__name__] = serv.createInstanceID()
+                self.data['addons'] = {}
+                self.save()
+
+            for serv in self.services:
+                if not serv.__name__ in list(self.data['id'].keys()):
+                    self.data['id'][serv.__name__] = serv.createInstanceID()
+                    self.save()
+        else:
+            self.data = {}
+            self.data['id'] = {}
+            for serv in self.services:
+                self.data['id'][serv.__name__] = serv.createInstanceID()
+            self.data['addons'] = {}
+            self.save()
+
+    def save(self):
+        f = open(self.settingFile, 'w')
+        f.write(json.dumps(self.data, ensure_ascii=True))
+        f.close()
+
+    def getInstanceID(self, service):
+        return self.data['id'][service]
+
+    def isReportingEnabled(self):
+        if 'report-enabled' in self.data:
+            return self.data['report-enabled']
+
+    def setReportingEnabled(self, value):
+        self.data['report-enabled'] = value
+
+    def getTermsStringID(self, addon):
+        subscribers = self.getSubscribers()
+        if addon in subscribers:
+            return subscribers[addon]['terms']
+
+    def getSubscribers(self):
+        return self.data['addons']
+
+    def addAddon(self, addon, subscribed, conditions):
+        self.data['addons'][addon] = {}
+        self.data['addons'][addon]['enabled'] = subscribed
+        self.data['addons'][addon]['terms'] = conditions
+        self.save()
+
+
+class TrackerInfo(object):
+
+    def __init__(self):
+        pass
+
+    def _getUserAgent(self, version, language):
+        platform = sys.platform
+        sp = version.find(' ')
+        if sp > 0:
+            version = version[:sp]
+        if platform.startswith('linux'):
+            return 'KODI/%s (X11; U; Linux i686; %s)' % (version, language)
+        if platform.startswith('win'):
+            return 'KODI/%s (Windows; U; Windows NT; %s)' % (version, language)
+        if platform.startswith('darwin'):
+            return 'KODI/%s (Mac; U; Intel Mac OS X; %s)' % (version, language)
+        else:
+            print('[script.usage.tracker] Unknown platform %s, please report a bug, plugin needs to be fixed' % sys.platform)
+            return 'KODI/%s (X11; U; Unknown i686; %s)' % (version, language)
+
+    def getSystemInfo(self):
+        # some stupid defaults
+        info = {'colordepth': '24-bit', 'resolution': '640x480',
+                'language': 'en', 'useragent': self._getUserAgent('Unknown', 'en')}
+
+        # get info via JSON RPC, try to be compatible with both dharma & eden APIs
+        try:
+            data = xbmc.executeJSONRPC(
+                '{"jsonrpc": "2.0", "method": "System.GetInfoLabels", "id":1,"params": ["System.BuildVersion","System.ScreenHeight","System.ScreenWidth","System.KenrelVersion","System.Language"]}')
+            data = json.loads(data)
+        except:
+            pass
+        try:
+            if not 'result' in data:
+                data = xbmc.executeJSONRPC(
+                    '{"jsonrpc" : "2.0", "method": "XBMC.GetInfoLabels", "id" :1, "params": {"labels" : ["System.BuildVersion","System.ScreenHeight","System.ScreenWidth","System.KenrelVersion","System.Language"]}}')
+                data = json.loads(data)
+        except:
+            pass
+        # process results
+        try:
+            info['resolution'] = '%sx%s' % (data['result']['System.ScreenWidth'], data[
+                                            'result']['System.ScreenHeight'])
+            info['language'] = getLanguageCode(data['result']['System.Language'])
+            info['useragent'] = self._getUserAgent(
+                data['result']['System.BuildVersion'], info['language'])
+        except:
+            traceback.print_exc()
+        return info
+
+
+def getLanguageCode(id):
+    languages = {
+        "none": "none",
+        "albanian": "sq",
+        "arabic": "ar",
+        "belarusian": "hy",
+        "bosnian": "bs",
+        "bosnianLatin": "bs",
+        "bulgarian": "bg",
+        "catalan": "ca",
+        "chinese": "zh",
+        "croatian": "hr",
+        "czech": "cs",
+        "danish": "da",
+        "dutch": "nl",
+        "english": "en",
+        "esperanto": "eo",
+        "Estonian": "et",
+        "farsi": "fa",
+        "persian": "fa",
+        "finnish": "fi",
+        "french": "fr",
+        "galician": "gl",
+        "georgian": "ka",
+        "german": "de",
+        "greek": "el",
+        "hebrew": "he",
+        "hindi": "hi",
+        "hungarian": "hu",
+        "icelandic": "is",
+        "indonesian": "id",
+        "italian": "it",
+        "japanese": "ja",
+        "kazakh": "kk",
+        "korean": "ko",
+        "latvian": "lv",
+        "lithuanian": "lt",
+        "luxembourgish": "lb",
+        "macedonian": "mk",
+        "malay": "ms",
+        "norwegian": "no",
+        "occitan": "oc",
+        "polish": "pl",
+        "portuguese": "pt",
+        "portuguesebrazil": "pb",
+        "portuguese (brazil)": "pb",
+        "brazilian": "pb",
+        "romanian": "ro",
+        "russian": "ru",
+        "serbianLatin": "sr",
+        "serbian": "sr",
+        "serbian (syrillic)": "sr",
+        "slovak": "sk",
+        "slovenian": "sl",
+        "spanish": "es",
+        "swedish": "sv",
+        "syriac": "syr",
+        "thai": "th",
+        "turkish": "tr",
+        "ukrainian": "uk",
+        "urdu": "ur",
+        "vietnamese": "vi",
+        "english (us)": "en",
+        "english (uk)": "en",
+        "portuguese (brazilian)": "pt-br",
+        "español (latinoamérica)": "es",
+        "español (españa)": "es",
+        "spanish (latin America)": "es",
+        "español": "es",
+        "spanish": "es",
+        "spanish (mexico)": "es",
+        "spanish (spain)": "es",
+        "chinese (traditional)": "zh",
+        "chinese (simplified)": "zh",
+        "portuguese-br": "pb",
+        "all": "all"
+    }
+    id = id.lower()
+    if id in languages:
+        return languages[id]
+    print('[script.usage.tracker] Cannot detect language code from language: %s, please report a bug, plugin needs to be fixed' % id)
+    return id
diff --git a/lib/usage/utmain.py b/lib/usage/utmain.py
new file mode 100644
index 0000000..f5264a5
--- /dev/null
+++ b/lib/usage/utmain.py
@@ -0,0 +1,107 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import os
+import re
+import sys
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
+import traceback
+import http.cookiejar
+import xbmc
+import xbmcaddon
+import xbmcgui
+
+__addon__ = xbmcaddon.Addon(id='script.module.stream.resolver')
+__ = __addon__.getLocalizedString
+import googletracker
+import tracker
+
+
+def trackUsage(params):
+    for param in ['id', 'host', 'tc']:
+        if not param in params:
+            raise Exception(param + ' param is required')
+    if not 'service' in params:
+        params['service'] = 'google'
+    if not 'cond' in params:
+        params['cond'] = -1
+    else:
+        try:
+            params['cond'] = int(params['cond'])
+        except:
+            pass
+    if not 'action' in params:
+        params['action'] = params['id']
+    if 'dry' in params:
+        try:
+            params['dry'] = bool(params['dry'])
+        except:
+            params['dry'] = False
+    else:
+        params['dry'] = False
+
+    xbmc.log(msg='Parsed input params %s' % (str(params)), level=xbmc.LOGDEBUG)
+
+    try:
+        if not xbmcaddon.Addon(params['id']).getAddonInfo('id') == params['id']:
+            raise Exception('')
+    except:
+        print('Unable to create addon instance for %s, invalid addon ID?!' % (params['id']))
+        return
+
+    if register(params):
+        print('Tracking usage ...')
+        sett = tracker.TrackerSettings(__addon__)
+        info = tracker.TrackerInfo().getSystemInfo()
+        # retrieve per-installation-unique ID
+        info['instanceid'] = sett.getInstanceID(params['service'])
+        if 'google' == params['service']:
+            return googletracker.track_usage(params['host'], params['action'], params['tc'], params['dry'], info)
+    else:
+        print('Reporting for %s disabled by user' % (params['id']))
+
+
+def register(params):
+    sett = tracker.TrackerSettings(__addon__)
+    enabled = sett.isReportingEnabled()
+    if enabled == None:
+        ret = xbmcgui.Dialog().yesno('KODI CZSK', __(30015))
+        enabled = ret == 1
+        sett.setReportingEnabled(enabled)
+        sett.save()
+    return enabled
+
+
+def main(p={}):
+    if 'do' in p:
+        if p['do'] == 'reg':
+            if not 'id' in p:
+                raise Exception('id param is required')
+            if not 'cond' in p:
+                p['cond'] = -1
+            else:
+                try:
+                    p['cond'] = int(p['cond'])
+                except:
+                    pass
+            return register(p)
+    trackUsage(p)
diff --git a/lib/util.py b/lib/util.py
new file mode 100644
index 0000000..bfc5ca1
--- /dev/null
+++ b/lib/util.py
@@ -0,0 +1,359 @@
+# -*- coding: UTF-8 -*-
+# /*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import os
+import re
+import sys
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
+import traceback
+import http.cookiejar
+from html.entities import name2codepoint as n2cp
+import threading
+import queue
+import pickle
+import string
+import json
+from demjson import demjson
+from bs4 import BeautifulSoup
+import cloudflare
+
+UA = 'Mozilla/6.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.0.5) Gecko/2008092417 Firefox/3.0.3'
+LOG = 2
+sys.path.append(os.path.join(os.path.dirname(__file__), 'contentprovider'))
+
+_cookie_jar = None
+
+CACHE_COOKIES = 'cookies'
+
+
+class _StringCookieJar(http.cookiejar.LWPCookieJar):
+
+    def __init__(self, string=None, filename=None, delayload=False, policy=None, cache=None):
+        self.cache = cache
+        http.cookiejar.LWPCookieJar.__init__(self, filename, delayload, policy)
+        if string and len(string) > 0:
+            self._cookies = pickle.loads(str(string))
+
+    def dump(self):
+        return pickle.dumps(self._cookies)
+
+
+def init_urllib(cache=None):
+    """
+    Initializes urllib cookie handler
+    """
+    global _cookie_jar
+    data = None
+    if cache is not None:
+        data = cache.get(CACHE_COOKIES)
+        _cookie_jar = _StringCookieJar(data, cache=cache)
+    else:
+        _cookie_jar = _StringCookieJar(data)
+    opener = urllib.request.build_opener(urllib.request.HTTPCookieProcessor(_cookie_jar))
+    urllib.request.install_opener(opener)
+
+
+def cache_cookies(cache=None):
+    """
+    Saves cookies to cache
+    """
+    global _cookie_jar
+    if _cookie_jar and cache is not None:
+        cache.set(CACHE_COOKIES, _cookie_jar.dump())
+    else:
+        try:
+            _cookie_jar.cache.set(CACHE_COOKIES, _cookie_jar.dump())
+        except:
+            pass
+
+
+def _solve_http_errors(url, error):
+    global _cookie_jar
+    data = error.read()
+    if error.code == 503 and 'cf-browser-verification' in data:
+        data = cloudflare.solve(url, _cookie_jar, UA)
+    error.close()
+    return data
+
+
+def request(url, headers={}):
+    debug('request: %s' % url)
+    req = urllib.request.Request(url, headers=headers)
+    req.add_header('User-Agent', UA)
+    if _cookie_jar is not None:
+        _cookie_jar.add_cookie_header(req)
+    try:
+        response = urllib.request.urlopen(req)
+        data = response.read().decode('utf-8')
+        response.close()
+    except urllib.error.HTTPError as error:
+        data = _solve_http_errors(url, error)
+    debug('len(data) %s' % len(data))
+    return data
+
+
+def post(url, data, headers={}):
+    postdata = urllib.parse.urlencode(data).encode('utf-8')  # <-- přidáno .encode('utf-8')
+    req = urllib.request.Request(url, postdata, headers)
+    req.add_header('User-Agent', UA)
+    if _cookie_jar is not None:
+        _cookie_jar.add_cookie_header(req)
+    try:
+        response = urllib.request.urlopen(req)
+        data = response.read()
+        response.close()
+    except urllib.error.HTTPError as error:
+        data = _solve_http_errors(url, error)
+    return data
+
+
+
+def post_json(url, data, headers={}):
+    postdata = json.dumps(data).encode('utf-8')  # <-- přidáno .encode('utf-8')
+    headers['Content-Type'] = 'application/json'
+    req = urllib.request.Request(url, postdata, headers)
+    req.add_header('User-Agent', UA)
+    if _cookie_jar is not None:
+        _cookie_jar.add_cookie_header(req)
+    try:
+        response = urllib.request.urlopen(req)
+        data = response.read()
+        response.close()
+    except urllib.error.HTTPError as error:
+        data = _solve_http_errors(url, error)
+    return data
+
+
+
+def run_parallel_in_threads(target, args_list):
+    result = queue.Queue()
+    # wrapper to collect return value in a Queue
+
+    def task_wrapper(*args):
+        result.put(target(*args))
+
+    threads = [threading.Thread(target=task_wrapper, args=args) for args in args_list]
+    for t in threads:
+        t.start()
+    for t in threads:
+        t.join()
+    return result
+
+
+def icon(name):
+    return 'https://github.com/lzoubek/xbmc-doplnky/raw/dharma/icons/' + name
+
+
+def substr(data, start, end):
+    i1 = data.find(start)
+    i2 = data.find(end, i1)
+    return data[i1:i2]
+
+
+def _create_plugin_url(params, plugin=sys.argv[0]):
+    url = []
+    for key in list(params.keys()):
+        value = decode_html(params[key])
+        value = value.encode('ascii', 'ignore')
+        url.append(key + '=' + value.encode('hex', ) + '&')
+    return plugin + '?' + ''.join(url)
+
+
+def save_to_file(url, file):
+    try:
+        return save_data_to_file(request(url), file)
+    except:
+        traceback.print_exc()
+
+
+def save_data_to_file(data, file):
+    try:
+        f = open(file, 'wb')
+        f.write(data)
+        f.close()
+        info('File %s saved' % file)
+        return True
+    except:
+        traceback.print_exc()
+
+
+def read_file(file):
+    if not os.path.exists(file):
+        return ''
+    f = open(file, 'r')
+    data = f.read()
+    f.close()
+    return data
+
+
+def _substitute_entity(match):
+    ent = match.group(3)
+    if match.group(1) == '#':
+        # decoding by number
+        if match.group(2) == '':
+            # number is in decimal
+            return chr(int(ent))
+        elif match.group(2) == 'x':
+            # number is in hex
+            return chr(int('0x' + ent, 16))
+    else:
+        # they were using a name
+        cp = n2cp.get(ent)
+        if cp:
+            return chr(cp)
+        else:
+            return match.group()
+
+
+def decode_html(data):
+    if not type(data) == str:
+        return data
+    try:
+        if not type(data) == str:
+            data = str(data, 'utf-8', errors='ignore')
+        entity_re = re.compile(r'&(#?)(x?)(\w+);')
+        return entity_re.subn(_substitute_entity, data)[0]
+    except:
+        traceback.print_exc()
+        print([data])
+        return data
+
+
+try:
+    import xbmc
+
+    def debug(text):
+        xbmc.log(str([text]), xbmc.LOGDEBUG)
+
+    def info(text):
+        xbmc.log(str([text]), xbmc.LOGINFO)
+
+    def error(text):
+        xbmc.log(str([text]), xbmc.LOGERROR)
+except:
+    def debug(text):
+        if LOG > 1:
+            print(('[DEBUG] ' + str([text])))
+
+    def info(text):
+        if LOG > 0:
+            print(('[INFO] ' + str([text])))
+
+    def error(text):
+        print(('[ERROR] ' + str([text])))
+
+_diacritic_replace = {'\u00f3': 'o',
+                      '\u0213': '-',
+                      '\u00e1': 'a',
+                      '\u010d': 'c',
+                      '\u010c': 'C',
+                      '\u010f': 'd',
+                      '\u010e': 'D',
+                      '\u00e9': 'e',
+                      '\u011b': 'e',
+                      '\u00ed': 'i',
+                      '\u0148': 'n',
+                      '\u0159': 'r',
+                      '\u0161': 's',
+                      '\u0165': 't',
+                      '\u016f': 'u',
+                      '\u00fd': 'y',
+                      '\u017e': 'z',
+                      '\xed': 'i',
+                      '\xe9': 'e',
+                      '\xe1': 'a',
+                      }
+
+
+def replace_diacritic(string):
+    ret = []
+    for char in string:
+        if char in _diacritic_replace:
+            ret.append(_diacritic_replace[char])
+        else:
+            ret.append(char)
+    return ''.join(ret)
+
+
+def params(url=None):
+    if not url:
+        url = sys.argv[2]
+    param = {}
+    paramstring = url
+    if len(paramstring) >= 2:
+        params = url
+        cleanedparams = params.replace('?', '')
+        if (params[len(params) - 1] == '/'):
+            params = params[0:len(params) - 2]
+        pairsofparams = cleanedparams.split('&')
+        param = {}
+        for i in range(len(pairsofparams)):
+            splitparams = {}
+            splitparams = pairsofparams[i].split('=')
+            if (len(splitparams)) == 2:
+                param[splitparams[0]] = splitparams[1]
+    for p in list(param.keys()):
+        param[p] = bytes.fromhex(param[p]).decode('utf-8')
+    return param
+
+
+def int_to_base(number, base):
+    digs = string.digits + string.letters
+    if number < 0:
+        sign = -1
+    elif number == 0:
+        return digs[0]
+    else:
+        sign = 1
+    number *= sign
+    digits = []
+    while number:
+        digits.append(digs[number % base])
+        number /= base
+    if sign < 0:
+        digits.append('-')
+    digits.reverse()
+    return ''.join(digits)
+
+
+def extract_jwplayer_setup(data):
+    """
+    Extracts jwplayer setup configuration and returns it as a dictionary.
+
+    :param data: A string to extract the setup from
+    :return: A dictionary containing the setup configuration
+    """
+    data = re.search(r'<script.+?}\(\'(.+)\',\d+,\d+,\'([\w\|]+)\'.*</script>', data, re.I | re.S)
+    if data:
+        replacements = data.group(2).split('|')
+        data = data.group(1)
+        for i in reversed(list(range(len(replacements)))):
+            if len(replacements[i]) > 0:
+                data = re.sub(r'\b%s\b' % int_to_base(i, 36), replacements[i], data)
+        data = re.search(r'\.setup\(([^\)]+?)\);', data)
+        if data:
+            return demjson.decode(data.group(1).decode('string_escape'))
+    return None
+
+
+def parse_html(url):
+    return BeautifulSoup(request(url), 'html5lib', from_encoding='utf-8')
diff --git a/lib/xbmcutil.py b/lib/xbmcutil.py
new file mode 100644
index 0000000..094750c
--- /dev/null
+++ b/lib/xbmcutil.py
@@ -0,0 +1,560 @@
+# -*- coding: UTF-8 -*-
+#/*
+# *      Copyright (C) 2011 Libor Zoubek
+# *
+# *
+# *  This Program is free software; you can redistribute it and/or modify
+# *  it under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2, or (at your option)
+# *  any later version.
+# *
+# *  This Program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; see the file COPYING.  If not, write to
+# *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# *  http://www.gnu.org/copyleft/gpl.html
+# *
+# */
+import os
+import re
+import sys
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
+import traceback
+import http.cookiejar
+import time
+import socket
+import unicodedata
+import xbmcgui
+import xbmcplugin
+import xbmc
+import xbmcaddon
+import xbmcvfs
+from html.entities import name2codepoint as n2cp
+import json
+import util
+UA = 'Mozilla/6.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.0.5) Gecko/2008092417 Firefox/3.0.3'
+
+sys.path.append(os.path.join(os.path.dirname(__file__), 'usage'))
+import utmain
+__addon__ = xbmcaddon.Addon(id='script.module.stream.resolver')
+__lang__ = __addon__.getLocalizedString
+##
+# initializes urllib cookie handler
+
+
+def init_urllib():
+    cj = http.cookiejar.LWPCookieJar()
+    opener = urllib.request.build_opener(urllib.request.HTTPCookieProcessor(cj))
+    urllib.request.install_opener(opener)
+
+
+def request(url, headers=None):
+    if headers is None:
+        headers = {}
+    debug('request: %s' % url)
+    req = urllib.request.Request(url, headers=headers)
+    response = urllib.request.urlopen(req)
+    data = response.read()
+    response.close()
+    debug('len(data) %s' % len(data))
+    return data
+
+
+def post(url, data):
+    postdata = urllib.parse.urlencode(data)
+    req = urllib.request.Request(url, postdata)
+    req.add_header('User-Agent', UA)
+    response = urllib.request.urlopen(req)
+    data = response.read()
+    response.close()
+    return data
+
+
+def icon(name):
+    return 'https://github.com/lzoubek/xbmc-doplnky/raw/dharma/icons/' + name
+
+
+def substr(data, start, end):
+    i1 = data.find(start)
+    i2 = data.find(end, i1)
+    return data[i1:i2]
+
+
+def add_dir(name, params, logo='', infoLabels={}, menuItems={}):
+    name = decode_html(name)
+    if not 'title' in infoLabels:
+        infoLabels['title'] = ''
+    if logo == None:
+        logo = ''
+    liz = xbmcgui.ListItem(name)
+    liz.setArt({'icon': 'DefaultFolder.png', 'thumb': logo})
+    try:
+        liz.setInfo(type='Video', infoLabels=infoLabels)
+    except:
+        traceback.print_exc()
+    items = []
+    for mi in list(menuItems.keys()):
+        action = menuItems[mi]
+        if not type(action) == type({}):
+            items.append((mi, action))
+        else:
+            if 'action-type' in action:
+                action_type = action['action-type']
+                del action['action-type']
+                if action_type == 'list':
+                    items.append((mi, 'Container.Update(%s)' % _create_plugin_url(action)))
+                elif action_type == 'play':
+                    items.append((mi, 'PlayMedia(%s)' % _create_plugin_url(action)))
+                else:
+                    items.append((mi, 'RunPlugin(%s)' % _create_plugin_url(action)))
+            else:
+                items.append((mi, 'RunPlugin(%s)' % _create_plugin_url(action)))
+    if len(items) > 0:
+        liz.addContextMenuItems(items)
+    return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=_create_plugin_url(params),
+                                       listitem=liz, isFolder=True)
+
+
+def add_local_dir(name, url, logo='', infoLabels={}, menuItems={}):
+    name = decode_html(name)
+    infoLabels['Title'] = name
+    liz = xbmcgui.ListItem(name)
+    liz.setArt({'icon': 'DefaultFolder.png', 'thumb': logo})
+    liz.setInfo(type='Video', infoLabels=infoLabels)
+    items = []
+    for mi in list(menuItems.keys()):
+        items.append((mi, 'RunPlugin(%s)' % _create_plugin_url(menuItems[mi])))
+    if len(items) > 0:
+        liz.addContextMenuItems(items)
+    return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=url, listitem=liz,
+                                       isFolder=True)
+
+
+def add_video(name, params={}, logo='', infoLabels={}, menuItems={}):
+    name = decode_html(name)
+    if not 'Title' in infoLabels:
+        infoLabels['Title'] = name
+    url = _create_plugin_url(params)
+    li = xbmcgui.ListItem(name, path=url)
+    li.setArt({'icon': 'DefaultVideo.png', 'thumb': logo})
+    li.setInfo(type='Video', infoLabels=infoLabels)
+    # remove WARNING: XFILE::CFileFactory::CreateLoader - unsupported
+    # protocol(plugin) in plugin://....
+    li.addStreamInfo('video', {})
+    li.setProperty('IsPlayable', 'true')
+    items = [(xbmc.getLocalizedString(13347), 'Action(Queue)')]
+    for mi in list(menuItems.keys()):
+        action = menuItems[mi]
+        if not type(action) == type({}):
+            items.append((mi, action))
+        else:
+            if 'action-type' in action:
+                action_type = action['action-type']
+                del action['action-type']
+                if action_type == 'list':
+                    items.append((mi, 'Container.Update(%s)' % _create_plugin_url(action)))
+                elif action_type == 'play':
+                    items.append((mi, 'PlayMedia(%s)' % _create_plugin_url(action)))
+                else:
+                    items.append((mi, 'RunPlugin(%s)' % _create_plugin_url(action)))
+            else:
+                items.append((mi, 'RunPlugin(%s)' % _create_plugin_url(action)))
+
+    if len(items) > 0:
+        li.addContextMenuItems(items)
+    return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=url, listitem=li,
+                                       isFolder=False)
+
+
+def _create_plugin_url(params, plugin=sys.argv[0]):
+    url = []
+    for key in list(params.keys()):
+        value = decode_html(params[key])
+        #--value = value.encode('ascii','ignore')
+        value = value.encode('utf-8').hex()
+        url.append(key + '=' + value + '&')
+    return plugin + '?' + ''.join(url)
+
+
+def reportUsage(addonid, action):
+    host = 'xbmc-doplnky.googlecode.com'
+    tc = 'UA-3971432-4'
+    try:
+        utmain.main({'id': addonid, 'host': host, 'tc': tc, 'action': action})
+    except:
+        pass
+
+
+def init_usage_reporting(addonid):
+    utmain.main({'do': 'reg', 'id': addonid})
+
+
+def save_to_file(url, file, headers=None):
+    try:
+        f = open(compat_path(file), 'wb')
+        f.write(request(url, headers))
+        f.flush()
+        os.fsync(f.fileno())
+        f.close()
+        return True
+    except:
+        traceback.print_exc()
+
+
+def set_subtitles(listItem, url, headers=None):
+    if not (url == '' or url == None):
+        util.info('Downloading subtitles')
+        local = xbmcvfs.translatePath(__addon__.getAddonInfo('path'))
+        c_local = compat_path(local)
+        if not os.path.exists(c_local):
+            os.makedirs(c_local)
+        local = os.path.join(local, 'xbmc_subs' + str(int(time.time())) + '.srt')
+        util.info('Saving subtitles as %s' % local)
+        if not save_to_file(url, local, headers):
+            util.error('Failed to store subtitles!')
+            return
+        util.info('Setting subtitles to playable item')
+        listItem.setSubtitles([local.encode('utf-8')])
+
+
+def load_subtitles(url, headers=None):
+    util.info('Downloading subtitles and load them to player...')
+    if not (url == '' or url == None):
+        local = xbmcvfs.translatePath(__addon__.getAddonInfo('path')).decode('utf-8')
+        c_local = compat_path(local)
+        if not os.path.exists(c_local):
+            os.makedirs(c_local)
+        local = os.path.join(local, 'xbmc_subs' + str(int(time.time())) + '.srt')
+        util.info('Saving subtitles as %s' % local)
+        if not save_to_file(url, local, headers):
+            util.error('Failed to store subtitles!')
+            return
+        player = xbmc.Player()
+        count = 0
+        max_count = 99
+        while not player.isPlaying() and count < max_count:
+            count += 1
+            xbmc.sleep(200)
+            if count > max_count - 2:
+                util.info("Cannot load subtitles, player timed out")
+                return
+        player.setSubtitles(local.encode('utf-8'))
+        util.info('Subtitles loaded to player')
+
+
+def _substitute_entity(match):
+    ent = match.group(3)
+    if match.group(1) == '#':
+        # decoding by number
+        if match.group(2) == '':
+            # number is in decimal
+            return chr(int(ent))
+        elif match.group(2) == 'x':
+            # number is in hex
+            return chr(int('0x' + ent, 16))
+        else:
+            # they were using a name
+            cp = n2cp.get(ent)
+            if cp:
+                return chr(cp)
+            else:
+                return match.group()
+
+
+def decode_html(data):
+    try:
+        if not type(data) == str:
+            data = str(data, 'utf-8', errors='ignore')
+        entity_re = re.compile(r'&(#?)(x?)(\w+);')
+        return entity_re.subn(_substitute_entity, data)[0]
+    except:
+        traceback.print_exc()
+        print([data])
+        return data
+
+
+def debug(text):
+    xbmc.log(str([text]), xbmc.LOGDEBUG)
+
+
+def info(text):
+    xbmc.log(str([text]))
+
+
+def error(text):
+    xbmc.log(str([text]), xbmc.LOGERROR)
+
+
+def search_remove(cache, search):
+    data = cache.get('search')
+    if data == None or data == '':
+        data = []
+    else:
+        data = eval(data)
+    data.remove(search)
+    cache.set('search', repr(data))
+
+
+def search_replace(cache, search, replacement):
+    data = cache.get('search')
+    if data == None or data == '':
+        data = []
+    else:
+        data = eval(data)
+    index = data.index(search)
+    if index > -1:
+        data[index] = replacement
+        cache.set('search', repr(data))
+
+
+def search_add(cache, search, maximum):
+    data = cache.get('search')
+    if data == None or data == '':
+        data = []
+    else:
+        data = eval(data)
+    if search in data:
+        data.remove(search)
+    data.insert(0, search)
+    remove = len(data) - maximum
+    if remove > 0:
+        for i in range(remove):
+            data.pop()
+    cache.set('search', repr(data))
+
+
+def search_list(cache):
+    data = cache.get('search')
+    if data == None or data == '':
+        data = []
+    else:
+        data = eval(data)
+    return data
+
+# obsolete functions ..
+
+
+def get_searches(addon, server):
+    local = xbmcvfs.translatePath(addon.getAddonInfo('profile'))
+    c_local = compat_path(local)
+    if not os.path.exists(c_local):
+        os.makedirs(c_local)
+    c_local = compat_path(os.path.join(local, server))
+    if not os.path.exists(c_local):
+        return []
+    f = open(c_local, 'r')
+    data = f.read()
+    searches = json.loads(str(data.decode('utf-8', 'ignore')))
+    f.close()
+    return searches
+
+
+def add_search(addon, server, search, maximum):
+    searches = []
+    local = xbmcvfs.translatePath(addon.getAddonInfo('profile')).decode('utf-8')
+    c_local = compat_path(local)
+    if not os.path.exists(c_local):
+        os.makedirs(c_local)
+    c_local = compat_path(os.path.join(local, server))
+    if os.path.exists(c_local):
+        f = open(c_local, 'r')
+        data = f.read()
+        searches = json.loads(str(data.decode('utf-8', 'ignore')))
+        f.close()
+    if search in searches:
+        searches.remove(search)
+    searches.insert(0, search)
+    remove = len(searches) - maximum
+    if remove > 0:
+        for i in range(remove):
+            searches.pop()
+    f = open(c_local, 'w')
+    f.write(json.dumps(searches, ensure_ascii=True))
+    f.close()
+
+
+def delete_search_history(addon, server):
+    local = xbmcvfs.translatePath(addon.getAddonInfo('profile')).decode('utf-8')
+    c_local = compat_path(local)
+    if not os.path.exists(c_local):
+        return
+    c_local = compat_path(os.path.join(local, server))
+    if os.path.exists(c_local):
+        os.remove(c_local)
+
+
+def remove_search(addon, server, search):
+    local = xbmcvfs.translatePath(addon.getAddonInfo('profile')).decode('utf-8')
+    c_local = compat_path(local)
+    if not os.path.exists(c_local):
+        return
+    c_local = compat_path(os.path.join(local, server))
+    if os.path.exists(c_local):
+        f = open(c_local, 'r')
+        data = f.read()
+        searches = json.loads(str(data.decode('utf-8', 'ignore')))
+        f.close()
+        searches.remove(search)
+        f = open(c_local, 'w')
+        f.write(json.dumps(searches, ensure_ascii=True))
+        f.close()
+# obsolete funcionts END
+
+
+def download(addon, filename, url, local, notifyFinishDialog=True, headers={}):
+    try:
+        util.info('Downloading %s to %s' % (url, local))
+    except:
+        util.info('Downloading ' + url)
+    local = xbmc.makeLegalFilename(local)
+    try:
+        filename = util.replace_diacritic(util.decode_html(filename))
+    except:
+        filename = 'Video soubor'
+    icon = os.path.join(addon.getAddonInfo('path'), 'icon.png')
+    notifyEnabled = addon.getSetting('download-notify') == 'true'
+    notifyEvery = addon.getSetting('download-notify-every')
+    notifyPercent = 1
+    if int(notifyEvery) == 0:
+        notifyPercent = 10
+    if int(notifyEvery) == 1:
+        notifyPercent = 5
+
+    def encode(string):
+        return ' '.join(string).encode('utf-8')
+
+    def notify(title, message, time=3000):
+        try:
+            xbmcgui.Dialog().notification(encode(title), encode(message), time=time, icon=icon,
+                                          sound=False)
+        except:
+            traceback.print_exc()
+            error('unable to show notification')
+
+    def callback(percent, speed, est, filename):
+        if percent == 0 and speed == 0:
+            notify(xbmc.getLocalizedString(13413), filename)
+            return
+        if notifyEnabled:
+            if percent > 0 and percent % notifyPercent == 0:
+                esTime = '%ss' % est
+                if est > 60:
+                    esTime = '%sm' % int(est / 60)
+                message = xbmc.getLocalizedString(
+                    24042) % percent + ' - %s KB/s %s' % (speed, esTime)
+                notify(message, filename)
+
+    downloader = Downloader(callback)
+    result = downloader.download(url, local, filename, headers)
+    try:
+        if result == True:
+            if xbmc.Player().isPlaying():
+                notify(xbmc.getLocalizedString(20177), filename)
+            else:
+                if notifyFinishDialog:
+                    xbmcgui.Dialog().ok(xbmc.getLocalizedString(20177), filename)
+                else:
+                    notify(xbmc.getLocalizedString(20177), filename)
+        else:
+            notify(xbmc.getLocalizedString(257), filename)
+            xbmcgui.Dialog().ok(filename, xbmc.getLocalizedString(257) + ' : ' + result)
+    except:
+        traceback.print_exc()
+
+
+class Downloader(object):
+
+    def __init__(self, callback=None):
+        self.init_time = time.time()
+        self.callback = callback
+        self.gran = 50
+        self.percent = -1
+
+    def download(self, remote, local, filename=None, headers={}):
+        class MyURLopener(urllib.request.FancyURLopener):
+
+            def http_error_default(self, url, fp, errcode, errmsg, headers):
+                self.error_msg = 'Downlad failed, error : ' + str(errcode)
+
+        if not filename:
+            filename = os.path.basename(local)
+        self.filename = filename
+        if self.callback:
+            self.callback(0, 0, 0, filename)
+        socket.setdefaulttimeout(60)
+        opener = MyURLopener()
+        for header in headers:
+            opener.addheader(header, headers[header])
+        try:
+            opener.retrieve(remote, local, reporthook=self.dlProgress)
+            if hasattr(opener, 'error_msg'):
+                return opener.error_msg
+            return True
+        except socket.error:
+            errno, errstr = sys.exc_info()[:2]
+            if errno == socket.timeout:
+                return 'Download failed, connection timeout'
+        except:
+            traceback.print_exc()
+            errno, errstr = sys.exc_info()[:2]
+            return str(errstr)
+
+    def dlProgress(self, count, blockSize, totalSize):
+        if count % self.gran == 0 and not count == 0:
+            percent = int(count * blockSize * 100 / totalSize)
+            newTime = time.time()
+            diff = newTime - self.init_time
+            self.init_time = newTime
+            if diff <= 0:
+                diff = 1
+            speed = int(((1 / diff) * blockSize * self.gran) / 1024)
+            est = int((totalSize - int(count * blockSize)) / 1024 / speed)
+            if self.callback and not self.percent == percent:
+                self.callback(percent, speed, est, self.filename)
+            self.percent = percent
+
+_diacritic_replace = {'\u00f3': 'o',
+                      '\u0213': '-',
+                      '\u00e1': 'a',
+                      '\u010d': 'c',
+                      '\u010c': 'C',
+                      '\u010f': 'd',
+                      '\u010e': 'D',
+                      '\u00e9': 'e',
+                      '\u011b': 'e',
+                      '\u00ed': 'i',
+                      '\u0148': 'n',
+                      '\u0159': 'r',
+                      '\u0161': 's',
+                      '\u0165': 't',
+                      '\u016f': 'u',
+                      '\u00fd': 'y',
+                      '\u017e': 'z'
+                      }
+
+
+def replace_diacritic(string):
+    ret = []
+    for char in string:
+        if char in _diacritic_replace:
+            ret.append(_diacritic_replace[char])
+        else:
+            ret.append(char)
+    return ''.join(ret)
+
+
+def compat_path(path):
+    return path
+    #no longer needed in python 3
+    #if sys.platform.startswith('win'):
+    #    if isinstance(path, str):
+    #        path = path.decode('utf-8')
+    #else:
+    #    if isinstance(path, str):
+    #        path = path.encode('utf-8')
+    #return path
diff --git a/resources/language/resource.language.cs_cz/strings.po b/resources/language/resource.language.cs_cz/strings.po
new file mode 100644
index 0000000..7d96618
--- /dev/null
+++ b/resources/language/resource.language.cs_cz/strings.po
@@ -0,0 +1,82 @@
+# Kodi Media Center language file
+# Addon Name: Stream Resolver
+# Addon id: script.module.stream.resolver
+# Addon Provider: Libor Zoubek
+msgid ""
+msgstr ""
+"Project-Id-Version: Kodi Addons\n"
+"Report-Msgid-Bugs-To: https://forum.kodi.tv/\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Team-Kodi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgctxt "#200"
+msgid "Captcha requested"
+msgstr "Je vyžadováno opsání kódu obrázku"
+
+msgctxt "#201"
+msgid "Please wait..."
+msgstr "Vyčkejte..."
+
+msgctxt "#30003"
+msgid "[B]Search[/B]"
+msgstr "[B]Vyhledat[/B]"
+
+msgctxt "#30004"
+msgid "[B]New search[/B]"
+msgstr "[B]Nové hledání[/B]"
+
+msgctxt "#30005"
+msgid "Select video source"
+msgstr "Vyberte zdroj"
+
+msgctxt "#30006"
+msgid "[B]Downloaded files[/B]"
+msgstr "[B]Stažené soubory[/B]"
+
+msgctxt "#30007"
+msgid "[B]Next[/B]"
+msgstr "[B]Další[/B]"
+
+msgctxt "#30008"
+msgid "[B]Previous[/B]"
+msgstr "[B]Předchozí[/B]"
+
+msgctxt "#30009"
+msgid "Please setup download folder"
+msgstr "Nastavte prosím složku pro stahování"
+
+msgctxt "#30010"
+msgid "Do you wish to use VIP account to get this file?"
+msgstr "Chcete pro získání souboru použít VIP úcet?"
+
+msgctxt "#30011"
+msgid "Login failed, please check addon settings"
+msgstr "Přihlášení selhalo, zkontrolujte nastavení"
+
+msgctxt "#30012"
+msgid "[B]Latest videos[/B]"
+msgstr "[B]Nejnovější videa[/B]"
+
+msgctxt "#30013"
+msgid "[B]Top videos[/B]"
+msgstr "[B]Nejsledovanější videa[/B]"
+
+msgctxt "#30014"
+msgid "Waiting for file %ss"
+msgstr "Čekání na soubor %ss"
+
+msgctxt "#30015"
+msgid "Do you want to enable usage tracking?"
+msgstr "Chcete povolit zasílání dat o použití?"
+
+msgctxt "#30016"
+msgid "Find similar"
+msgstr "Hledat podobné"
+
diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
new file mode 100644
index 0000000..edbee10
--- /dev/null
+++ b/resources/language/resource.language.en_gb/strings.po
@@ -0,0 +1,82 @@
+# Kodi Media Center language file
+# Addon Name: Stream Resolver
+# Addon id: script.module.stream.resolver
+# Addon Provider: Libor Zoubek
+msgid ""
+msgstr ""
+"Project-Id-Version: Kodi Addons\n"
+"Report-Msgid-Bugs-To: https://forum.kodi.tv/\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Team-Kodi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#200"
+msgid "Captcha requested"
+msgstr ""
+
+msgctxt "#201"
+msgid "Please wait..."
+msgstr ""
+
+msgctxt "#30003"
+msgid "[B]Search[/B]"
+msgstr ""
+
+msgctxt "#30004"
+msgid "[B]New search[/B]"
+msgstr ""
+
+msgctxt "#30005"
+msgid "Select video source"
+msgstr ""
+
+msgctxt "#30006"
+msgid "[B]Downloaded files[/B]"
+msgstr ""
+
+msgctxt "#30007"
+msgid "[B]Next[/B]"
+msgstr ""
+
+msgctxt "#30008"
+msgid "[B]Previous[/B]"
+msgstr ""
+
+msgctxt "#30009"
+msgid "Please setup download folder"
+msgstr ""
+
+msgctxt "#30010"
+msgid "Do you wish to use VIP account to get this file?"
+msgstr ""
+
+msgctxt "#30011"
+msgid "Login failed, please check addon settings"
+msgstr ""
+
+msgctxt "#30012"
+msgid "[B]Latest videos[/B]"
+msgstr ""
+
+msgctxt "#30013"
+msgid "[B]Top videos[/B]"
+msgstr ""
+
+msgctxt "#30014"
+msgid "Waiting for file %ss"
+msgstr ""
+
+msgctxt "#30015"
+msgid "Do you want to enable usage tracking?"
+msgstr ""
+
+msgctxt "#30016"
+msgid "Find similar"
+msgstr ""
+
diff --git a/resources/language/resource.language.sk_sk/strings.po b/resources/language/resource.language.sk_sk/strings.po
new file mode 100644
index 0000000..d9dc7d3
--- /dev/null
+++ b/resources/language/resource.language.sk_sk/strings.po
@@ -0,0 +1,82 @@
+# Kodi Media Center language file
+# Addon Name: Stream Resolver
+# Addon id: script.module.stream.resolver
+# Addon Provider: Libor Zoubek
+msgid ""
+msgstr ""
+"Project-Id-Version: Kodi Addons\n"
+"Report-Msgid-Bugs-To: https://forum.kodi.tv/\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kodi Translation Team\n"
+"Language-Team: Team-Kodi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgctxt "#200"
+msgid "Captcha requested"
+msgstr "Vyžaduje sa prepísanie kódu na obrázku"
+
+msgctxt "#201"
+msgid "Please wait..."
+msgstr "Čakajte..."
+
+msgctxt "#30003"
+msgid "[B]Search[/B]"
+msgstr "[B]Vyhľadať[/B]"
+
+msgctxt "#30004"
+msgid "[B]New search[/B]"
+msgstr "[B]Nové hľadanie[/B]"
+
+msgctxt "#30005"
+msgid "Select video source"
+msgstr "Vyberte zdroj"
+
+msgctxt "#30006"
+msgid "[B]Downloaded files[/B]"
+msgstr "[B]Stiahnuté súbory[/B]"
+
+msgctxt "#30007"
+msgid "[B]Next[/B]"
+msgstr "[B]Ďalšie[/B]"
+
+msgctxt "#30008"
+msgid "[B]Previous[/B]"
+msgstr "[B]Predchádzajúce[/B]"
+
+msgctxt "#30009"
+msgid "Please setup download folder"
+msgstr "Nastavte prosím priečinok pre sťahovania"
+
+msgctxt "#30010"
+msgid "Do you wish to use VIP account to get this file?"
+msgstr "Chcete pre stiahnutie súboru použiť VIP účet?"
+
+msgctxt "#30011"
+msgid "Login failed, please check addon settings"
+msgstr "Prihlásenie sa nepodarilo, skontrolujte nastavenia"
+
+msgctxt "#30012"
+msgid "[B]Latest videos[/B]"
+msgstr "[B]Najnovšie videá[/B]"
+
+msgctxt "#30013"
+msgid "[B]Top videos[/B]"
+msgstr "[B]Najsledovanejšie videá[/B]"
+
+msgctxt "#30014"
+msgid "Waiting for file %ss"
+msgstr "Čakanie na súbor %ss"
+
+msgctxt "#30015"
+msgid "Do you want to enable usage tracking?"
+msgstr "Prajete si povoliť zasielanie údajov o použití?"
+
+msgctxt "#30016"
+msgid "Find similar"
+msgstr "Hľadať podobné"
+
diff --git a/resources/skins/default/720p/captcha-dialog.xml b/resources/skins/default/720p/captcha-dialog.xml
new file mode 100644
index 0000000..ed9e62a
--- /dev/null
+++ b/resources/skins/default/720p/captcha-dialog.xml
@@ -0,0 +1,68 @@
+<window>
+	<defaultcontrol>102</defaultcontrol>
+	<coordinates>
+		<system>2</system>
+		<posx>0</posx>
+		<posy>0</posy>
+	</coordinates>
+	<animation effect="fade" time="250">WindowOpen</animation>
+	<animation effect="fade" time="250">WindowClose</animation>
+	<controls>
+		<control type="group">
+			<posx>390</posx>
+			<posy>10</posy>
+
+			<control type="image">
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>500</width>
+				<height>200</height>
+				<texture border="20">ContentPanel.png</texture>
+			</control>
+
+			<control type="label" id="100">
+				<posx>10</posx>
+				<posy>0</posy>
+				<width>480</width>
+				<height>80</height>
+				<textcolor>white</textcolor>
+				<aligny>center</aligny>
+				<align>center</align>
+				<label>SCRIPT200</label>
+			</control>
+
+			<control type="image" id="101">
+				<posx>50</posx>
+				<posy>75</posy>
+				<width>300</width>
+        <height>105</height>
+				<texture></texture>
+			</control>
+
+			<control type="button" id="103">
+				<posx>360</posx>
+				<posy>75</posy>
+				<width>100</width>
+				<height>50</height>
+				<align>center</align>
+				<visible>false</visible>
+        <label>Next</label>
+        <ondown>102</ondown>
+				<texturenofocus>button-nofocus.png</texturenofocus>
+				<texturefocus>button-focus.png</texturefocus>
+			</control>
+			<control type="button" id="102">
+				<posx>360</posx>
+				<posy>130</posy>
+				<width>100</width>
+				<height>50</height>
+				<align>center</align>
+				<visible>true</visible>
+        <onup>103</onup>
+				<label>OK</label>
+				<texturenofocus>button-nofocus.png</texturenofocus>
+				<texturefocus>button-focus.png</texturefocus>
+			</control>
+		</control>
+	</controls>
+</window>
diff --git a/resources/skins/default/media/ContentPanel.png b/resources/skins/default/media/ContentPanel.png
new file mode 100644
index 0000000..01d1a96
Binary files /dev/null and b/resources/skins/default/media/ContentPanel.png differ
diff --git a/resources/skins/default/media/button-focus.png b/resources/skins/default/media/button-focus.png
new file mode 100644
index 0000000..5289d8b
Binary files /dev/null and b/resources/skins/default/media/button-focus.png differ
diff --git a/resources/skins/default/media/button-nofocus.png b/resources/skins/default/media/button-nofocus.png
new file mode 100644
index 0000000..a9747b7
Binary files /dev/null and b/resources/skins/default/media/button-nofocus.png differ
diff --git a/resources/skins/default/skin.xml b/resources/skins/default/skin.xml
new file mode 100644
index 0000000..720fc8e
--- /dev/null
+++ b/resources/skins/default/skin.xml
@@ -0,0 +1,13 @@
+<skin>
+  <defaultresolution>720p</defaultresolution>
+  <defaultresolutionwide>720p</defaultresolutionwide>
+  <version>2.1</version>
+  
+  <!-- amount to zoom skin to remove overscan compensation -->
+  <zoom>0</zoom>
+  
+  <credits>
+    <skinname>default</skinname>
+    <name>lzoubek</name>
+  </credits>
+</skin>
\ No newline at end of file