Merge branch 'master' of https://github.com/kodiondemand/addon into master

core/support.py

@@ -1342,9 +1342,9 @@ def addQualityTag(item, itemlist, data, patron):
         else:
             info('nessun tag qualità trovato')
 
-def get_jwplayer_mediaurl(data, srvName, onlyHttp=False):
+def get_jwplayer_mediaurl(data, srvName, onlyHttp=False, dataIsBlock=False):
     video_urls = []
-    block = scrapertools.find_single_match(data, r'sources:\s*\[([^\]]+)\]')
+    block = scrapertools.find_single_match(data, r'sources:\s*\[([^\]]+)\]') if not dataIsBlock else data
     if 'file:' in block:
         sources = scrapertools.find_multiple_matches(block, r'file:\s*"([^"]+)"(?:,label:\s*"([^"]+)")?')
     elif 'src:' in block:

servers/onlystream.py

@@ -20,5 +20,6 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     logger.debug("url=" + page_url)
     global data
     # logger.debug(data)
-    video_urls = support.get_jwplayer_mediaurl(data, 'Onlystream')
+    block = scrapertools.find_single_match(data, 'player.updateSrc\(([^\)]+)')
+    video_urls = support.get_jwplayer_mediaurl(block, 'Onlystream', dataIsBlock=True)
     return video_urls

servers/userload.py

@@ -22,10 +22,10 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     video_urls = []
     packed = support.match(data, patron=r"(eval\(function\(p,a,c,k,e,d\).*?)\s*<").match
     unpack = jsunpack.unpack(packed)
-    var = support.match(unpack, patron= r'baffffbd="([^"]+)".*?edecbade="([^"]+)').match
+    var = support.match(unpack, patron= r'"([a-zA-Z0-9]{31,32})"').matches[2:]
 
     if var:
-        post = 'morocco={}&mycountry={}'.format(var[1], var[0])
+        post = 'morocco={}&mycountry={}'.format(var[0], var[1])
         logger.debug(post)
         url = support.match('https://userload.co/api/request/', post=post, patron=r'([^\s\r\n]+)').match
         if url: