From e622a0455f22051986f53411c2322a00c589f67e Mon Sep 17 00:00:00 2001 From: Rob Weber Date: Wed, 20 Jan 2021 14:25:48 -0600 Subject: [PATCH] fixes #83 --- .../language/resource.language.en_gb/strings.po | 8 ++++++-- resources/lib/backup.py | 5 +++-- resources/settings.xml | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index 5a3c79e..86f8f4d 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -173,8 +173,8 @@ msgid "Would you like to continue?" msgstr "Would you like to continue?" msgctxt "#30045" -msgid "Error: Remote path doesn't exist" -msgstr "Error: Remote path doesn't exist" +msgid "Error: Remote or zip file path doesn't exist" +msgstr "Error: Remote or zip file path doesn't exist" msgctxt "#30046" msgid "Starting" @@ -596,3 +596,7 @@ msgstr "" msgctxt "#30151" msgid "Enable Verbose Logging" msgstr "" + +msgctxt "#30152" +msgid "Set Zip File Location" +msgstr "" diff --git a/resources/lib/backup.py b/resources/lib/backup.py index 05976d5..ec542fe 100644 --- a/resources/lib/backup.py +++ b/resources/lib/backup.py @@ -50,7 +50,7 @@ class XbmcBackup: def __init__(self): self.xbmc_vfs = XBMCFileSystem(xbmcvfs.translatePath('special://home')) - self.ZIP_TEMP_PATH = xbmcvfs.translatePath('special://temp') + self.ZIP_TEMP_PATH = xbmcvfs.translatePath(utils.getSetting('zip_temp_path')) self.configureRemote() utils.log(utils.getString(30046)) @@ -70,7 +70,7 @@ class XbmcBackup: def remoteConfigured(self): result = True - if(self.remote_base_path == ""): + if(self.remote_base_path == "" or not xbmcvfs.exists(self.ZIP_TEMP_PATH)): result = False return result @@ -380,6 +380,7 @@ class XbmcBackup: utils.log(utils.getString(30047) + ": " + self.xbmc_vfs.root_path) utils.log(utils.getString(30048) + ": " + self.remote_vfs.root_path) + utils.log(utils.getString(30152) + ": " + utils.getSetting('zip_temp_path')) # setup the progress bar self.progressBar = BackupProgressBar(progressOverride) diff --git a/resources/settings.xml b/resources/settings.xml index 2d9dda4..4ff1171 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -9,6 +9,20 @@ false + + + 3 + special://temp + + true + + + true + + + 30152 + + 0