From ec133f7778ea7a816dfbdcb3aa09d3cae6551f8b Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Wed, 12 Aug 2020 18:34:40 +0200 Subject: [PATCH] - Fix Aggiunta alla libreria Mediaset Play - Icone canali Live --- channels/mediasetplay.py | 13 +++---------- channels/raiplay.py | 2 +- channelselector.py | 10 +++++++++- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/channels/mediasetplay.py b/channels/mediasetplay.py index 42c956c6..6d1d7cb3 100644 --- a/channels/mediasetplay.py +++ b/channels/mediasetplay.py @@ -96,7 +96,7 @@ def live(item): urls=urls, plot=plot, action='play')) - return itemlist + return support.thumb(itemlist, live=True) def peliculas(item): support.log() @@ -152,7 +152,7 @@ def epmenu(item): itemlist.append( item.clone(action='episodios', title=support.typo(entry['description'], 'bold'), - subBrandId=entry['mediasetprogram$subBrandId'])) + url=entry['mediasetprogram$subBrandId'])) if len(itemlist) == 1: return episodios(itemlist[0]) return itemlist @@ -162,15 +162,8 @@ def episodios(item): support.log() itemlist = [] episode = '' - # entries = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-brands?byCustomValue={brandId}{' + item.urls + '}').json()['entries'] - # for entry in entries: - # support.log(entry) - # if 'mediasetprogram$subBrandId' in entry and entry['description'].lower() not in ['Prossimi appuntamenti tv', 'clip']: - # subBrandId = entry['mediasetprogram$subBrandId'] - # break - - json = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-programs?byCustomValue={subBrandId}{' + item.subBrandId + '}').json()['entries'] + json = current_session.get('https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-programs?byCustomValue={subBrandId}{' + item.url + '}').json()['entries'] for it in json: urls = [] if 'media' in it: diff --git a/channels/raiplay.py b/channels/raiplay.py index 1688be83..3bef9aab 100644 --- a/channels/raiplay.py +++ b/channels/raiplay.py @@ -170,7 +170,7 @@ def live(item): itemlist.append(item.clone(title = support.typo(channel, 'bold'), fulltitle = channel, show = channel, url = key['video']['contentUrl'], thumbnail = key['transparent-icon'].replace("[RESOLUTION]", "256x-"), forcethumb = True , fanart = info[channel]['fanart'], plot = info[channel]['plot'], action = 'play')) - return itemlist + return support.thumb(itemlist, live=True) def peliculas(item): diff --git a/channelselector.py b/channelselector.py index 94f054a9..4bcc9aae 100644 --- a/channelselector.py +++ b/channelselector.py @@ -277,7 +277,15 @@ def auto_filter(auto_lang=False): return lang -def thumb(item_or_itemlist=None, genre=False, thumb=''): +def thumb(item_or_itemlist=None, genre=False, live=False, thumb=''): + if live: + if type(item_or_itemlist) == list: + for item in item_or_itemlist: + item.thumbnail = "https://raw.githubusercontent.com/kodiondemand/media/master/live/" + item.fulltitle.lower().replace(' ','_') + '.png' + else: + item_or_itemlist.thumbnail = "https://raw.githubusercontent.com/kodiondemand/media/master/live/" + item.fulltitle.lower().replace(' ','_') + '.png' + return item_or_itemlist + import re icon_dict = {'movie':['film', 'movie'], 'tvshow':['serie','tv','episodi','episodio','fiction', 'show'],