Aggiunto AnimeAltadefinizione e fix AnimeUniverse

channels/animeuniverse.py

@@ -10,6 +10,7 @@ headers = {}
 
 perpage_list = ['20','30','40','50','60','70','80','90','100']
 perpage = perpage_list[support.config.get_setting('perpage' , 'animeuniverse')]
+epPatron = r'<td>\s*(?P<title>[^<]+)[^>]+>[^>]+>\s*<a href="(?P<url>[^"]+)"'
 
 
 @support.menu
@@ -61,7 +62,7 @@ def peliculas(item):
 
     anime=True
     data = support.match(host + '/wp-content/themes/animeuniverse/functions/ajax.php', post='sorter=recent&location=&loop=main+loop&action=sort&numarticles='+perpage+'&paginated='+str(item.pag)+'&currentquery%5B'+query+'%5D='+searchtext+'&thumbnail=1').data.replace('\\','')
-    patron=r'<a href="(?P<url>[^"]+)"><img width="[^"]+" height="[^"]+" src="(?P<thumb>[^"]+)" class="[^"]+" alt="" title="(?P<title>[^\["]+)\s+(?P<lang>(?:[Ss][Uu][Bb].)?[Ii][Tt][Aa])'
+    patron=r'<a href="(?P<url>[^"]+)"><img width="[^"]+" height="[^"]+" src="(?P<thumb>[^"]+)" class="[^"]+" alt="" title="(?P<title>.*?)\s+(?P<lang>Sub ITA|ITA)'
 
     def ItemItemlistHook(item, itemlist):
         if len(itemlist) == int(perpage):
@@ -76,12 +77,27 @@ def peliculas(item):
 @support.scrape
 def episodios(item):
     pagination = int(perpage)
-    patron = r'<td>\s*(?P<title>[A-Za-z]+ \d+)[^>]+>[^>]+>\s*<a href="(?P<url>[^"]+)"'
+    patron = epPatron
     return locals()
 
 
 def findvideos(item):
-    url = support.match(support.httptools.downloadpage(item.url).url, string=True, patron=r'file=([^$]+)').match
-    if 'http' not in url: url = 'http://' + url
-    itemlist=[item.clone(title='Diretto', url=url, server='directo', action='play')]
+    itemlist = []
+    if item.contentType == 'movie':
+        matches = support.match(item, patron=epPatron).matches
+        for title, url in matches:
+            get_video_list(url, title, itemlist)
+    else:
+        get_video_list(item.url, 'Diretto', itemlist)
     return support.server(item, itemlist=itemlist)
+
+
+def get_video_list(url, title, itemlist):
+    from requests import get
+    if not url.startswith('http'): url = host + url
+
+    url = support.match(get(url).url, string=True, patron=r'file=([^$]+)').match
+    if 'http' not in url: url = 'http://' + url
+    itemlist.append(support.Item(title=title, url=url, server='directo', action='play'))
+
+    return itemlist