elie/xbmcbackup
1
0
Fork 0
mirror of https://github.com/robweber/xbmcbackup.git synced 2025-07-14 21:02:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into leia

Browse Source
This commit is contained in:
Rob Weber
2019-09-30 14:23:19 -05:00
parent c0b0fa82cb ff2ca53a22
commit e91037208b
38 changed files with 393 additions and 160933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
resources/lib/backup.py
View File

@ -138,7 +138,7 @@ class XbmcBackup:
selectedDirs = self._readBackupConfig(utils.data_dir() + "/custom_paths.json")
#get the set names
keys = selectedDirs.keys()
keys = list(selectedDirs.keys())
#go through the custom sets
for aKey in keys:
@ -496,7 +496,10 @@ class XbmcBackup:
result = None
#copy the file and open it
self.xbmc_vfs.put(path + "xbmcbackup.val",xbmc.translatePath(utils.data_dir() + "xbmcbackup_restore.val"))
if(isinstance(self.remote_vfs,DropboxFileSystem) or isinstance(self.remote_vfs,GoogleDriveFilesystem)):
self.remote_vfs.get_file(path + "xbmcbackup.val", xbmc.translatePath(utils.data_dir() + "xbmcbackup_restore.val"))
else:
self.xbmc_vfs.put(path + "xbmcbackup.val",xbmc.translatePath(utils.data_dir() + "xbmcbackup_restore.val"))
vFile = xbmcvfs.File(xbmc.translatePath(utils.data_dir() + "xbmcbackup_restore.val"),'r')
jsonString = vFile.read()
@ -535,6 +538,7 @@ class FileManager:
not_dir = ['.zip','.xsp','.rar']
exclude_dir = []
root_dirs = []
pathSep = '/'
def __init__(self,vfs):
self.vfs = vfs
@ -553,13 +557,13 @@ class FileManager:
if(directory[-1:] == '/' or directory[-1:] == '\\'):
directory = directory[:-1]
if(self.vfs.exists(directory + os.path.sep)):
if(self.vfs.exists(directory + self.pathSep)):
dirs,files = self.vfs.listdir(directory)
if(recurse):
#create all the subdirs first
for aDir in dirs:
dirPath = xbmc.validatePath(xbmc.translatePath(directory + os.path.sep + aDir))
dirPath = xbmc.validatePath(xbmc.translatePath(directory + self.pathSep + aDir))
file_ext = aDir.split('.')[-1]
#check if directory is excluded
@ -579,7 +583,7 @@ class FileManager:
#copy all the files
for aFile in files:
filePath = xbmc.translatePath(directory + os.path.sep + aFile)
filePath = xbmc.translatePath(directory + self.pathSep + aFile)
self.addFile(filePath)
def addDir(self,dirMeta):