elie/xbmcbackup
1
0
Fork 0
mirror of https://github.com/robweber/xbmcbackup.git synced 2024-11-14 20:35:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

cannot have duplicate set names or rules regarding folders within a set

Browse Source
This commit is contained in:
Rob Weber 2019-08-22 13:23:41 -05:00
parent 3ee2cb0414
commit 49af21a67e
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
resources/lib/advanced_editor.py
View File

@ -49,6 +49,9 @@ class BackupSetManager:
#return the set at this index #return the set at this index
return {'name':keys[index],'set':self.paths[keys[index]]} return {'name':keys[index],'set':self.paths[keys[index]]}
def validateSetName(self,name):
return (name not in self.getSets())
def _writeFile(self): def _writeFile(self):
#create the custom file #create the custom file
aFile = xbmcvfs.File(self.jsonFile,'w') aFile = xbmcvfs.File(self.jsonFile,'w')
@ -131,12 +134,17 @@ class AdvancedBackupEditor:
addFolder = self.dialog.browse(type=0,heading=utils.getString(30120),shares='files',defaultt=backupSet['root']) addFolder = self.dialog.browse(type=0,heading=utils.getString(30120),shares='files',defaultt=backupSet['root'])
if(addFolder.startswith(rootPath)): if(addFolder.startswith(rootPath)):
#cannot add root as an exclusion
if(optionSelected == 0 and addFolder != backupSet['root']): if(not any(addFolder == aDir['path'] for aDir in backupSet['dirs'])):
backupSet['dirs'].append({"path":addFolder,"type":"exclude"}) #cannot add root as an exclusion
elif(optionSelected == 1): if(optionSelected == 0 and addFolder != backupSet['root']):
#can add root as inclusion backupSet['dirs'].append({"path":addFolder,"type":"exclude"})
backupSet['dirs'].append({"path":addFolder,"type":"include","recurse":True}) elif(optionSelected == 1):
#can add root as inclusion
backupSet['dirs'].append({"path":addFolder,"type":"include","recurse":True})
else:
#this path is already part of another include/exclude rule
self.dialog.ok(utils.getString(30117),utils.getString(30137),addFolder)
else: else:
#folder must be under root folder #folder must be under root folder
self.dialog.ok(utils.getString(30117), utils.getString(30136),rootPath) self.dialog.ok(utils.getString(30117), utils.getString(30136),rootPath)
@ -173,7 +181,11 @@ class AdvancedBackupEditor:
if(exitCondition == 0): if(exitCondition == 0):
newSet = self.createSet() newSet = self.createSet()
customPaths.addSet(newSet) #check that the name is unique
if(customPaths.validateSetName(newSet['name'])):
customPaths.addSet(newSet)
else:
self.dialog.ok(utils.getString(30117), utils.getString(30138),newSet['name'])
else: else:
#bring up a context menu #bring up a context menu
menuOption = self.dialog.select(heading=utils.getString(30124),list=[utils.getString(30122),utils.getString(30123)],preselect=0) menuOption = self.dialog.select(heading=utils.getString(30124),list=[utils.getString(30122),utils.getString(30123)],preselect=0)