FIx Live e icone canali mancanti MediasetPlay

This commit is contained in:
Alhaziel01
2021-11-26 17:29:33 +01:00
parent 1abb62ee01
commit 59e79739e5
2 changed files with 20 additions and 10 deletions
+13 -6
View File
@@ -78,19 +78,26 @@ def live(item):
stations = res['stations'] stations = res['stations']
for it in stations.values(): for it in stations.values():
logger.debug(jsontools.dump(it))
plot = '' plot = ''
title = it['title'] title = it['title']
url = 'https:' + it['mediasetstation$pageUrl'] 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: if it['callSign'] in allguide:
guide = allguide[it['callSign']] guide = allguide[it['callSign']]
plot = '[B]{}[/B]\n{}'.format(guide.get('currentListing', {}).get('mediasetlisting$epgTitle', ''), plot = '[B]{}[/B]\n{}'.format(guide.get('currentListing', {}).get('mediasetlisting$epgTitle', ''),guide.get('currentListing', {}).get('description', ''))
guide.get('currentListing', {}).get('description', ''))
if 'nextListing' in guide.keys(): if 'nextListing' in guide.keys():
plot += '\n\nA Seguire:\n[B]{}[/B]\n{}'.format(guide.get('nextListing', {}).get('mediasetlisting$epgTitle', ''), plot += '\n\nA Seguire:\n[B]{}[/B]\n{}'.format(guide.get('nextListing', {}).get('mediasetlisting$epgTitle', ''),guide.get('nextListing', {}).get('description', ''))
guide.get('nextListing', {}).get('description', '')) itemlist.append(item.clone(title=support.typo(title, 'bold'),
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)) 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)) itemlist.sort(key=lambda it: support.channels_order.get(it.fulltitle, 999))
support.thumb(itemlist, live=True) support.thumb(itemlist, live=True)
+7 -4
View File
@@ -17,7 +17,7 @@ else:
from urllib import urlencode from urllib import urlencode
from time import time 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 core.item import Item
from lib import unshortenit from lib import unshortenit
from platformcode import config from platformcode import config
@@ -1482,11 +1482,14 @@ def thumb(item_itemlist_string=None, genre=False, live=False):
from channelselector import get_thumb from channelselector import get_thumb
if live: 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: if type(item_itemlist_string) == list:
for item in item_itemlist_string: with futures.ThreadPoolExecutor() as executor: [executor.submit(liveThumb, it) for it in item_itemlist_string]
item.thumbnail = "https://raw.githubusercontent.com/kodiondemand/media/master/live/" + item.fulltitle.lower().replace(' ','_') + '.png'
else: 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 return item_itemlist_string
icon_dict = {'movie':['film', 'movie'], icon_dict = {'movie':['film', 'movie'],