Merge branch 'master' into helix_google_drive

Conflicts:
	resources/language/English/strings.xml
This commit is contained in:
Rob Weber
2015-04-24 09:28:05 -05:00
5 changed files with 17 additions and 5 deletions

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