From 98dd7655c5af62dbceba03364310bb40baef8d60 Mon Sep 17 00:00:00 2001 From: mac12m99 Date: Sat, 25 May 2019 23:53:55 +0200 Subject: [PATCH] add option to force videolibrary configuration --- platformcode/launcher.py | 2 +- platformcode/xbmc_videolibrary.py | 22 +++++++++++++++------- resources/settings.xml | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/platformcode/launcher.py b/platformcode/launcher.py index df7e000b..bc1e52a4 100644 --- a/platformcode/launcher.py +++ b/platformcode/launcher.py @@ -65,7 +65,7 @@ def run(item=None): item = Item(channel="channelselector", action="getmainlist", viewmode="movie") if not config.get_setting('show_once'): from platformcode import xbmc_videolibrary - xbmc_videolibrary.ask_set_content(1) + xbmc_videolibrary.ask_set_content(1, config.get_setting('videolibrary_kodi_force')) config.set_setting('show_once', True) logger.info(item.tostring()) diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py index ecf46d27..848bbaf1 100644 --- a/platformcode/xbmc_videolibrary.py +++ b/platformcode/xbmc_videolibrary.py @@ -535,12 +535,17 @@ def set_content(content_type, silent=False): continuar = True msg_text = "" videolibrarypath = config.get_setting("videolibrarypath") + forced = config.get_setting('videolibrary_kodi_force') if content_type == 'movie': scraper = [config.get_localized_string(70093), config.get_localized_string(70096)] - seleccion = platformtools.dialog_select(config.get_localized_string(70094), scraper) + if forced: + seleccion = 0 # tmdb + else: + seleccion = platformtools.dialog_select(config.get_localized_string(70094), scraper) - # Instalar The Movie Database + + # Instalar The Movie Database if seleccion == -1 or seleccion == 0: if not xbmc.getCondVisibility('System.HasAddon(metadata.themoviedb.org)'): if not silent: @@ -560,7 +565,7 @@ def set_content(content_type, silent=False): continuar = (install and xbmc.getCondVisibility('System.HasAddon(metadata.themoviedb.org)')) if not continuar: msg_text = config.get_localized_string(60047) - if continuar: + if continuar and not forced: xbmc.executebuiltin('xbmc.addon.opensettings(metadata.themoviedb.org)', True) # Instalar Universal Movie Scraper @@ -584,12 +589,15 @@ def set_content(content_type, silent=False): continuar = (install and continuar) if not continuar: msg_text = config.get_localized_string(70097) - if continuar: + if continuar and not forced: xbmc.executebuiltin('xbmc.addon.opensettings(metadata.universal)', True) else: # SERIES scraper = [config.get_localized_string(70098), config.get_localized_string(70093)] - seleccion = platformtools.dialog_select(config.get_localized_string(70107), scraper) + if forced: + seleccion = 0 # tvdb + else: + seleccion = platformtools.dialog_select(config.get_localized_string(70107), scraper) # Instalar The TVDB if seleccion == -1 or seleccion == 0: @@ -611,7 +619,7 @@ def set_content(content_type, silent=False): continuar = (install and xbmc.getCondVisibility('System.HasAddon(metadata.tvdb.com)')) if not continuar: msg_text = config.get_localized_string(70099) - if continuar: + if continuar and not forced: xbmc.executebuiltin('xbmc.addon.opensettings(metadata.tvdb.com)', True) # Instalar The Movie Database @@ -636,7 +644,7 @@ def set_content(content_type, silent=False): continuar = (install and continuar) if not continuar: msg_text = config.get_localized_string(60047) - if continuar: + if continuar and not forced: xbmc.executebuiltin('xbmc.addon.opensettings(metadata.tvshows.themoviedb.org)', True) idPath = 0 diff --git a/resources/settings.xml b/resources/settings.xml index 3b1c9059..79ac5830 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -40,6 +40,7 @@ + @@ -145,5 +146,4 @@ - \ No newline at end of file