From 438b2a5da6325e40f136ff2850041a771fd01617 Mon Sep 17 00:00:00 2001 From: mac12m99 <10120390+mac12m99@users.noreply.github.com> Date: Thu, 4 Nov 2021 10:51:20 +0100 Subject: [PATCH] Fix paramount serie tv --- channels/ilcorsaronero.py | 5 +++++ channels/paramount.py | 6 +++--- tests/test_generic.py | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/channels/ilcorsaronero.py b/channels/ilcorsaronero.py index 7cbd9c60..406037b2 100644 --- a/channels/ilcorsaronero.py +++ b/channels/ilcorsaronero.py @@ -53,6 +53,11 @@ def peliculas(item): patron = r'>(?P[^"<]+)' patron += ']+>[^<]+<[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P[^<]+)<[^>]+>[^>]+>[^>]+>
[^"]+)[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P[^<]+)' + if not sceneTitle: + def itemHook(item): + item.title = item.title.replace('_', ' ') + return item + if 'search' not in item.args: item.url += str(item.args[0]) def itemlistHook(itemlist): diff --git a/channels/paramount.py b/channels/paramount.py index 2c22cbd7..1049a1d0 100644 --- a/channels/paramount.py +++ b/channels/paramount.py @@ -107,6 +107,7 @@ def peliculas(item): def episodios(item): logger.debug() + reEp = r'"isEpisodes":[^,]+,"items":(.*?])' def load_more(url): second_url = host if url.startswith('/') else '' + url.replace('\u002F','/').replace('%5C','/') new_data = support.match(host + second_url).data @@ -114,11 +115,10 @@ def episodios(item): return jsontools.load(match) itemlist = [] - data = [] page_data = support.match(item.url).data seasons = support.match(page_data, patron=r'href="([^"]+)"[^>]+>Stagione\s*\d+').matches more = support.match(page_data, patron=r'loadingTitle":[^,]+,"url":"([^"]+)"').match - data = jsontools.load(support.scrapertools.decodeHtmlentities(support.match(page_data, patron=r'"isEpisodes":[^,]+,"items":(.*?),"isKidsUI"').match)) + data = jsontools.load(support.scrapertools.decodeHtmlentities(support.match(page_data, patron=reEp).match)) if data: if more: @@ -126,7 +126,7 @@ def episodios(item): if seasons: for url in seasons: new_data = support.match(host + url).data - data += jsontools.load(support.scrapertools.decodeHtmlentities(support.match(new_data, patron=r'isEpisodes":[^,]+,"items":(.*?),"isKidsUI"').match.replace('\x01','l').replace('\x02','a'))) + data += jsontools.load(support.scrapertools.decodeHtmlentities(support.match(new_data, patron=reEp).match.replace('\x01','l').replace('\x02','a'))) match = support.match(new_data, patron=r'loadingTitle":[^,]+,"url":"([^"]+)"').match if match and match != load_more: data += load_more(match) diff --git a/tests/test_generic.py b/tests/test_generic.py index 6d9691c1..74b7fd8b 100644 --- a/tests/test_generic.py +++ b/tests/test_generic.py @@ -64,7 +64,7 @@ validUrlRegex = re.compile( r'(?::\d+)?' # optional port r'(?:/?|[/?]\S+)$', re.IGNORECASE) -chBlackList = ['url', 'mediasetplay', 'metalvideo'] +chBlackList = ['url', 'mediasetplay', 'metalvideo', 'altadefinizionecommunity'] srvBlacklist = ['mega', 'hdmario', 'torrent', 'youtube'] chNumRis = { 'altadefinizione01': {