fix override DNS e altre migliorie

servers/akstream.py

@@ -10,9 +10,9 @@ from platformcode import logger, config
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
-    return True, ""
+    global data
     data = httptools.downloadpage(page_url).data
-    if "File was deleted" in data or "Page Cannot Be Found" in data:
+    if "File Not Found" in data:
         return False, config.get_localized_string(70449) % "Akvideo"
     return True, ""
 
@@ -21,8 +21,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     logger.info(" url=" + page_url)
     video_urls = []
 
-    data = httptools.downloadpage(page_url).data.replace('https','http')
-
+    global data
     vres = scrapertools.find_multiple_matches(data, 'nowrap[^>]+>([^,]+)')
     data_pack = scrapertools.find_single_match(data, "</div>\n\s*<script[^>]+>(eval.function.p,a,c,k,e,.*?)\s*</script>")
     if data_pack != "":

servers/turbovid.py

@@ -31,7 +31,6 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     sources = scrapertools.find_single_match(data, r'sources: \[([^\]]+)\]')
 
     for media_url in scrapertools.find_multiple_matches(sources, '"([^"]+)"'):
-        media_url = media_url.replace('https:', 'http:')
         ext = scrapertools.get_filename_from_url(media_url)[-4:]
         video_urls.append(["%s [%s]" % (ext, server), media_url])
     return video_urls

servers/wstream.py

@@ -11,6 +11,7 @@ headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:54.0) Gecko/20
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
+    global data
     data = httptools.downloadpage(page_url).data
     if "Not Found" in data or "File was deleted" in data:
         return False, config.get_localized_string(70449) % 'Wstream'
@@ -21,14 +22,18 @@ def test_video_exists(page_url):
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("[Wstream] url=" + page_url)
     video_urls = []
+    global data
 
     if '/streaming.php' in page_url or 'html' in page_url:
-        code = httptools.downloadpage(page_url, headers=headers, follow_redirects=False).headers['location'].split('/')[-1].replace('.html','')
-        logger.info('WCODE='+code)
-        page_url = 'https://wstream.video/video.php?file_code=' + code
-    
+        try:
+            code = httptools.downloadpage(page_url, headers=headers, follow_redirects=False).headers['location'].split('/')[-1].replace('.html','')
+            logger.info('WCODE='+code)
+            page_url = 'https://wstream.video/video.php?file_code=' + code
+            data = httptools.downloadpage(page_url, headers=headers, follow_redirects=True).data
+        except:
+            pass
+
     code = page_url.split('=')[-1]
-    data = httptools.downloadpage(page_url, headers=headers, follow_redirects=False).data
     ID = scrapertools.find_single_match(data, r'''input\D*id=(?:'|")([^'"]+)(?:'|")''')
     post = urllib.urlencode({ID: code})