From 61fa12e7a671a03a3c2402326e26550403e98337 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Sat, 13 Mar 2021 12:48:43 +0100 Subject: [PATCH 1/6] Fix Videoteca in caso di cambio dominio --- specials/videolibrary.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specials/videolibrary.py b/specials/videolibrary.py index 7798e962..74e0a53a 100644 --- a/specials/videolibrary.py +++ b/specials/videolibrary.py @@ -476,6 +476,9 @@ def findvideos(item): item_json = Item().fromjson(filetools.read(json_path)) list_servers = [] + try: from urllib.parse import urlsplit + except ImportError: from urlparse import urlsplit + item_json.url = channel.host + urlsplit(item_json.url).path try: # FILTERTOOLS From f4cc9fec0580dc66c148af2205b2beabdf91e9f2 Mon Sep 17 00:00:00 2001 From: mac12m99 <10120390+mac12m99@users.noreply.github.com> Date: Sat, 13 Mar 2021 15:15:35 +0100 Subject: [PATCH 2/6] ops --- channels/mediasetplay.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/channels/mediasetplay.py b/channels/mediasetplay.py index 28312256..d55a302b 100644 --- a/channels/mediasetplay.py +++ b/channels/mediasetplay.py @@ -97,7 +97,7 @@ def mainlist(item): def search(item, text): itemlist = [] - support.debug(text) + logger.debug(text) item.search = text try: @@ -111,7 +111,7 @@ def search(item, text): def menu(item): - support.debug() + logger.debug() itemlist = [] # itemlist = [item.clone(title=support.typo(item.args[0], 'bullet bold'), url='', action='peliculas')] if item.url: @@ -141,7 +141,7 @@ def liveDict(): return livedict def live(item): - support.debug() + logger.debug() itemlist = [] for key, value in liveDict().items(): itemlist.append(item.clone(title=support.typo(key, 'bold'), @@ -157,7 +157,7 @@ def live(item): def peliculas(item): - support.debug() + logger.debug() itemlist = [] titlelist = [] contentType = '' @@ -219,7 +219,7 @@ def peliculas(item): def epmenu(item): - support.debug() + logger.debug() itemlist = [] if item.seriesid: seasons = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-tv-seasons?bySeriesId=' + item.seriesid).json()['entries'] @@ -246,7 +246,7 @@ def epmenu(item): def episodios(item): - support.debug() + logger.debug() itemlist = [] json = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-programs?byCustomValue={subBrandId}{' + item.url + '}').json()['entries'] @@ -283,13 +283,13 @@ def episodios(item): def findvideos(item): - support.debug() + logger.debug() itemlist = [support.Item(server='directo', title='Mediaset Play', url=item.urls, action='play')] return support.server(item, itemlist=itemlist, Download=False) def play(item): - support.debug() + logger.debug() if item.livefilter: d = liveDict()[item.livefilter] item = item.clone(title=support.typo(item.livefilter, 'bold'), fulltitle=item.livefilter, urls=d['urls'], plot=d['plot'], action='play', forcethumb=True, no_return=True) @@ -314,14 +314,14 @@ def play(item): def subBrand(json): - support.debug() + logger.debug() subBrandId = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-brands?byCustomValue={brandId}{' + json + '}').json()['entries'][-1]['mediasetprogram$subBrandId'] json = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-programs?byCustomValue={subBrandId}{' + subBrandId + '}').json()['entries'] return json def get_from_id(item): - support.debug() + logger.debug() json = current_session.get(entry.format(id=item.url)).json() if 'components' in json: id = quote(",".join(json["components"])) @@ -333,7 +333,7 @@ def get_from_id(item): def get_programs(item, ret=[], args={}): hasMore = False - support.debug('DICT=',item.url) + logger.debug('DICT=',item.url) url = '' if 'search' in item.args: From 1c6749c809e5fecc9ad28197a0efcf5d4efedcd8 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Sat, 13 Mar 2021 15:25:27 +0100 Subject: [PATCH 3/6] Fix Community Channels --- specials/community.py | 2 +- specials/videolibrary.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/specials/community.py b/specials/community.py index ef078d03..a234fe2d 100644 --- a/specials/community.py +++ b/specials/community.py @@ -298,7 +298,7 @@ def episodios(item, json ='', key='', itemlist =[]): if 'episodes_list' in json: json = json['episodes_list'] elif 'seasons_list' in json: - item.url = json['episodes_list'] + item.url = json['seasons_list'] return get_seasons(item) elif 'tvshows_list' in json: return peliculas(item, json, 'tvshows_list') diff --git a/specials/videolibrary.py b/specials/videolibrary.py index 74e0a53a..9da6e60f 100644 --- a/specials/videolibrary.py +++ b/specials/videolibrary.py @@ -476,9 +476,11 @@ def findvideos(item): item_json = Item().fromjson(filetools.read(json_path)) list_servers = [] + try: from urllib.parse import urlsplit except ImportError: from urlparse import urlsplit - item_json.url = channel.host + urlsplit(item_json.url).path + try: item_json.url = channel.host + urlsplit(item_json.url).path + except: pass try: # FILTERTOOLS From f005e80ccef225c25268fe104cc7bb2b9f2fea30 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 13 Mar 2021 17:57:32 +0000 Subject: [PATCH 4/6] {Aggiornamento domini} --- channels.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels.json b/channels.json index 99c1f37b..9c81a883 100644 --- a/channels.json +++ b/channels.json @@ -26,8 +26,8 @@ "filmstreaming01": "https://filmstreaming01.com", "guardaserie_stream": "https://guardaserie.yoga", "guardaseriecam": "https://guardaserie.cam", - "guardaserieclick": "https://www.guardaserie.kim", - "guardaserieicu": "https://guardaserie.trade", + "guardaserieclick": "https://www.guardaserie.plus", + "guardaserieicu": "https://guardaserie.cloud", "hd4me": "https://hd4me.net", "ilcorsaronero": "https://ilcorsaronero.link", "ilgeniodellostreaming": "https://ilgeniodellostreaming.soy", From 8c7b504627303c2a60e0492f596e7414405e6ac7 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Sat, 13 Mar 2021 19:47:04 +0100 Subject: [PATCH 5/6] Fix Videoteca Serie TV --- specials/videolibrary.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/specials/videolibrary.py b/specials/videolibrary.py index 9da6e60f..7f10bebe 100644 --- a/specials/videolibrary.py +++ b/specials/videolibrary.py @@ -2,6 +2,7 @@ #from builtins import str import sys +from core import support PY3 = False if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int @@ -476,10 +477,12 @@ def findvideos(item): item_json = Item().fromjson(filetools.read(json_path)) list_servers = [] - + # support.dbg() try: from urllib.parse import urlsplit except ImportError: from urlparse import urlsplit - try: item_json.url = channel.host + urlsplit(item_json.url).path + try: + if urlsplit(item_json.url).netloc.split('.')[0] in channel.host: + item_json.url = channel.host + urlsplit(item_json.url).path except: pass try: From 1392989a57ff63a260536ebc9f9034dc70fc925b Mon Sep 17 00:00:00 2001 From: mac12m99 <10120390+mac12m99@users.noreply.github.com> Date: Mon, 15 Mar 2021 18:16:50 +0100 Subject: [PATCH 6/6] fix mediasetplay: mostrati tutti gli episodi (prima max 100) --- channels/mediasetplay.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/mediasetplay.py b/channels/mediasetplay.py index d55a302b..67d210c1 100644 --- a/channels/mediasetplay.py +++ b/channels/mediasetplay.py @@ -248,9 +248,9 @@ def epmenu(item): def episodios(item): logger.debug() itemlist = [] - json = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-programs?byCustomValue={subBrandId}{' + item.url + '}').json()['entries'] + json = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-programs?byCustomValue={subBrandId}{' + + item.url + '}&range=0-10000').json()['entries'] - for it in json: urls = [] if 'media' in it: