minor code cleanup using python six

servers/dropload.py

@@ -1,14 +1,12 @@
 # -*- coding: utf-8 -*-
 
-try:
-    import urllib.parse as urllib
-except ImportError:
-    import urllib
+from six.moves import urllib
 
 from core import httptools, support
 from core import scrapertools
 from platformcode import logger, config
-
+from lib import jsunpack
+import re
 
 def test_video_exists(page_url):
     logger.debug("(page_url='%s')" % page_url)
@@ -24,15 +22,13 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     logger.debug(" url=" + page_url)
 
     global data
-    # vres = scrapertools.find_multiple_matches(data, 'nowrap[^>]+>([^,]+)')
-    # if not vres: vres = scrapertools.find_multiple_matches(data, '<td>(\d+x\d+)')
 
     data_pack = scrapertools.find_single_match(data, "</div>\n\s*<script[^>]+>(eval.function.p,a,c,k,e,.*?)\s*</script>")
     if data_pack != "":
-        from lib import jsunpack
         data = jsunpack.unpack(data_pack)
+        data = re.sub(r'\b([a-zA-Z]+):("[^"]+"[,\n}])', r'"\1":\2', data)
 
-    _headers = urllib.urlencode(httptools.default_headers)
+    _headers = urllib.parse.urlencode(httptools.default_headers)
     video_urls = support.get_jwplayer_mediaurl(data, 'dropload')
 
     return video_urls

servers/streamingcommunityws.py

@@ -3,18 +3,13 @@
 PY3 = False
 if sys.version_info[0] >= 3: PY3 = True
 
-if PY3: 
-    import urllib.parse as urllib
-else: 
-    import urllib
+from six.moves import urllib
 
 import ast
 import xbmc
 
 from core import httptools, support, filetools
 from platformcode import logger, config
-if PY3: from concurrent import futures
-else: from concurrent_py2 import futures
 
 vttsupport = False if int(xbmc.getInfoLabel('System.BuildVersion').split('.')[0]) < 20 else True
 
@@ -28,21 +23,24 @@ def test_video_exists(page_url):
     if not iframeParams or len(iframeParams) < 2:
         return 'StreamingCommunity', 'Prossimamente'
 
-    urlParams = urllib.parse_qs(urllib.urlsplit(server_url).query)
+    urlParams = urllib.parse.parse_qs(urllib.parse.urlsplit(server_url).query)
     return True, ""
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     video_urls = list()
 
     quality, params, url = iframeParams
-
+    split_url = urllib.parse.urlsplit(url)
+    url_params = urllib.parse.parse_qsl(split_url.query)
+    logger.debug(url_params)
     masterPlaylistParams = ast.literal_eval(params)
     if 'canPlayFHD' in urlParams:
         masterPlaylistParams['h'] = 1
     if 'b' in urlParams:
         masterPlaylistParams['b'] = 1
-    url =  '{}?{}'.format(url,urllib.urlencode(masterPlaylistParams))
+    masterPlaylistParams.update(url_params)
+    url =  '{}://{}{}?{}'.format(split_url.scheme,split_url.netloc,split_url.path,urllib.parse.urlencode(masterPlaylistParams))
 
     video_urls = [['hls [{}]'.format(quality), url]]