From dbfc9fc341e88c1df7bdabf6bebf8237ecd4d775 Mon Sep 17 00:00:00 2001 From: enricodarodda <57716112+enricodarodda@users.noreply.github.com> Date: Wed, 24 Feb 2021 18:12:24 +0100 Subject: [PATCH] Fix toonitalia (#276) --- channels/toonitalia.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/channels/toonitalia.py b/channels/toonitalia.py index 773075ea..dc765897 100644 --- a/channels/toonitalia.py +++ b/channels/toonitalia.py @@ -5,17 +5,11 @@ from core import support import sys -if sys.version_info[0] >= 3: from concurrent import futures -else: from concurrent_py2 import futures host = support.config.get_channel_url() - headers = [['Referer', host]] - - - @support.menu def mainlist(item): @@ -33,7 +27,7 @@ def search(item, text): support.info(text) # item.args='search' item.text = text - item.url = item.url + '/?a=b&s=' + text.replace(' ', '+') + item.url = item.url + '/?%73=' + text.replace(' ', '+') try: return peliculas(item) @@ -64,21 +58,25 @@ def newest(categoria): @support.scrape def peliculas(item): # debugBlock = True - search = item.text + # debug = True + # search = item.text if item.contentType != 'movie': anime = True action = 'findvideos' if item.contentType == 'movie' else 'episodios' blacklist = ['-Film Animazione disponibili in attesa di recensione '] - if search: + if item.action == 'search': pagination = '' - patronBlock = '"lcp_catlist"[^>]+>(?P.*)' - patron = r'href="(?P[^"]+)" title="(?P[^"]+)"' + #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>[^<]+)<[^>]+>[^>]+><div' elif item.args == 'last': patronBlock = 'Aggiornamenti</h2>(?P<block>.*)</ul>' - patron = r'<a href="(?P<url>[^"]+)">\s*<img[^>]+src(?:set)?="(?P<thumbnail>[^ ]+)[^>]+>\s*<span[^>]+>(?P<title>[^<]+)' + patron = r'<a href="(?P<url>[^"]+)">\s*<img[^>]+src[set]{0,3}="(?P<thumbnail>[^ ]+)[^>]+>\s*<span[^>]+>(?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>[^>]+>[^>]+>[^>]+><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>[^"]+)"[^>]+>(?P<title>[^<]+)</a>[^>]+>[^>]+>[^>]+><img.*?src="(?P<thumb>[^"]+)".*?<p>(?P<plot>[^<]+)</p>.*?tag">.*?(?P<type>(?:[Ff]ilm|</art|Serie Tv))' typeContentDict={'movie':['film']} typeActionDict={'findvideos':['film']} patronNext = '<a class="next page-numbers" href="([^"]+)">'