From fb80f47bc8993969dacc7236d0c78ac76e8b15a1 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Tue, 23 Aug 2022 18:08:37 +0200 Subject: [PATCH] Fix Tmdb In caso non si conosca il mediatype e sia presente l'anno --- channels/altadefinizione.py | 2 +- core/tmdb.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/channels/altadefinizione.py b/channels/altadefinizione.py index 938e18d5..cc20d38a 100644 --- a/channels/altadefinizione.py +++ b/channels/altadefinizione.py @@ -70,7 +70,7 @@ def peliculas(item): action = 'check' patron = r'src="(?Phttp[^"]+)(?:[^>]+>){4}\s*]+>\s*(?P[^\[\(\<]+)(?:\[(?P<quality>[^\]]+)\])?\s*(?:\((?P<lang>[a-zA-z-]+)\))?\s*(?:\((?P<year>\d+)\))?\s*</a>\s*</h2>' if item.args == 'search': - patron = '<title>(?P<title>[^\[\(\<]+)(?:\[(?P<quality>[^\]]+)\])?\s*(?:\((?P<lang>[a-zA-z-]+)\))?[^>]+>\s*<link>(?P<url>[^<]+)' + patron = r'<title>(?P<title>[^\[\(\<]+)(?:\[(?P<quality>[^\]]+)\])?\s*(?:\((?P<lang>[a-zA-z-]+)\))?\s*(?:\((?P<year>\d+)\))?\s*[^>]+>\s*<link>(?P<url>[^<]+)' patronNext = r'href="([^"]+)[^>]+>Successivo' return locals() diff --git a/core/tmdb.py b/core/tmdb.py index c2418df0..5a6880fb 100644 --- a/core/tmdb.py +++ b/core/tmdb.py @@ -1033,7 +1033,13 @@ class Tmdb(object): if len(results) > 1: from lib.fuzzy_match import algorithims if self.search_type == 'multi': - results.sort(key=lambda r: algorithims.trigram(text_simple, r.get('name', '') if r.get('media_type') == 'tv' else r.get('title', '')), reverse=True) + if self.search_year: + for r in results: + if (r.get('release_date', '') and r.get('release_date', '')[:4] == self.search_year) or (r.get('first_air_date', '') and r.get('first_air_date', '')[:4] == self.search_year): + results = [r] + break + if len(results) > 1: + results.sort(key=lambda r: algorithims.trigram(text_simple, r.get('name', '') if r.get('media_type') == 'tv' else r.get('title', '')), reverse=True) else: results.sort(key=lambda r: algorithims.trigram(text_simple, r.get('name', '') if self.search_type == 'tv' else r.get('title', '')), reverse=True)