diff --git a/channels/mediasetplay.py b/channels/mediasetplay.py index 4cb3abef..dfee290c 100644 --- a/channels/mediasetplay.py +++ b/channels/mediasetplay.py @@ -29,7 +29,7 @@ entries = 'https://api.one.accedo.tv/content/entries?id={id}&locale=it' @support.menu def mainlist(item): - top = [('Dirette {bold}', ['https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-stations?sort=ShortTitle', 'dirette'])] + top = [('Dirette {bold}', ['https://feed.entertainment.tv.theplatform.eu/f/PR1GhC/mediaset-prod-all-stations?sort=ShortTitle', 'live'])] menu = [('Film {bullet bold}', ['5acfcbc423eec6000d64a6bb', 'menu', ['Tutti','all','Cinema']]), ('Fiction / Serie TV {bullet bold}', ['5acfcb3c23eec6000d64a6a4', 'menu', ['Tutte','all','Fiction'], 'tvshow']), @@ -68,7 +68,7 @@ def menu(item): itemlist.append(item.clone(title=support.typo('Cerca...','submenu bold'), url='', action ='search')) return itemlist -def dirette(item): +def live(item): support.log() itemlist = [] json = current_session.get(item.url).json()['entries'] diff --git a/channels/raiplay.py b/channels/raiplay.py index 3abde2aa..83b92a87 100644 --- a/channels/raiplay.py +++ b/channels/raiplay.py @@ -17,7 +17,7 @@ onair = host + '/palinsesto/onAir.json' @support.menu def mainlist(item): - top = [('Dirette {bold}', ['/dl/RaiPlay/2016/PublishingBlock-9a2ff311-fcf0-4539-8f8f-c4fee2a71d58.html?json', 'dirette']), + top = [('Dirette {bold}', ['/dl/RaiPlay/2016/PublishingBlock-9a2ff311-fcf0-4539-8f8f-c4fee2a71d58.html?json', 'live']), ('Replay {bold}', ['/dl/RaiPlay/2016/PublishingBlock-9a2ff311-fcf0-4539-8f8f-c4fee2a71d58.html?json', 'replay_menu'])] menu = [('Film {bullet bold}', ['/film/index.json', 'menu']), @@ -152,7 +152,7 @@ def Type(item): return select(item) -def dirette(item): +def live(item): support.log() itemlist =[] json = current_session.get(item.url).json()['dirette'] diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index abdd9fdc..d02cba3c 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -248,7 +248,7 @@ def getCurrentView(item=None, parent_item=None): elif (item.contentType in ['movie'] and parent_item.action in parent_actions) \ or (item.channel in ['videolibrary'] and parent_item.action in ['list_movies']) \ or (parent_item.channel in ['favorites'] and parent_item.action in ['mainlist']) \ - or parent_item.action in ['now_on_tv', 'now_on_misc', 'now_on_misc_film', 'mostrar_perfil', 'dirette']: + or parent_item.action in ['now_on_tv', 'now_on_misc', 'now_on_misc_film', 'mostrar_perfil', 'live']: return 'movie', 'movies' elif (item.contentType in ['tvshow'] and parent_item.action in parent_actions) \ diff --git a/specials/filmontv.py b/specials/filmontv.py index 5a678457..e347ffc8 100644 --- a/specials/filmontv.py +++ b/specials/filmontv.py @@ -310,6 +310,6 @@ def new_search(item): def live(item): itemlist = [] from channels import raiplay, mediasetplay - itemlist += raiplay.dirette(raiplay.mainlist(Item())[0]) - itemlist += mediasetplay.dirette(mediasetplay.mainlist(Item())[0]) + itemlist += raiplay.live(raiplay.mainlist(Item())[0]) + itemlist += mediasetplay.live(mediasetplay.mainlist(Item())[0]) return itemlist