From 2251d3030e96c32bdd2efdd15f4706be01bd3491 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Wed, 17 Mar 2021 12:18:57 +0100 Subject: [PATCH] - Fix Piratestreaming - Normalizzazione numerazione episodi --- channels/piratestreaming.py | 2 +- core/support.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/channels/piratestreaming.py b/channels/piratestreaming.py index a4a95a5e..dba3d996 100644 --- a/channels/piratestreaming.py +++ b/channels/piratestreaming.py @@ -78,7 +78,7 @@ def episodios(item): if item.data: data = item.data # debug= True title = item.fulltitle - patron = r'link-episode">(?:\s*)?\s*(?P\d+.\d+(?:.\d+)?)(?:\s*\((?P[?PA-Za-z-]+)[^>]+>)?(?:\s*(?P.*?) )[^>]+<\/span>\s*(?P<url>.*?)</div>' + patron = r'link-episode">(?:\s*<strong>)?\s*(?P<episode>\d+.\d+(?:.\d+)?)(?:\s*\((?P<lang>[?P<lang>A-Za-z-]+)[^>]+>)?(?:\s*(?P<title>[^-<]+))[^>]+</span>\s*(?P<url>.*?)</div>' def itemHook(item): if 'Episodio' in item.title: item.title = support.re.sub(r'Episodio [0-9.-]+', title, item.title) diff --git a/core/support.py b/core/support.py index b243e539..a806e112 100755 --- a/core/support.py +++ b/core/support.py @@ -261,6 +261,7 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t infolabels['rating'] = scrapertools.decodeHtmlentities(scraped["rating"]) episode = '' + if not group or item.grouped: if scraped['season'] and scraped['episode']: stagione = scraped['season'] @@ -277,7 +278,7 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t elif item.season: infolabels['season'] = int(item.season) infolabels['episode'] = int(scrapertools.find_single_match(scraped['episode'], r'(\d+)')) - episode = item.season +'x'+ scraped['episode'] + episode = item.season +'x'+ scraped['episode'].zfill(2) elif item.contentType == 'tvshow' and (scraped['episode'] == '' and scraped['season'] == '' and stagione == ''): item.news = 'season_completed' episode = ''