From 7588c1a9cfc3967ff929af3992f2d504eaeb9e63 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Sat, 6 Feb 2021 10:37:30 +0100 Subject: [PATCH] Fix TMDB come default per serie TV --- addon.xml | 1 + platformcode/xbmc_videolibrary.py | 58 +++++++++++++++---------------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/addon.xml b/addon.xml index bc5c3f30..d6c54d6a 100644 --- a/addon.xml +++ b/addon.xml @@ -3,6 +3,7 @@ + diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py index 8f8fdc13..ecb34d2a 100644 --- a/platformcode/xbmc_videolibrary.py +++ b/platformcode/xbmc_videolibrary.py @@ -661,37 +661,14 @@ def set_content(content_type, silent=False, custom=False): xbmc.executebuiltin('Addon.OpenSettings(metadata.universal)', True) else: # SERIES - scraper = [config.get_localized_string(70098), config.get_localized_string(70093)] + scraper = [config.get_localized_string(70093), config.get_localized_string(70098)] if not custom: - seleccion = 0 # tvdb + seleccion = 0 # tmdb else: seleccion = platformtools.dialog_select(config.get_localized_string(70107), scraper) - # Instalar The TVDB - if seleccion == -1 or seleccion == 0: - if not xbmc.getCondVisibility('System.HasAddon(metadata.tvdb.com)'): - if not silent: - #Ask if we want to install metadata.tvdb.com - install = platformtools.dialog_yesno(config.get_localized_string(60048),'') - else: - install = True - - if install: - try: - # Install metadata.tvdb.com - xbmc.executebuiltin('InstallAddon(metadata.tvdb.com)', True) - logger.debug("The TVDB series Scraper installed ") - except: - pass - - continuar = (install and xbmc.getCondVisibility('System.HasAddon(metadata.tvdb.com)')) - if not continuar: - msg_text = config.get_localized_string(60049) - if continuar: - xbmc.executebuiltin('Addon.OpenSettings(metadata.tvdb.com)', True) - # Instalar The Movie Database - elif seleccion == 1: + if seleccion == -1 or seleccion == 0: if continuar and not xbmc.getCondVisibility('System.HasAddon(metadata.tvshows.themoviedb.org)'): continuar = False if not silent: @@ -715,6 +692,29 @@ def set_content(content_type, silent=False, custom=False): if continuar: xbmc.executebuiltin('Addon.OpenSettings(metadata.tvshows.themoviedb.org)', True) + # Instalar The TVDB + elif seleccion == 1: + if not xbmc.getCondVisibility('System.HasAddon(metadata.tvdb.com)'): + if not silent: + #Ask if we want to install metadata.tvdb.com + install = platformtools.dialog_yesno(config.get_localized_string(60048),'') + else: + install = True + + if install: + try: + # Install metadata.tvdb.com + xbmc.executebuiltin('InstallAddon(metadata.tvdb.com)', True) + logger.debug("The TVDB series Scraper installed ") + except: + pass + + continuar = (install and xbmc.getCondVisibility('System.HasAddon(metadata.tvdb.com)')) + if not continuar: + msg_text = config.get_localized_string(60049) + if continuar: + xbmc.executebuiltin('Addon.OpenSettings(metadata.tvdb.com)', True) + idPath = 0 idParentPath = 0 if continuar: @@ -788,11 +788,11 @@ def set_content(content_type, silent=False, custom=False): strContent = 'tvshows' scanRecursive = 0 if seleccion == -1 or seleccion == 0: - strScraper = 'metadata.tvdb.com' - path_settings = xbmc.translatePath("special://profile/addon_data/metadata.tvdb.com/settings.xml") - elif seleccion == 1: strScraper = 'metadata.tvshows.themoviedb.org' path_settings = xbmc.translatePath("special://profile/addon_data/metadata.tvshows.themoviedb.org/settings.xml") + elif seleccion == 1: + strScraper = 'metadata.tvdb.com' + path_settings = xbmc.translatePath("special://profile/addon_data/metadata.tvdb.com/settings.xml") if not os.path.exists(path_settings): logger.debug("%s: %s" % (content_type, path_settings + " doesn't exist")) return continuar