elie/xbmcbackup
1
0
Fork 0
mirror of https://github.com/robweber/xbmcbackup.git synced 2025-06-22 02:33:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into helix_google_drive

Browse Source 
Conflicts:
	resources/language/English/strings.xml
This commit is contained in:
Rob Weber
2015-04-24 09:28:05 -05:00
parent 5050af931c 776c3872ae
commit f0cce73851
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/language/English/strings.xml
View File

@ -87,5 +87,6 @@
<string id="30093">Delete Authorization Info</string>
<string id="30094">This will delete any OAuth token files</string>
<string id="30095">Do you want to do this?</string>
<string id="30096">Google Drive</string>
<string id="30096">Old Zip Archive could not be deleted</string>
<string id="30097">This needs to happen before a backup can run</string>
</strings>

5
resources/lib/backup.py
View File

@ -121,7 +121,10 @@ class XbmcBackup:
if(utils.getSetting("compress_backups") == 'true'):
#delete old temp file
if(self.xbmc_vfs.exists(xbmc.translatePath('special://temp/xbmc_backup_temp.zip'))):
self.xbmc_vfs.rmfile(xbmc.translatePath('special://temp/xbmc_backup_temp.zip'))
if(not self.xbmc_vfs.rmfile(xbmc.translatePath('special://temp/xbmc_backup_temp.zip'))):
#we had some kind of error deleting the old file
xbmcgui.Dialog().ok(utils.getString(30010),utils.getString(30096),utils.getString(30097))
return
#save the remote file system and use the zip vfs
self.saved_remote_vfs = self.remote_vfs

4
resources/lib/vfs.py
View File

@ -81,7 +81,7 @@ class ZipFileSystem(Vfs):
def __init__(self,rootString,mode):
self.root_path = ""
self.zip = zipfile.ZipFile(rootString,mode=mode,allowZip64=True)
self.zip = zipfile.ZipFile(rootString,mode=mode,compression=zipfile.ZIP_DEFLATED,allowZip64=True)
def listdir(self,directory):
return [[],[]]
@ -94,7 +94,7 @@ class ZipFileSystem(Vfs):
aFile = xbmcvfs.File(xbmc.translatePath(source),'r')
self.zip.writestr(utils.encode(dest),aFile.read(),compress_type=zipfile.ZIP_DEFLATED)
self.zip.writestr(utils.encode(dest),aFile.read())
return True