diff --git a/channels/cineblog01.py b/channels/cineblog01.py index 4a6d655c..20c56271 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -71,15 +71,16 @@ def newest(categoria): except: import sys for line in sys.exc_info(): - support.infoger.error("{0}".format(line)) + logger..error("{0}".format(line)) return [] def search(item, text): - support.info(item.url, "search", text) - + logger.info(item, "search", text) + if item.contentType == 'tvshow': item.url = host + '/serietv/' + else: item.url = host try: - item.url = item.url + "/?s=" + text.replace(' ', '+') + item.url = item.url + "?s=" + text.replace(' ', '+') return peliculas(item) # Continua la ricerca in caso di errore @@ -100,6 +101,7 @@ def peliculas(item): # debug= True if 'newest' in item.args: if '/serietv/' not in item.url: + debug = True pagination = '' patronBlock = r'Ultimi 100 film [^:]+:(?P.*?)<\/td>' patron = r']+)"?>(?P[^<([]+)(?:\[(?P<lang>Sub-ITA|B/N|SUB-ITA)\])?\s*(?:\[(?P<quality>HD|SD|HD/3D)\])?\s*\((?P<year>[0-9]{4})\)<\/a>' diff --git a/platformcode/launcher.py b/platformcode/launcher.py index 727ab0e8..135e790d 100644 --- a/platformcode/launcher.py +++ b/platformcode/launcher.py @@ -121,6 +121,14 @@ def run(item=None): else: return keymaptools.set_key() + elif item.channel == "infoplus": + from platformcode import infoplus + return infoplus.Main(item) + + elif item.channel == "shortcuts": + from platformcode import shortcuts + return getattr(shortcuts, item.action)(item) + elif item.action == "delete_key": from platformcode import keymaptools return keymaptools.delete_key() diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index e6391377..609d2615 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -421,7 +421,7 @@ def set_context_commands(item, item_url, parent_item, **kwargs): #if item.infoLabels['tmdb_id'] or item.infoLabels['imdb_id'] or item.infoLabels['tvdb_id'] or \ # (item.contentTitle and item.infoLabels["year"]) or item.contentSerieName: if item.infoLabels['tmdb_id'] or item.infoLabels['imdb_id'] or item.infoLabels['tvdb_id']: - context_commands.append(("InfoPlus", "RunPlugin(%s?%s&%s)" % (sys.argv[0], item_url, 'channel=infoplus&action=start&from_channel=' + item.channel))) + context_commands.append(("InfoPlus", "RunPlugin(%s?%s&%s)" % (sys.argv[0], item_url, 'channel=infoplus&action=Main&from_channel=' + item.channel))) # Go to the Main Menu (channel.mainlist) if parent_item.channel not in ["news", "channelselector", "downloads"] and item.action != "mainlist": diff --git a/platformcode/shortcuts.py b/platformcode/shortcuts.py index 0361bd0e..631d5896 100644 --- a/platformcode/shortcuts.py +++ b/platformcode/shortcuts.py @@ -12,12 +12,12 @@ def context(): # pre-serialised if config.get_setting('quick_menu'): context.append((config.get_localized_string(60360), 'RunPlugin(plugin://plugin.video.kod/?ewogICAgImFjdGlvbiI6ICJzaG9ydGN1dF9tZW51IiwgCiAgICAiY2hhbm5lbCI6ICJzaG9ydGN1dHMiLCAKICAgICJpbmZvTGFiZWxzIjoge30KfQ%3D%3D)')) - if config.get_setting('side_menu'): context.append((config.get_localized_string(70737), 'RunPlugin(plugin://plugin.video.kod/?ewogICAgImFjdGlvbiI6ICJzaWRlX21lbnUiLCAKICAgICJjaGFubmVsIjogInNob3J0Y3V0cyIsIAogICAgImluZm9MYWJlbHMiOiB7fQp9)')) + if config.get_setting('Side_menu'): context.append((config.get_localized_string(70737), 'RunPlugin(plugin://plugin.video.kod/?ewogICAgImFjdGlvbiI6ICJzaWRlX21lbnUiLCAKICAgICJjaGFubmVsIjogInNob3J0Y3V0cyIsIAogICAgImluZm9MYWJlbHMiOiB7fQp9)')) if config.get_setting('kod_menu'): context.append((config.get_localized_string(60026), 'RunPlugin(plugin://plugin.video.kod/?ewogICAgImFjdGlvbiI6ICJzZXR0aW5nc19tZW51IiwgCiAgICAiY2hhbm5lbCI6ICJzaG9ydGN1dHMiLCAKICAgICJpbmZvTGFiZWxzIjoge30KfQ%3D%3D)')) return context -def side_menu(item): +def Side_menu(item): side_menu.open_menu(item) def shortcut_menu(item): diff --git a/specials/downloads.py b/specials/downloads.py index 495ddf21..f11f4f46 100644 --- a/specials/downloads.py +++ b/specials/downloads.py @@ -606,7 +606,7 @@ def download_from_url(url, item): update_json(item.path, {"downloadUrl": d.download_url, "downloadStatus": STATUS_CODES.downloading, "downloadSize": d.size[0], "downloadProgress": d.progress, "downloadCompleted": d.downloaded[0], "downloadFilename": file}) - d.start_diainfo(config.get_localized_string(60332)) + d.start_dialog(config.get_localized_string(60332)) # Download stopped. We get the state: # Download failed