From 59e79739e551b976b8072c5d926894266a1d3376 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Fri, 26 Nov 2021 17:29:33 +0100 Subject: [PATCH] FIx Live e icone canali mancanti MediasetPlay --- channels/mediasetplay.py | 19 +++++++++++++------ core/support.py | 11 +++++++---- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/channels/mediasetplay.py b/channels/mediasetplay.py index 68a9d735..9f6aecbe 100644 --- a/channels/mediasetplay.py +++ b/channels/mediasetplay.py @@ -78,19 +78,26 @@ def live(item): stations = res['stations'] for it in stations.values(): + logger.debug(jsontools.dump(it)) plot = '' title = it['title'] url = 'https:' + it['mediasetstation$pageUrl'] - if 'plus' in title.lower() or 'premium' in title.lower(): continue + if 'SVOD' in it['mediasetstation$channelsRights']: continue + thumb = it.get('thumbnails',{}).get('channel_logo-100x100',{}).get('url','') if it['callSign'] in allguide: guide = allguide[it['callSign']] - plot = '[B]{}[/B]\n{}'.format(guide.get('currentListing', {}).get('mediasetlisting$epgTitle', ''), - guide.get('currentListing', {}).get('description', '')) + plot = '[B]{}[/B]\n{}'.format(guide.get('currentListing', {}).get('mediasetlisting$epgTitle', ''),guide.get('currentListing', {}).get('description', '')) if 'nextListing' in guide.keys(): - plot += '\n\nA Seguire:\n[B]{}[/B]\n{}'.format(guide.get('nextListing', {}).get('mediasetlisting$epgTitle', ''), - guide.get('nextListing', {}).get('description', '')) - itemlist.append(item.clone(title=support.typo(title, 'bold'), fulltitle=title, callSign=it['callSign'], urls=guide['tuningInstruction']['urn:theplatform:tv:location:any'], plot=plot, url=url, action='play', forcethumb=True)) + plot += '\n\nA Seguire:\n[B]{}[/B]\n{}'.format(guide.get('nextListing', {}).get('mediasetlisting$epgTitle', ''),guide.get('nextListing', {}).get('description', '')) + itemlist.append(item.clone(title=support.typo(title, 'bold'), + fulltitle=title, callSign=it['callSign'], + urls=guide['tuningInstruction']['urn:theplatform:tv:location:any'], + plot=plot, + url=url, + action='play', + thumbnail=thumb, + forcethumb=True)) itemlist.sort(key=lambda it: support.channels_order.get(it.fulltitle, 999)) support.thumb(itemlist, live=True) diff --git a/core/support.py b/core/support.py index a4b95892..244c385d 100755 --- a/core/support.py +++ b/core/support.py @@ -17,7 +17,7 @@ else: from urllib import urlencode from time import time -from core import httptools, scrapertools, servertools, tmdb, channeltools, autoplay, scraper +from core import filetools, httptools, scrapertools, servertools, tmdb, channeltools, autoplay, scraper from core.item import Item from lib import unshortenit from platformcode import config @@ -1482,11 +1482,14 @@ def thumb(item_itemlist_string=None, genre=False, live=False): from channelselector import get_thumb if live: + def liveThumb(item): + thumb = 'https://raw.githubusercontent.com/kodiondemand/media/master/live/{}.png'.format(item.fulltitle.lower().replace(' ','_')) + if filetools.exists(thumb): + item.thumbnail = thumb if type(item_itemlist_string) == list: - for item in item_itemlist_string: - item.thumbnail = "https://raw.githubusercontent.com/kodiondemand/media/master/live/" + item.fulltitle.lower().replace(' ','_') + '.png' + with futures.ThreadPoolExecutor() as executor: [executor.submit(liveThumb, it) for it in item_itemlist_string] else: - item_itemlist_string.thumbnail = "https://raw.githubusercontent.com/kodiondemand/media/master/live/" + item_itemlist_string.fulltitle.lower().replace(' ','_') + '.png' + item_itemlist_string.thumbnail = liveThumb(item_itemlist_string) return item_itemlist_string icon_dict = {'movie':['film', 'movie'],