From b0ac43c5e37daf95e25849c16aaac74c4589e5e9 Mon Sep 17 00:00:00 2001 From: enricodarodda <57716112+enricodarodda@users.noreply.github.com> Date: Mon, 1 Feb 2021 12:58:47 +0100 Subject: [PATCH] Fix casacinema cb01anime metalvideo mondoserietv (#263) Varie migliorie ai canali --- channels/casacinema.py | 2 +- channels/cb01anime.py | 5 +++-- channels/italiaserie.py | 6 ++++-- channels/metalvideo.py | 5 +++-- channels/mondoserietv.py | 2 +- channels/seriehd.py | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/channels/casacinema.py b/channels/casacinema.py index 864f4822..9b0186fe 100644 --- a/channels/casacinema.py +++ b/channels/casacinema.py @@ -108,7 +108,7 @@ def peliculas(item): else: patron = r'
  • [^"]+)">
    \s*?]+>(?P[^\(\[<]+)(?:\[(?P<quality1>HD)\])?[ ]?(?:\(|\[)?(?P<lang>Sub-ITA)?(?:\)|\])?[ ]?(?:\[(?P<quality>.+?)\])?[ ]?(?:\((?P<year>\d+)\))?' - patronNext = r'<a href="([^"]+)" >Pagina' + patronNext = r'<a href="([^"]+)"\s*>Pagina' # debug = True def itemHook(item): diff --git a/channels/cb01anime.py b/channels/cb01anime.py index d870e34e..09a04851 100644 --- a/channels/cb01anime.py +++ b/channels/cb01anime.py @@ -59,12 +59,13 @@ def newest(categoria): @support.scrape def peliculas(item): + # debug=True blacklist = Blacklist item.contentType = 'tvshow' if item.args == 'newest': - patron = r'<div id="blockvids">\s*<ul>\s*<li>\s*<a href="(?P<url>[^"]+)"[^>]+><img[^>]+src="(?P<thumb>[^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<title>[^\[]+)\[(?P<lang>[^\]]+)\]' + patron = r'<div id="blockvids">\s*<ul>\s*<li>\s*<a href="(?P<url>[^"]+)"[^>]+><img[^>]+src="(?P<thumb>[^"]+)"[^>]*>(?:[^>]+>){4}(?P<title>[^\[]+)\[(?P<lang>[^\]]+)\]' else: - patron = r'<div class="span4">\s*<a href="(?P<url>[^"]+)"><img src="(?P<thumb>[^"]+)"[^>]+><\/a>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+> +<h1>(?P<title>[^<\[]+)(?:\[(?P<lang>[^\]]+)\])?</h1></a>.*?-->(?:.*?<br />)?\s*(?P<plot>[^<]+)' + patron = r'<div class="span4">\s*<a href="(?P<url>[^"]+)"><img src="(?P<thumb>[^"]+)"[^>]+><\/a>(?:[^>]+>){7}\s*<h1>(?P<title>[^<\[]+)(?:\[(?P<lang>[^\]]+)\])?</h1></a>.*?-->(?:.*?<br />)?\s*(?P<plot>[^<]+)' patronNext = r'<link rel="next" href="([^"]+)"' action = 'check' return locals() diff --git a/channels/italiaserie.py b/channels/italiaserie.py index f071cbec..a6303b17 100644 --- a/channels/italiaserie.py +++ b/channels/italiaserie.py @@ -25,16 +25,18 @@ def mainlist(item): @support.scrape def peliculas(item): + # debug=True blacklist = ['Aggiornamento Episodi'] action = 'episodios' patron = r'<div class="post-thumb">\s*<a href="(?P<url>[^"]+)" title="(?P<title>[^"\[]+)[^>]+>\s*<img src="(?P<thumb>[^"]+)"[^>]+>' if item.args == 'update': pagination = '' - patron = r'br />(?:[^>]+>)?(?P<title>[^โ€“]+)[^<]+<a href="(?P<url>[^"]+)">(?P<episode>[^ ]+)\s*(?P<title2>[^\(<]+)(?:\((?P<lang>[^\)]+))?' + #patron = r'br />(?:[^>]+>)?(?P<title>[^โ€“]+)[^<]+<a href="(?P<url>[^"]+)">(?P<episode>[^ ]+)\s*(?P<title2>[^\(<]+)(?:\((?P<lang>[^\)]+))?' + patron = r'br />(?:\s*<[^>]+>)*(?P<title>[^โ€“<]+)[^<]+<a href="(?P<url>[^"]+)"[^>]*>(?P<episode>[\S]+)\s*(?P<title2>[^\(<]+)(?:\((?P<lang>[^\)]+))?' action = 'episodios' if item.args == 'top': - patron = r'<a href="(?P<url>[^"]+)">(?P<title>[^<]+)</a>[^>]+>[^>]+>[^>]+><img.*?src="(?P<thumb>[^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>:\s*(?P<rating>[^/]+)' + patron = r'<a href="(?P<url>[^"]+)">(?P<title>[^<]+)</a>(?:[^>]+>){3}<img.*?src="(?P<thumb>[^"]+)"[^>]+>(?:[^>]+>){5}:\s*(?P<rating>[^/]+)' if item.args =='a-z': pagination = '' patron = r'<li ><a href="(?P<url>[^"]+)" title="(?P<title>[^"]+)"' diff --git a/channels/metalvideo.py b/channels/metalvideo.py index 441b4922..50c5817c 100644 --- a/channels/metalvideo.py +++ b/channels/metalvideo.py @@ -36,9 +36,10 @@ def mainlist(item): @support.scrape def peliculas(item): + # debug=True action = 'findvideos' - patron= r'<img src="[^"]+" alt="(?P<title>[^"]+)" data-echo="(?P<thumb>[^"]+)"[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+><a href="(?P<url>[^"]+)"' - patronNext = r'<a href="([^"]+)">»' + patron= r'<img src="[^"]+" alt="(?P<title>[^"]+)" data-echo="(?P<thumb>[^"]+)"(?:[^>]+>){7}<a href="(?P<url>[^"]+)"' + patronNext = r'<a href="([^"]+)">(?:»|ยป)' typeContentDict = {'': 'music'} return locals() diff --git a/channels/mondoserietv.py b/channels/mondoserietv.py index a3a9c194..f45baefa 100644 --- a/channels/mondoserietv.py +++ b/channels/mondoserietv.py @@ -82,7 +82,7 @@ def peliculas(item): # debug=True if item.args == 'last': patronBlock = r'<table>(?P<block>.*?)</table>' - patron = r'<tr><td><a href="(?P<url>[^"]+)">\s*[^>]+>(?P<title>.*?)(?:\s(?P<year>\d{4}))? (?:Streaming|</b>)' + patron = r'<tr><td><a href="(?P<url>[^"]+)">\s*[^>]+>(?P<title>.*?)(?:\s(?P<year>\d{4}))?\s*(?:Streaming|</b>)' elif item.args == 'lastep': patronBlock = r'<table>(?P<block>.*?)</table>' patron = r'<td>\s*<a href="[^>]+>(?P<title>.*?)(?:\s(?P<year>\d{4}))?\s(?:(?P<episode>(?:\d+x\d+|\d+)))\s*(?P<title2>[^<]+)(?P<url>.*?)<tr>' diff --git a/channels/seriehd.py b/channels/seriehd.py index 735c7da0..da329225 100644 --- a/channels/seriehd.py +++ b/channels/seriehd.py @@ -69,7 +69,7 @@ def peliculas(item): if item.args == 'last': action = 'findvideos' - patron = r'singleUpdate">(?:[^>]+>){2}\s*<img src="(?P<thumb>[^"]+)"(?:[^>]+>){3}\s*<h2>(?P<title>[^<]+)<(?:[^>]+>){16}\s*<a href="(?P<url>[^"]+)">(?:[^>]+>){3}\s*(?P<season>\d+)\D+(?P<episode>\d+)(?:[^\(]*\()?(?P<lang>[^\)]+)?(?:\))?' + patron = r'singleUpdate">(?:[^>]+>){2}\s*<img src="(?P<thumb>[^"]+)"(?:[^>]+>){3}\s*<h2>(?P<title>[^<]+)<(?:[^>]+>){14,16}\s*<a href="(?P<url>[^"]+)">(?:[^>]+>){3}\s*(?P<season>\d+)\D+(?P<episode>\d+)(?:[^\(]*\()?(?P<lang>[^\)]+)?(?:\))?' elif item.args == 'best': action='episodios' patron = r'col-md-3">\s*<a href="(?P<url>[^"]+)">[^>]+>\s*<div class="infoVetrina">[^>]+>(?P<year>\d{4})(?:[^>]+>){2}(?P<title>[^<]+)<(?:[^>]+>){4}(?P<rating>[^<]+)(?:[^>]+>){4}\s*<img src="(?P<thumb>[^"]+)"'