From f2fdb777cf96ebdb4a62e4f5ddc5902675cd5d69 Mon Sep 17 00:00:00 2001 From: axlt2002 Date: Sat, 11 Apr 2020 15:12:06 +0200 Subject: [PATCH] Fix move_videolibrary + alcuni edit --- addon.xml | 2 +- platformcode/xbmc_videolibrary.py | 8 ++++---- resources/language/English/strings.po | 4 ++-- resources/language/Italian/strings.po | 8 ++++---- specials/videolibrary.py | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addon.xml b/addon.xml index b38d871d..b0733567 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py index 72b20b68..57262e74 100644 --- a/platformcode/xbmc_videolibrary.py +++ b/platformcode/xbmc_videolibrary.py @@ -581,7 +581,7 @@ def set_content(content_type, silent=False, custom=False): if not continuar: msg_text = config.get_localized_string(60047) if continuar: - xbmc.executebuiltin('xbmc.addon.opensettings(metadata.themoviedb.org)', True) + xbmc.executebuiltin('Addon.OpenSettings(metadata.themoviedb.org)', True) # Instalar Universal Movie Scraper elif seleccion == 1: @@ -605,7 +605,7 @@ def set_content(content_type, silent=False, custom=False): if not continuar: msg_text = config.get_localized_string(70097) if continuar: - xbmc.executebuiltin('xbmc.addon.opensettings(metadata.universal)', True) + xbmc.executebuiltin('Addon.OpenSettings(metadata.universal)', True) else: # SERIES scraper = [config.get_localized_string(70098), config.get_localized_string(70093)] @@ -635,7 +635,7 @@ def set_content(content_type, silent=False, custom=False): if not continuar: msg_text = config.get_localized_string(60049) if continuar: - xbmc.executebuiltin('xbmc.addon.opensettings(metadata.tvdb.com)', True) + xbmc.executebuiltin('Addon.OpenSettings(metadata.tvdb.com)', True) # Instalar The Movie Database elif seleccion == 1: @@ -660,7 +660,7 @@ def set_content(content_type, silent=False, custom=False): if not continuar: msg_text = config.get_localized_string(60051) if continuar: - xbmc.executebuiltin('xbmc.addon.opensettings(metadata.tvshows.themoviedb.org)', True) + xbmc.executebuiltin('Addon.OpenSettings(metadata.tvshows.themoviedb.org)', True) idPath = 0 idParentPath = 0 diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index c55001f6..2998ca2d 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -6178,11 +6178,11 @@ msgid "You will be asked to configure The Movie Database for movies and The TVDB msgstr "" msgctxt "#80028" -msgid "The selected folders are already used by the Kodi library. Please change them" +msgid "The selected folders are already used by the Kodi library. Please change them properly" msgstr "" msgctxt "#80029" -msgid "The selected folders are already used by the Kodi library. Please change them from the settings menu inside KoD" +msgid "The selected folders are already used by the Kodi library. Please change them properly from the settings menu inside KoD" msgstr "" msgctxt "#80030" diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index 49d520e9..323d34ef 100644 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -6178,12 +6178,12 @@ msgid "You will be asked to configure The Movie Database for movies and The TVDB msgstr "Ti verrà chiesto di configurare The Movie Database per i film e The TVDB per le serie TV" msgctxt "#80028" -msgid "The selected folders are already used by the Kodi library. Please change them" -msgstr "Le cartelle selezionate sono già utilizzate dalla libreria di Kodi. Si prega di cambiarle" +msgid "The selected folders are already used by the Kodi library. Please change them properly" +msgstr "Le cartelle selezionate sono già utilizzate dalla libreria di Kodi. Si prega di cambiarle opportunamente" msgctxt "#80029" -msgid "The selected folders are already used by the Kodi library. Please change them" -msgstr "Le cartelle selezionate sono già utilizzate dalla libreria di Kodi. Si prega di cambiarle dal menu impostazioni all'interno di KoD" +msgid "The selected folders are already used by the Kodi library. Please change them properly from the settings menu inside KoD" +msgstr "Le cartelle selezionate sono già utilizzate dalla libreria di Kodi. Si prega di cambiarle opportunamente dal menu impostazioni all'interno di KoD" msgctxt "#80030" msgid "The default path and folders will be used. You will be asked to choose and configure the information providers for movies and TV shows" diff --git a/specials/videolibrary.py b/specials/videolibrary.py index f0c4acf3..3b1d8645 100644 --- a/specials/videolibrary.py +++ b/specials/videolibrary.py @@ -711,10 +711,10 @@ def move_videolibrary(current_path, new_path, current_movies_folder, new_movies_ filetools.rmdir(new_movies_path) if not tvshows_path: filetools.rmdir(new_tvshows_path) - config.set_setting("videolibrarypath", current_path) + config.set_setting("videolibrarypath", backup_current_path) config.set_setting("folder_movies", current_movies_folder) config.set_setting("folder_tvshows", current_tvshows_folder) - xbmc_videolibrary.update_sources(current_path, new_path) + xbmc_videolibrary.update_sources(backup_current_path, backup_new_path) progress.update(100) xbmc.sleep(1000) progress.close()