From 3a251b22471cdc7ae12c52de075c69c84055801c Mon Sep 17 00:00:00 2001 From: marco <10120390+mac12m99@users.noreply.github.com> Date: Tue, 14 Dec 2021 20:35:55 +0100 Subject: [PATCH] Miglioria commit precedente --- channels/cinemalibero.py | 6 +++--- core/scrapertools.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py index ac5c625b..86a7dfeb 100644 --- a/channels/cinemalibero.py +++ b/channels/cinemalibero.py @@ -128,9 +128,9 @@ def episodios(item): servers = support.server(item, it.stagione, AutoPlay=False, CheckLinks=False, Download=False, Videolibrary=False) episodes = {} - for s in servers: - # ottengo l'episodio dal nome del file - with futures.ThreadPoolExecutor() as executor: + # ottengo l'episodio dal nome del file + with futures.ThreadPoolExecutor() as executor: + for s in servers: executor.submit(get_ep, s) ret.extend([it.clone(title=ep, contentSeason=int(ep.split('x')[0]), contentEpisodeNumber=int(ep.split('x')[1]), servers=[srv.tourl() for srv in episodes[ep]]) for ep in episodes]) else: diff --git a/core/scrapertools.py b/core/scrapertools.py index 8e7f9264..3739c7d1 100644 --- a/core/scrapertools.py +++ b/core/scrapertools.py @@ -438,7 +438,7 @@ def get_season_and_episode(title): @return: Nseason and episode number in "1x01" format or empty string if not found """ filename = "" - patrons = ["[ .](\d+)\s*[x-]\s*(\d+)[ .]", "(\d+)\s*×\s*(\d+)", "(?:s|t)(\d+)[ .]?(?:e|Ep\.?)(\d+)", + patrons = ["(?:[ .]|^)(\d+)\s*[x-]\s*(\d+)(?:[ .]|$)", "(\d+)\s*×\s*(\d+)", "(?:s|t)(\d+)[ .]?(?:e|Ep\.?)(\d+)", "(?:(?:stag|season|stagione\w*)\s*(\d+))?\s*(?:ep|epi|epis|episod[ioe]?|puntata)[ .-]*(\d+)"] for patron in patrons: