From 97a977c72148473920cea1a050a0fc46b312f31c Mon Sep 17 00:00:00 2001 From: Rob Weber Date: Fri, 19 Jun 2015 14:30:45 -0500 Subject: [PATCH] minor fixes --- resources/lib/backup.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/resources/lib/backup.py b/resources/lib/backup.py index 3bc81b9..c465095 100644 --- a/resources/lib/backup.py +++ b/resources/lib/backup.py @@ -313,7 +313,6 @@ class XbmcBackup: #set the new remote vfs and fix xbmc path self.remote_vfs = XBMCFileSystem(xbmc.translatePath("special://temp/" + self.restore_point.split(".")[0] + "/")) self.xbmc_vfs.set_root(xbmc.translatePath("special://home/")) - #for restores remote path must exist if(not self.remote_vfs.exists(self.remote_vfs.root_path)): @@ -535,12 +534,15 @@ class XbmcBackup: result = False #copy the file and open it - self.xbmc_vfs.put(path + "xbmcbackup.val",xbmc.translatePath(utils.data_dir() + "xbmcbackup.val")) + self.xbmc_vfs.put(path + "xbmcbackup.val",xbmc.translatePath(utils.data_dir() + "xbmcbackup_restore.val")) - vFile = xbmcvfs.File(xbmc.translatePath(utils.data_dir() + "xbmcbackup.val"),'r') + vFile = xbmcvfs.File(xbmc.translatePath(utils.data_dir() + "xbmcbackup_restore.val"),'r') jsonString = vFile.read() vFile.close() + #delete after checking + xbmcvfs.delete(xbmc.translatePath(utils.data_dir() + "xbmcbackup_restore.val")) + try: json_dict = json.loads(jsonString) @@ -568,6 +570,9 @@ class FileManager: self.fileArray = [] def walkTree(self,directory): + + if(directory[-1:] == '/'): + directory = directory[:-1] if(self.vfs.exists(directory + "/")): dirs,files = self.vfs.listdir(directory)