From 59c1e66b28500ee2a0dcd02eab4e277c8c6f59a4 Mon Sep 17 00:00:00 2001 From: marco <10120390+mac12m99@users.noreply.github.com> Date: Wed, 6 Jan 2021 20:47:42 +0100 Subject: [PATCH] disattivato fastsubita (pare chiuso), fix animesaturn e piccola miglioria cb01 --- channels/animesaturn.py | 2 +- channels/cineblog01.py | 10 ++++------ channels/fastsubita.json | 2 +- core/support.py | 5 ++++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/channels/animesaturn.py b/channels/animesaturn.py index 5bc569c0..e303929f 100644 --- a/channels/animesaturn.py +++ b/channels/animesaturn.py @@ -95,7 +95,7 @@ def peliculas(item): deflang= 'Sub-ITA' action = 'check' page = None - post = "page=" + str(item.page if item.page else 1) if item.page > 1 else None + post = "page=" + str(item.page if item.page else 1) if item.page and item.page > 1 else None if item.args == 'top': data = item.other diff --git a/channels/cineblog01.py b/channels/cineblog01.py index 3137da60..80330ced 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -5,9 +5,7 @@ import re -from core import scrapertools, httptools, servertools, tmdb, support -from core.item import Item -from lib import unshortenit +from core import scrapertools, httptools, servertools, support from platformcode import logger, config @@ -90,14 +88,14 @@ def search(item, text): logger.error("%s" % line) return [] - @support.scrape def peliculas(item): # esclusione degli articoli 'di servizio' blacklist = ['BENVENUTI', 'Richieste Serie TV', 'CB01.UNO ▶ TROVA L’INDIRIZZO UFFICIALE ', 'Aggiornamento Quotidiano Serie TV', 'OSCAR 2019 ▶ CB01.UNO: Vota il tuo film preferito! 🎬', 'Openload: la situazione. Benvenuto Verystream', 'Openload: lo volete ancora?', - 'OSCAR 2020 ▶ VOTA IL TUO FILM PREFERITO! 🎬'] + 'OSCAR 2020 ▶ VOTA IL TUO FILM PREFERITO! 🎬', + 'Auguri di Buon Natale e Felice Anno Nuovo! – 2021!'] # debug= True if 'newest' in item.args: if '/serietv/' not in item.url: @@ -112,7 +110,7 @@ def peliculas(item): action = 'episodios' elif '/serietv/' not in item.url: - patron = r'
\s*]+>\s*]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>]+)(?:\/|"|\s+)>(?P[^<[(]+)(?:\[(?P<quality>[A-Za-z0-9/-]+)])? (?:\((?P<year>[0-9]{4})\))?[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<genre>[^<>&–]+)(?:[^ ]+\s*DURATA\s*(?P<duration>[0-9]+)[^>]+>[^>]+>[^>]+>(?P<plot>[^<>]+))?' + patron = r'<div class="card-image">\s*<a[^>]+>\s*<img src="(?P<thumb>[^" ]+)" alt[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+><a href="?(?P<url>[^" >]+)(?:\/|"|\s+)>(?P<title>[^<[(]+)(?:\[(?P<quality>[A-Za-z0-9/-]+)])? (?:\((?P<year>[0-9]{4})\))?[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<genre>[^<>&‖“]+)(?:[^ ]+\s*DURATA\s*(?P<duration>[0-9]+)[^>]+>[^>]+>[^>]+>(?P<plot>[^<>]+))?' action = 'findvideos' else: diff --git a/channels/fastsubita.json b/channels/fastsubita.json index eabe5c4b..bcca9544 100644 --- a/channels/fastsubita.json +++ b/channels/fastsubita.json @@ -2,7 +2,7 @@ "id": "fastsubita", "name": "Fastsubita", "language": ["sub-ita"], - "active": true, + "active": false, "thumbnail": "fastsubita.png", "banner": "fastsubita.png", "categories": ["tvshow", "vos"], diff --git a/core/support.py b/core/support.py index 629ea788..f4e45373 100755 --- a/core/support.py +++ b/core/support.py @@ -283,7 +283,10 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t scraped['duration'] = int(h) * 60 + int(m) if not matches: scraped['duration'] = scrapertools.find_single_match(scraped['duration'], r'(\d+)') - infolabels['duration'] = int(scraped['duration']) * 60 + try: + infolabels['duration'] = int(scraped['duration']) * 60 + except: + scraped['duration'] = '' if scraped['genere']: genres = scrapertools.find_multiple_matches(scraped['genere'], '[A-Za-z]+') infolabels['genere'] = ", ".join(genres)