From f77320479467b8537ad84cadcd4a5b8bc4b9672b Mon Sep 17 00:00:00 2001
From: Alhaziel01 <alhaziel01@gmail.com>
Date: Mon, 3 Aug 2020 18:29:05 +0200
Subject: [PATCH] Ottimizzazioni AW e AS

---
 channels/animesaturn.py | 27 ++++++++++++++-------------
 channels/animeworld.py  | 32 ++++++++++++++++----------------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/channels/animesaturn.py b/channels/animesaturn.py
index 72b8e123..a3870e47 100644
--- a/channels/animesaturn.py
+++ b/channels/animesaturn.py
@@ -16,20 +16,21 @@ def get_data(item, head=[]):
     for h in head:
         headers[h[0]] = h[1]
     if not item.count: item.count = 0
-    matches = support.match(item, patron=r'<script>(.*?location.href=".*?(http[^"]+)";)</').match
-    if matches:
-        jstr, location = matches
-        item.url=support.re.sub(r':\d+', '', location).replace('http://','https://')
-    if not config.get_setting('key', item.channel) and jstr:
-        jshe = 'var document = {}, location = {}'
-        aesjs = str(support.match(host + '/aes.min.js').data)
-        js_fix = 'window.toHex = window.toHex || function(){for(var d=[],d=1==arguments.length&&arguments[0].constructor==Array?arguments[0]:arguments,e="",f=0;f<d.length;f++)e+=(16>d[f]?"0":"")+d[f].toString(16);return e.toLowerCase()}'
-        jsret =  'return document.cookie'
-        key_data = js2py.eval_js( 'function (){ ' + jshe + '\n' + aesjs + '\n' + js_fix + '\n' + jstr + '\n' + jsret + '}' )()
-        key = key_data.split(';')[0]
+    if not config.get_setting('key', item.channel):
+        matches = support.match(item, patron=r'<script>(.*?location.href=".*?(http[^"]+)";)</').match
+        if matches:
+            jstr, location = matches
+            item.url=support.re.sub(r':\d+', '', location).replace('http://','https://')
+        if jstr:
+            jshe = 'var document = {}, location = {}'
+            aesjs = str(support.match(host + '/aes.min.js').data)
+            js_fix = 'window.toHex = window.toHex || function(){for(var d=[],d=1==arguments.length&&arguments[0].constructor==Array?arguments[0]:arguments,e="",f=0;f<d.length;f++)e+=(16>d[f]?"0":"")+d[f].toString(16);return e.toLowerCase()}'
+            jsret =  'return document.cookie'
+            key_data = js2py.eval_js( 'function (){ ' + jshe + '\n' + aesjs + '\n' + js_fix + '\n' + jstr + '\n' + jsret + '}' )()
+            key = key_data.split(';')[0]
 
-        # save Key in settings
-        config.set_setting('key', key, item.channel)
+            # save Key in settings
+            config.set_setting('key', key, item.channel)
 
     # set cookie
     headers['cookie'] = config.get_setting('key', item.channel)
diff --git a/channels/animeworld.py b/channels/animeworld.py
index 30c86c83..7a7cbe1a 100644
--- a/channels/animeworld.py
+++ b/channels/animeworld.py
@@ -24,20 +24,21 @@ def get_data(item, head=[]):
     for h in head:
         headers[h[0]] = h[1]
     if not item.count: item.count = 0
-    matches = support.match(item, patron=r'<script>(.*?location.href=".*?(http[^"]+)";)</').match
-    if matches:
-        jstr, location = matches
-        item.url=support.re.sub(r':\d+', '', location).replace('http://','https://')
-    if not config.get_setting('key', item.channel) and jstr:
-        jshe = 'var document = {}, location = {}'
-        aesjs = str(support.match(host + '/aes.min.js').data)
-        js_fix = 'window.toHex = window.toHex || function(){for(var d=[],d=1==arguments.length&&arguments[0].constructor==Array?arguments[0]:arguments,e="",f=0;f<d.length;f++)e+=(16>d[f]?"0":"")+d[f].toString(16);return e.toLowerCase()}'
-        jsret =  'return document.cookie'
-        key_data = js2py.eval_js( 'function (){ ' + jshe + '\n' + aesjs + '\n' + js_fix + '\n' + jstr + '\n' + jsret + '}' )()
-        key = key_data.split(';')[0]
+    if not config.get_setting('key', item.channel):
+        matches = support.match(item, patron=r'<script>(.*?location.href=".*?(http[^"]+)";)</').match
+        if matches:
+            jstr, location = matches
+            item.url=support.re.sub(r':\d+', '', location).replace('http://','https://')
+        if jstr:
+            jshe = 'var document = {}, location = {}'
+            aesjs = str(support.match(host + '/aes.min.js').data)
+            js_fix = 'window.toHex = window.toHex || function(){for(var d=[],d=1==arguments.length&&arguments[0].constructor==Array?arguments[0]:arguments,e="",f=0;f<d.length;f++)e+=(16>d[f]?"0":"")+d[f].toString(16);return e.toLowerCase()}'
+            jsret =  'return document.cookie'
+            key_data = js2py.eval_js( 'function (){ ' + jshe + '\n' + aesjs + '\n' + js_fix + '\n' + jstr + '\n' + jsret + '}' )()
+            key = key_data.split(';')[0]
 
-        # save Key in settings
-        config.set_setting('key', key, item.channel)
+            # save Key in settings
+            config.set_setting('key', key, item.channel)
 
     # set cookie
     headers['cookie'] = config.get_setting('key', item.channel)
@@ -172,8 +173,7 @@ def episodios(item):
     anime=True
     pagination = 50
     data = get_data(item)
-    support.log(data)
-    patronBlock= r'<div class="server\s*active\s*"(?P<block>.*?)<div class="server'
+    patronBlock= r'<div class="server\s*active\s*"(?P<block>.*?)(?:<div class="server|<link)'
     patron = r'<li[^>]*>\s*<a.*?href="(?P<url>[^"]+)"[^>]*>(?P<episode>[^<]+)<'
     def itemHook(item):
         item.number = support.re.sub(r'\[[^\]]+\]', '', item.title)
@@ -192,7 +192,7 @@ def findvideos(item):
     data = resp.data
     for ID, name in resp.matches:
         if not item.number: item.number = support.match(item.title, patron=r'(\d+) -').match
-        match = support.match(data, patronBlock=r'data-name="' + ID + r'"[^>]+>(.*?)<div class="(?:server|download)', patron=r'data-id="([^"]+)" data-episode-num="' + (item.number if item.number else '1') + '"' + r'.*?href="([^"]+)"').match
+        match = support.match(data, patronBlock=r'data-name="' + ID + r'"[^>]+>(.*?)(?:<div class="(?:server|download)|link)', patron=r'data-id="([^"]+)" data-episode-num="' + (item.number if item.number else '1') + '"' + r'.*?href="([^"]+)"').match
         if match:
             epID, epurl = match
             if 'vvvvid' in name.lower():