diff --git a/channels.json b/channels.json index da489eb8..3f64f88c 100644 --- a/channels.json +++ b/channels.json @@ -2,6 +2,7 @@ "direct": { "altadefinizione01": "https://www.altadefinizione01.plus", "altadefinizione01_link": "https://altadefinizione01.travel", + "altadefinizionecommunity": "https://altadefinizionecommunity.org", "animealtadefinizione": "https://www.animealtadefinizione.it", "animeforce": "https://www.animeforce.it", "animeleggendari": "https://animezeus.com", diff --git a/core/support.py b/core/support.py index a99c6c77..ee02a3b4 100755 --- a/core/support.py +++ b/core/support.py @@ -1166,6 +1166,7 @@ def nextPage(itemlist, item, data='', patron='', function_or_level=1, next_page= thumbnail=thumb())) return itemlist[-1] + def pagination(itemlist, item, page, perpage, function_level=1): if len(itemlist) >= page * perpage: itemlist.append( @@ -1385,7 +1386,7 @@ def get_jwplayer_mediaurl(data, srvName, onlyHttp=False, dataIsBlock=False): from core import jsontools video_urls = [] - block = scrapertools.find_single_match(data, r'sources:\s*([^\]]+\])') if not dataIsBlock else data + block = scrapertools.find_single_match(data, r'sources"?\s*:\s*(.*?}])') if not dataIsBlock else data if block: json = jsontools.load(block) if json: diff --git a/core/tmdb.py b/core/tmdb.py index ed320df1..bddacd2b 100644 --- a/core/tmdb.py +++ b/core/tmdb.py @@ -1055,7 +1055,10 @@ class Tmdb(object): # We sort result based on fuzzy match to detect most similar if len(results) > 1: from lib.fuzzy_match import algorithims - results.sort(key=lambda r: algorithims.trigram(text_simple, r.get('name', '') if self.search_type == 'tv' else r.get('title', '')), reverse=True) + 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) + else: + results.sort(key=lambda r: algorithims.trigram(text_simple, r.get('name', '') if self.search_type == 'tv' else r.get('title', '')), reverse=True) # We return the number of results of this page self.results = results @@ -1654,7 +1657,10 @@ class Tmdb(object): if v == "None": continue - if k == 'overview': + if k == 'media_type': + ret_infoLabels['mediatype'] = 'tvshow' if v == 'tv' else 'movie' + + elif k == 'overview': if origen: ret_infoLabels['plot'] = v else: diff --git a/servers/youdbox.py b/servers/youdbox.py index c60e6794..e8bd9a74 100644 --- a/servers/youdbox.py +++ b/servers/youdbox.py @@ -14,7 +14,7 @@ def test_video_exists(page_url): return True, "" -def get_video_url(page_url, video_password): +def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("(page_url='%s')" % page_url) global data video_urls = [] @@ -26,4 +26,4 @@ def get_video_url(page_url, video_password): url += decoded.decode("utf8") url = scrapertools.find_single_match(url, '