Fix ToonItalia

channels/toonitalia.py

@@ -13,12 +13,10 @@ headers = [['Referer', host]]
 @support.menu
 def mainlist(item):
 
-    # top = [('Novità',['', 'peliculas', 'new', 'tvshow']),
-    #        ('Aggiornamenti', ['', 'peliculas', 'last', 'tvshow'])]
-    # tvshow = ['/category/serie-tv/']
-    anime =['/category/anime/']
-               # ('Sub-Ita',['/category/anime-sub-ita/', 'peliculas', 'sub']),
-               # ('Film Animati',['/category/film-animazione/','peliculas', '', 'movie'])]
+    anime =['/category/anime',
+            ('ITA',['/lista-anime-ita','peliculas',]),
+            ('Sub-ITA',['/lista-anime-sub-ita', 'peliculas'])]
+               # ('Film Animati',['/lista-anime-ita','peliculas', '', 'movie'])]
     search = ''
     return locals()
 
@@ -39,52 +37,28 @@ def search(item, text):
         return []
 
 
-def newest(categoria):
-    support.info(categoria)
-    item = support.Item()
-    try:
-        item.contentType = 'undefined'
-        item.url= host
-        item.args= 'new'
-        return peliculas(item)
-    # Continua la ricerca in caso di errore
-    except:
-        import sys
-        for line in sys.exc_info():
-            support.logger.error("{0}".format(line))
-        return []
-
 
 @support.scrape
 def peliculas(item):
-    # debugBlock = True
-    # debug = True
-    # search = item.text
-    if item.contentType != 'movie': anime = True
+    anime = True
     action = 'check'
-    blacklist = ['-Film Animazione disponibili in attesa di recensione ']
 
-    if item.action == 'search':
-        pagination = ''
-        #patronBlock = '"lcp_catlist"[^>]+>(?P<block>.*)</ul>'
-        patronBlock = '<main[^>]+>(?P<block>.*?)</ma'
-        #patron = r'href="(?P<url>[^"]+)" title="(?P<title>[^"]+)"'
-        patron = r'<a href="(?P<url>[^"]+)"[^>]*>(?P<title>[^<]+)<[^>]+>[^>]+>\s*<div'
-    elif item.args == 'last':
-        patronBlock = '(?:Aggiornamenti|Update)</h2>(?P<block>.*?)</ul>'
-        patron = r'<a href="(?P<url>[^"]+)">\s*<img[^>]+src[set]{0,3}="(?P<thumbnail>[^ ]+)[^>]+>\s*<span[^>]+>(?P<title>[^<]+)'
+    deflang = 'ITA' if 'sub' not in item.url else 'Sub-ITA'
+    if 'lista' in item.url:
+        pagination = 20
+        patron = r'<li><a href="(?P<url>[^"]+)">(?P<title>[^<]+)'
+
     else:
         patronBlock = '<main[^>]+>(?P<block>.*)</main>'
-        # patron = r'<a href="(?P<url>[^"]+)" rel="bookmark">(?P<title>[^<]+)</a>[^>]+>[^>]+>[^>]+><img.*?src="(?P<thumb>[^"]+)".*?<p>(?P<plot>[^<]+)</p>.*?<span class="cat-links">Pubblicato in.*?.*?(?P<type>(?:[Ff]ilm|</artic))[^>]+>'
-        patron = r'<a href="(?P<url>[^"]+)" rel="bookmark">(?P<title>[^<]+)</a>(:?[^>]+>){3}(?:<img.*?src="(?P<thumb>[^"]+)")?.*?<p>(?P<plot>[^<]+)</p>.*?tag">.*?(?P<type>(?:[Ff]ilm|</art|Serie Tv))'
+        patron = r'(?i)<a href="(?P<url>[^"]+)" rel="bookmark">(?P<title>[^<]+)</a>(:?[^>]+>){3}(?:<img.*?src="(?P<thumb>[^"]+)")?.*?<p>(?P<plot>[^<]+)</p>.*?tag">.*?(?P<type>(?:film|serie|anime))(?P<cat>.*?)</span>'
         typeContentDict={'movie':['film']}
         typeActionDict={'findvideos':['film']}
         patronNext = '<a class="next page-numbers" href="([^"]+)">'
 
     def itemHook(item):
         support.info(item.title)
-        if item.args == 'sub':
-            item.title += support.typo('Sub-ITA', 'bold color kod _ []')
+        if 'sub/ita' in item.cat.lower():
+            item.title = item.title.replace('[ITA]', '[Sub-ITA]')
             item.contentLanguage = 'Sub-ITA'
         return item
     return locals()
@@ -101,18 +75,11 @@ def check(item):
 def episodios(item):
     anime = True
     patron = r'>\s*(?:(?P<season>\d+)(?:&#215;|x|×))?(?P<episode>\d+)(?:\s+&#8211;\s+)?[ –]+(?P<title2>[^<]+)[ –]+<a (?P<data>.*?)(?:<br|</p)'
-
-    # if inspect.stack(0)[1][3] not in ['find_episodes']:
-    #     from platformcode import autorenumber
-    #     autorenumber.start(itemlist, item)
     return locals()
 
 
 def findvideos(item):
-    servers = support.server(item, data=item.data)
-    return servers
-
-    # return support.server(item, item.data if item.contentType != 'movie' else support.match(item.url, headers=headers).data )
+    return support.server(item, data=item.data)
 
 
 def clean_title(title):