Ottimizzati alcuni server

servers/anavids.py

@@ -7,7 +7,7 @@ from platformcode import config, logger
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
-
+    global data
     data = httptools.downloadpage(page_url, cookies=False).data
     if 'File you are looking for is not found.' in data:
         return False, config.get_localized_string(70449) % "AvaVids"
@@ -16,7 +16,6 @@ def test_video_exists(page_url):
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-    data = httptools.downloadpage(page_url).data
+    global data
     video_urls = support.get_jwplayer_mediaurl(data, 'AvaVids')
     return video_urls

servers/animeworld_server.py

@@ -13,6 +13,7 @@ def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
     post = urllib.urlencode({'r': '', 'd': 'animeworld.biz'})
     data_json = httptools.downloadpage(page_url.replace('/v/', '/api/source/'), headers=[['x-requested-with', 'XMLHttpRequest']], post=post).data
+    global json
     json = jsontools.load(data_json)
     if not json['data']:
         return False, config.get_localized_string(70449) % "AnimeWorld"
@@ -23,9 +24,7 @@ def test_video_exists(page_url):
 def get_video_url(page_url, user="", password="", video_password=""):
     logger.info("(page_url='%s')" % page_url)
     video_urls = []
-    post = urllib.urlencode({'r': '', 'd': 'animeworld.biz'})
-    data_json = httptools.downloadpage(page_url.replace('/v/', '/api/source/'), headers=[['x-requested-with', 'XMLHttpRequest']], post=post).data
-    json = jsontools.load(data_json)
+    global json
     if json['data']:
         for file in json['data']:
             media_url = file['file']

servers/vvvvid.py

@@ -16,19 +16,18 @@ headers = {'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:62.0) Gecko/2010010
 login_page = 'https://www.vvvvid.it/user/login'
 conn_id = current_session.get(login_page, headers=headers).json()['data']['conn_id']
 payload = {'conn_id': conn_id}
-# logger.info('CONNECTION ID= ' + str(payload))
 
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
     data = httptools.downloadpage(page_url).data
     if "Not Found" in data or "File was deleted" in data:
-        return False, "[VVVVID] The file does not exist or has been deleted"
+        return False, config.get_localized_string(70449) % "VVVVID"
     else:
         page_url = page_url.replace("/show/","/#!show/")
         show_id = re.findall("#!show/([0-9]+)/", page_url)[0]
         name = re.findall(show_id + "/(.+?)/", page_url)
-        if not name: return False, "[VVVVID] The file does not exist or has been deleted"
+        if not name: return False, config.get_localized_string(70449) % "VVVVID"
     return True, ""
 
 
@@ -45,20 +44,16 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
 
     # Getting info from Site
     json_url = "https://www.vvvvid.it/vvvvid/ondemand/" + show_id + '/season/' +season_id + '/'
-    # logger.info('URL= ' + json_url)
     json_file = current_session.get(json_url, headers=headers, params=payload).json()
     logger.info(json_file['data'])
 
     # Search for the correct episode
     for episode in json_file['data']:
-        # import web_pdb; web_pdb.set_trace()
         if episode['video_id'] == int(video_id):
             ep_title = '[B]' + episode['title'] + '[/B]'
             embed_info = vvvvid_decoder.dec_ei(episode['embed_info'])
             embed_info = embed_info.replace('manifest.f4m','master.m3u8').replace('http://','https://').replace('/z/','/i/')
 
-    # import web_pdb; web_pdb.set_trace()
-
     video_urls.append([ep_title, str(embed_info)])
 
     return video_urls