From 9bf01164f6345fd1e21cab06a6ce9b59b3ebc63d Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 18 Jun 2020 20:58:32 +0200 Subject: [PATCH] piccoli fix --- channels/animesaturn.py | 14 +++++++------- channels/cinetecadibologna.py | 2 +- channels/raiplay.py | 2 +- channels/tantifilm.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/channels/animesaturn.py b/channels/animesaturn.py index a3a41703..02e45361 100644 --- a/channels/animesaturn.py +++ b/channels/animesaturn.py @@ -9,9 +9,6 @@ host = support.config.get_channel_url() headers={'X-Requested-With': 'XMLHttpRequest'} - - - @support.menu def mainlist(item): @@ -54,9 +51,13 @@ def newest(categoria): @support.scrape def menu(item): - patronMenu = r'
(?P[^"<]+)<(?P<url>.*?)(?:"lista-top"|"clearfix")' + patronMenu = r'<div class="col-md-13 bg-dark-as-box-shadow p-2 text-white text-center">(?P<title>[^"<]+)<(?P<other>.*?)(?:"lista-top"|"clearfix")' action = 'peliculas' item.args = 'top' + def itemHook(item2): + item2.url = item.url + return item2 + return locals() @@ -72,9 +73,8 @@ def peliculas(item): post = "page=" + str(item.page if item.page else 1) if item.page > 1 else None if item.args == 'top': - data=item.url - patron = r'light">(?P<title2>[^<]+)</div>\s(?P<title>[^<]+)[^>]+>[^>]+>\s<a href="(?P<url>[^"]+)">(?:<a[^>]+>|\s*)<img alt="[^"]+" src="(?P<thumb>[^"]+)"' - + data = item.other + patron = r'light">(?P<title2>[^<]+)</div>\s(?P<title>[^<]+)[^>]+>[^>]+>\s<a href="(?P<url>[^"]+)">(?:<a[^>]+>|\s*)<img.*?src="(?P<thumb>[^"]+)"' else: data = support.match(item, post=post, headers=headers).data if item.args == 'updated': diff --git a/channels/cinetecadibologna.py b/channels/cinetecadibologna.py index 34a4e8e6..949f4e56 100644 --- a/channels/cinetecadibologna.py +++ b/channels/cinetecadibologna.py @@ -28,7 +28,7 @@ def menu(item): elif 'percorsi' in item.url: patron = r'<div class="cover_percorso">\s*<a href="(?P<url>[^"]+)">\s*<img src="(?P<thumb>[^"]+)"[^>]+>\s*[^>]+>(?P<title>.*?)<' else: - patron = r'<h2>\s*<a href="(?P<url>[^"]+)"\s*>(?P<title>[^<]+)<' + patron = r'<h2>\s*<a href="(?P<url>[^,"]+),[^"]+"\s*>(?P<title>[^<]+)<' patronNext = r'<div class="dx">\s*<a href="(.*?)">pagina suc' return locals() diff --git a/channels/raiplay.py b/channels/raiplay.py index 7c836905..7014d96b 100644 --- a/channels/raiplay.py +++ b/channels/raiplay.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------ -# Canale per SerieHD +# Canale per Rai Play # ------------------------------------------------------------ import requests diff --git a/channels/tantifilm.py b/channels/tantifilm.py index b3e74a67..a5cc940f 100644 --- a/channels/tantifilm.py +++ b/channels/tantifilm.py @@ -58,7 +58,7 @@ def peliculas(item): # support.regexDbg(item, patron, headers) else: patronNext = r'<a class="nextpostslink" rel="next" href="([^"]+)">' - patron = r'<div class="mediaWrap mediaWrapAlt">\s?<a href="(?P<url>[^"]+)"(?:[^>]+>|)>?\s?<img[^s]+src="([^"]+)"[^>]+>\s?<\/a>[^>]+>[^>]+>[^>]+>(?P<title>.+?)(?:[ ]<lang>[sSuUbB\-iItTaA]+)?(?:[ ]?\((?P<year>\d{4}))\).[^<]+[^>]+><\/a>.+?<p>\s*(?P<quality>[a-zA-Z-0-9\.]+)\s*<\/p>[^>]+>' + patron = r'<div class="mediaWrap mediaWrapAlt">\s?<a href="(?P<url>[^"]+)"(?:[^>]+>|)>?\s?<img[^s]+src="([^"]+)"[^>]+>\s?<\/a>[^>]+>[^>]+>[^>]+>(?P<title>.+?)(?P<lang>[sSuUbB\-iItTaA]+)?(?:[ ]?\((?P<year>\d{4})-?(?:\d{4})?)\).[^<]+[^>]+><\/a>.+?<p>\s*(?P<quality>[a-zA-Z-0-9\.]+)\s*<\/p>[^>]+>' patronBlock = r'<div id="main_col">(?P<block>.*?)<!\-\- main_col \-\->' # if item.args != 'all' and item.args != 'search':