Fix xbmc_videolibrary per Matrix

This commit is contained in:
Alhaziel01
2020-04-11 09:30:23 +02:00
parent 5c88ba2f65
commit f8f92c9b4d
+16 -29
View File
@@ -1148,9 +1148,9 @@ def update_sources(new='', old=''):
# write changes # write changes
if sys.version_info[0] >= 3: #PY3 if sys.version_info[0] >= 3: #PY3
filetools.write(SOURCES_PATH, '\n'.join([x for x in xmldoc.toprettyxml().encode("utf-8").splitlines() if x.strip()])) filetools.write(SOURCES_PATH, '\n'.join([x for x in xmldoc.toprettyxml().splitlines() if x.strip()]))
else: else:
filetools.write(SOURCES_PATH, b'\n'.join([x for x in xmldoc.toprettyxml().encode("utf-8").splitlines() if x.strip()]), vfs=False) filetools.write(SOURCES_PATH, '\n'.join([x for x in xmldoc.toprettyxml().splitlines() if x.strip()]), vfs=False)
logger.debug("The path %s has been added to sources.xml" % new) logger.debug("The path %s has been added to sources.xml" % new)
@@ -1167,42 +1167,29 @@ def ask_set_content(silent=False):
platformtools.dialog_ok(config.get_localized_string(80026), config.get_localized_string(80024)) platformtools.dialog_ok(config.get_localized_string(80026), config.get_localized_string(80024))
config.set_setting("videolibrary_kodi", False) config.set_setting("videolibrary_kodi", False)
# configuration during installation
if not silent: if not silent:
# ask to configure Kodi video library
if platformtools.dialog_yesno(config.get_localized_string(20000), config.get_localized_string(80015)): if platformtools.dialog_yesno(config.get_localized_string(20000), config.get_localized_string(80015)):
# ask for custom or default settings
if not platformtools.dialog_yesno(config.get_localized_string(80026), config.get_localized_string(80016), "", "", config.get_localized_string(80017), config.get_localized_string(80018)): if not platformtools.dialog_yesno(config.get_localized_string(80026), config.get_localized_string(80016), "", "", config.get_localized_string(80017), config.get_localized_string(80018)):
# input path and folders
path = platformtools.dialog_browse(3, config.get_localized_string(80019), config.get_setting("videolibrarypath")) path = platformtools.dialog_browse(3, config.get_localized_string(80019), config.get_setting("videolibrarypath"))
movies_folder = platformtools.dialog_input(config.get_setting("folder_movies"), config.get_localized_string(80020)) if path != "":
tvshows_folder = platformtools.dialog_input(config.get_setting("folder_tvshows"), config.get_localized_string(80021)) update_sources(path, config.get_setting("videolibrarypath"))
config.set_setting("videolibrarypath", path)
if path != "" and movies_folder != "" and tvshows_folder != "": folder = platformtools.dialog_input(config.get_setting("folder_movies"), config.get_localized_string(80020))
movies_path, tvshows_path = check_sources(filetools.join(path, movies_folder), filetools.join(path, tvshows_folder)) if folder != "":
# configure later config.set_setting("folder_movies", folder)
if movies_path or tvshows_path: folder = platformtools.dialog_input(config.get_setting("folder_tvshows"), config.get_localized_string(80021))
platformtools.dialog_ok(config.get_localized_string(80026), config.get_localized_string(80029)) if folder != "":
# set path and folders config.set_setting("folder_tvshows", folder)
else: config.verify_directories_created()
update_sources(path, config.get_setting("videolibrarypath")) do_config(True)
config.set_setting("videolibrarypath", path)
config.set_setting("folder_movies", movies_folder)
config.set_setting("folder_tvshows", tvshows_folder)
config.verify_directories_created()
do_config(True)
# default path and folders
else:
platformtools.dialog_ok(config.get_localized_string(80026), config.get_localized_string(80030))
do_config(True)
# default settings
else: else:
platformtools.dialog_ok(config.get_localized_string(80026), config.get_localized_string(80027)) platformtools.dialog_ok(config.get_localized_string(80026), config.get_localized_string(80027))
do_config(False) do_config(False)
# configure later
else: else:
# no hemos aceptado
platformtools.dialog_ok(config.get_localized_string(20000), config.get_localized_string(80022)) platformtools.dialog_ok(config.get_localized_string(20000), config.get_localized_string(80022))
# configuration from the settings menu config.set_setting("videolibrary_kodi", False)
else: else:
platformtools.dialog_ok(config.get_localized_string(80026), config.get_localized_string(80023)) platformtools.dialog_ok(config.get_localized_string(80026), config.get_localized_string(80023))
do_config(True) do_config(True)