From 28afbaa836310fa1f8b3b8724c95d406dec1ceac Mon Sep 17 00:00:00 2001 From: mac12m99 Date: Mon, 3 Jun 2019 18:34:45 +0200 Subject: [PATCH 1/3] fix crash if channel menu not visited --- core/support.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/support.py b/core/support.py index eaec9e51..b0ce3810 100644 --- a/core/support.py +++ b/core/support.py @@ -575,6 +575,12 @@ def controls(itemlist, item, AutoPlay=True, CheckLinks=True): CL = get_setting('checklinks') or get_setting('checklinks', item.channel) autoplay_node = jsontools.get_node_from_file('autoplay', 'AUTOPLAY') channel_node = autoplay_node.get(item.channel, {}) + if not channel_node: # non ha mai aperto il menu del canale quindi in autoplay_data.json non c'e la key + channelFile = __import__('channels.' + item.channel, fromlist=["channels.%s" % item.channel]) + autoplay.init(item.channel, channelFile.list_servers, channelFile.list_quality) + + autoplay_node = jsontools.get_node_from_file('autoplay', 'AUTOPLAY') + channel_node = autoplay_node.get(item.channel, {}) settings_node = channel_node.get('settings', {}) AP = get_setting('autoplay') or settings_node['active'] From 9b0dc67001e9be318528584d876d6fed12063ee1 Mon Sep 17 00:00:00 2001 From: Alhaziel <46535975+lozioangie@users.noreply.github.com> Date: Mon, 3 Jun 2019 23:34:13 +0200 Subject: [PATCH 2/3] Fix Animeworld EPisode > 50 --- channels/animeworld.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/channels/animeworld.py b/channels/animeworld.py index 94b10340..8272fbe3 100644 --- a/channels/animeworld.py +++ b/channels/animeworld.py @@ -258,7 +258,7 @@ def episodios(item): log() itemlist = [] - data = httptools.downloadpage(item.url).data.replace('\n', '') + data = httptools.downloadpage(item.url, headers=headers).data.replace('\n', '') block1 = scrapertoolsV2.find_single_match(data, r'
(.*?)
') @@ -301,18 +301,17 @@ def findvideos(item): data = item.extra['data'] episode = item.extra['episode'] else: - data = httptools.downloadpage(item.url,headers=headers).data - + data = httptools.downloadpage(item.url, headers=headers).data block = scrapertoolsV2.find_single_match(data,r'data-target="\.widget\.servers.*?>(.*?)
') servers = scrapertoolsV2.find_multiple_matches(block,r'class="tab.*?data-name="([0-9]+)">([^<]+)(.*?)') - id = scrapertoolsV2.find_single_match(block,r'(.*?)')) + id = scrapertoolsV2.find_single_match(data,r' Date: Tue, 4 Jun 2019 12:45:20 +0200 Subject: [PATCH 3/3] Now on TV -> Now on Air --- resources/language/English/strings.po | 2 +- resources/language/Italian/strings.po | 8 ++++---- specials/filmontv.py | 21 +++++++++++-------- specials/search.py | 29 ++++++++------------------- 4 files changed, 26 insertions(+), 34 deletions(-) diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index 87e50af6..7886c8c6 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -378,7 +378,7 @@ msgid "Sagas" msgstr "" msgctxt "#50001" -msgid "Today on TV" +msgid "On Air" msgstr "" msgctxt "#50002" diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index 57bc269b..08f4c07c 100644 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -378,8 +378,8 @@ msgid "Sagas" msgstr "Saghe" msgctxt "#50001" -msgid "Today on TV" -msgstr "Oggi in TV" +msgid "On Air" +msgstr "Adesso in onda" msgctxt "#50002" msgid "Latest News" @@ -3935,7 +3935,7 @@ msgstr "Film più valutati" msgctxt "#70309" msgid "Movies Now in Theatres " -msgstr "Film ora in sala" +msgstr "[Film] Ora in sala" msgctxt "#70310" msgid "Series by Genre" @@ -3947,7 +3947,7 @@ msgstr "Serie più popolari" msgctxt "#70312" msgid "Series in progress" -msgstr "Serie in uscita" +msgstr "[Serie TV] In corso" msgctxt "#70313" msgid "Top rated Series" diff --git a/specials/filmontv.py b/specials/filmontv.py index 2674d946..ccb3981a 100644 --- a/specials/filmontv.py +++ b/specials/filmontv.py @@ -6,10 +6,10 @@ import re import urllib - +from channelselector import get_thumb from core import httptools, scrapertools, tmdb, support from core.item import Item -from platformcode import logger +from platformcode import logger, config host = "https://www.comingsoon.it" @@ -18,28 +18,33 @@ TIMEOUT_TOTAL = 60 def mainlist(item): logger.info(" mainlist") - itemlist = [Item(channel=item.channel, - title=support.typo("IN ONDA ADESSO bold"), + itemlist = [Item(channel="search", action='discover_list', title=config.get_localized_string(70309), + search_type='list', list_type='movie/now_playing', + thumbnail=get_thumb("now_playing.png")), + Item(channel="search", action='discover_list', title=config.get_localized_string(70312), + search_type='list', list_type='tv/on_the_air', thumbnail=get_thumb("on_the_air.png")), + Item(channel=item.channel, + title="[Oggi in TV] [B]Adesso in onda[/B]", action="tvoggi", url="%s/filmtv/" % host, thumbnail=item.thumbnail), Item(channel=item.channel, - title="Mattina", + title="[Oggi in TV] Mattina", action="tvoggi", url="%s/filmtv/oggi/mattina/" % host, thumbnail=item.thumbnail), Item(channel=item.channel, - title="Pomeriggio", + title="[Oggi in TV] Pomeriggio", action="tvoggi", url="%s/filmtv/oggi/pomeriggio/" % host, thumbnail=item.thumbnail), Item(channel=item.channel, - title="Sera", + title="[Oggi in TV] Sera", action="tvoggi", url="%s/filmtv/oggi/sera/" % host, thumbnail=item.thumbnail), Item(channel=item.channel, - title="Notte", + title="[Oggi in TV] Notte", action="tvoggi", url="%s/filmtv/oggi/notte/" % host, thumbnail=item.thumbnail)] diff --git a/specials/search.py b/specials/search.py index 024642b0..796bf551 100644 --- a/specials/search.py +++ b/specials/search.py @@ -29,43 +29,30 @@ def mainlist(item): itemlist = [] context = [{"title": config.get_localized_string(60412), "action": "setting_channel", "channel": item.channel}] - itemlist.append(Item(channel=item.channel, action="sub_menu", title=config.get_localized_string(70305), context=context, + itemlist.append(Item(channel=item.channel, action="sub_menu", title="[B]" + config.get_localized_string(70305)+ "[/B]", context=context, thumbnail=get_thumb("search.png"))) - + itemlist.append(Item(channel="filmontv", action="mainlist", title=config.get_localized_string(50001), + thumbnail=get_thumb("on_the_air.png"), viewmode="thumbnails")) itemlist.append(Item(channel=item.channel, action='genres_menu', title=config.get_localized_string(70306), type='movie', thumbnail=get_thumb("genres.png"))) - itemlist.append (Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70307), context=context, search_type='list', list_type='movie/popular', thumbnail=get_thumb("popular.png"))) - itemlist.append(Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70308), context=context, search_type='list', list_type='movie/top_rated', thumbnail=get_thumb("top_rated.png"))) - - itemlist.append( - Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70309), context=context, - search_type='list', list_type='movie/now_playing', - thumbnail=get_thumb("now_playing.png"))) - + #itemlist.append(Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70309), context=context, + # search_type='list', list_type='movie/now_playing', + # thumbnail=get_thumb("now_playing.png"))) itemlist.append(Item(channel=item.channel, action='genres_menu', title=config.get_localized_string(70310), type='tv', thumbnail=get_thumb("genres.png"))) - itemlist.append( Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70311), context=context, search_type='list',list_type='tv/popular', thumbnail=get_thumb("popular.png"))) - - itemlist.append(Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70312), context=context, - search_type='list', list_type='tv/on_the_air', thumbnail=get_thumb("on_the_air.png"))) - - + #itemlist.append(Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70312), context=context, + # search_type='list', list_type='tv/on_the_air', thumbnail=get_thumb("on_the_air.png"))) itemlist.append(Item(channel=item.channel, action='discover_list', title=config.get_localized_string(70313), context=context, search_type='list', list_type='tv/top_rated', thumbnail=get_thumb("top_rated.png"))) - - itemlist.append(Item(channel="filmontv", action="mainlist", title=config.get_localized_string(50001), - thumbnail=get_thumb("on_the_air.png"), viewmode="thumbnails")) - - return itemlist