From 27265ad3408e210ab34713ab492ba933bdc7d791 Mon Sep 17 00:00:00 2001 From: robweber Date: Fri, 20 Apr 2012 13:32:25 -0500 Subject: [PATCH] Added progress bar and "silent" for running via the RunScript() xbmc function --- addon.xml | 2 +- changelog.txt | 6 +++ default.py | 72 +++++++++++++++++++------- resources/language/English/strings.xml | 1 + resources/settings.xml | 1 + 5 files changed, 63 insertions(+), 19 deletions(-) diff --git a/addon.xml b/addon.xml index 7c6bcf0..541e40e 100644 --- a/addon.xml +++ b/addon.xml @@ -1,6 +1,6 @@ + name="XBMC Backup" version="0.0.3" provider-name="robweber"> diff --git a/changelog.txt b/changelog.txt index c28aea7..bcf65ae 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ [b]Version 0.0.2[/b] + + First version, should backup directories as needed + +[b]Version 0.0.3[/b] + +Added progress bar and "silent" option for running on startup or as a script \ No newline at end of file diff --git a/default.py b/default.py index 793b8f7..1c7dc6d 100644 --- a/default.py +++ b/default.py @@ -10,6 +10,11 @@ class XbmcBackup: local_path = '' remote_path = '' + #for the progress bar + progressBar = None + dirsLeft = 0 + dirsTotal = 0 + def __init__(self): self.local_path = xbmc.translatePath("special://home") @@ -28,56 +33,87 @@ class XbmcBackup: xbmcvfs.mkdir(self.remote_path) + if(self.Addon.getSetting('run_silent') == 'false'): + self.progressBar = xbmcgui.DialogProgress() + self.progressBar.create('XBMC Backup','Running......') + self.updateProgress(1) + #figure out which syncing options to run - if(self.Addon.getSetting('backup_addons') == 'true'): + if(self.Addon.getSetting('backup_addons') == 'true' and not self.checkCancel()): xbmcvfs.mkdir(self.remote_path + "addons") self.walkTree(self.local_path + "addons/") xbmcvfs.mkdir(self.remote_path + "userdata") - if(self.Addon.getSetting('backup_addon_data') == 'true'): + if(self.Addon.getSetting('backup_addon_data') == 'true' and not self.checkCancel()): xbmcvfs.mkdir(self.remote_path + "userdata/addon_data") self.walkTree(self.local_path + "userdata/addon_data/") - if(self.Addon.getSetting('backup_database') == 'true'): + if(self.Addon.getSetting('backup_database') == 'true' and not self.checkCancel()): xbmcvfs.mkdir(self.remote_path + "userdata/Database") self.walkTree(self.local_path + "userdata/Database") - if(self.Addon.getSetting("backup_playlists") == 'true'): + if(self.Addon.getSetting("backup_playlists") == 'true' and not self.checkCancel()): xbmcvfs.mkdir(self.remote_path + "userdata/playlists") self.walkTree(self.local_path + "userdata/playlists") - if(self.Addon.getSetting("backup_thumbnails") == "true"): + if(self.Addon.getSetting("backup_thumbnails") == "true" and not self.checkCancel()): xbmcvfs.mkdir(self.remote_path + "userdata/Thumbnails") self.walkTree(self.local_path + "userdata/Thumbnails") - if(self.Addon.getSetting("backup_config") == "true"): - #this on is an oddity + if(self.Addon.getSetting("backup_config") == "true" and not self.checkCancel()): + #this one is an oddity configFiles = os.listdir(self.local_path + "userdata/") for aFile in configFiles: if(aFile.endswith(".xml")): self.log("Copying: " + self.local_path + "userdata/" + aFile) xbmcvfs.copy(self.local_path + "userdata/" + aFile,self.remote_path + "userdata/" + aFile) + + if(self.Addon.getSetting('run_silent') == 'false'): + self.progressBar.close() + def walkTree(self,directory): for (path, dirs, files) in os.walk(directory): - #get the relative part of this path - path = path[len(self.local_path):] + if(not self.checkCancel()): + #get the relative part of this path + path = path[len(self.local_path):] + + #subtract one from total + self.dirsLeft = self.dirsLeft - 1 + self.updateProgress(len(dirs),"Copying: " + path) - #create all the subdirs first - for aDir in dirs: - xbmcvfs.mkdir(self.remote_path + os.sep + path + os.sep + aDir) - #copy all the files - for aFile in files: - filePath = path + os.sep + aFile - self.log("copying: " + self.local_path + filePath) - xbmcvfs.copy(self.local_path + filePath,self.remote_path + filePath) + #create all the subdirs first + for aDir in dirs: + xbmcvfs.mkdir(self.remote_path + os.sep + path + os.sep + aDir) + #copy all the files + for aFile in files: + filePath = path + os.sep + aFile + self.log("copying: " + self.local_path + filePath) + xbmcvfs.copy(self.local_path + filePath,self.remote_path + filePath) + def updateProgress(self,dirCount,message=''): + #add to the total + self.dirsTotal = self.dirsTotal + dirCount + self.dirsLeft = self.dirsLeft + dirCount + + #update the progress bar + if(self.progressBar != None): + self.progressBar.update((float(self.dirsTotal - self.dirsLeft)/float(self.dirsTotal)) * 100,message) + + def checkCancel(self): + result = False + + if(self.progressBar != None): + result = self.progressBar.iscanceled() + + return result + def log(self,message): xbmc.log(self.__addon_id__ + ": " + message) def isReady(self): return True if self.remote_path != '' else False - + #run the profile backup backup = XbmcBackup() diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml index af8ee6d..f3e3ae7 100644 --- a/resources/language/English/strings.xml +++ b/resources/language/English/strings.xml @@ -6,6 +6,7 @@ Remote Path Backup Folder Name + Run Silent User Addons Addon Data diff --git a/resources/settings.xml b/resources/settings.xml index a09fef2..ad15070 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -3,6 +3,7 @@ +