fixes for unicode strs

This commit is contained in:
Rob Weber 2019-08-28 15:37:56 -05:00
parent a1c0c0bbfe
commit 495ecb1048
2 changed files with 8 additions and 6 deletions

View File

@ -1,3 +1,4 @@
from __future__ import unicode_literals
import time
import json
from kodi_six import xbmc, xbmcgui, xbmcvfs
@ -87,7 +88,7 @@ class XbmcBackup:
for aFile in files:
file_ext = aFile.split('.')[-1]
folderName = utils.encode(aFile.split('.')[0])
folderName = aFile.split('.')[0]
if(file_ext == 'zip' and len(folderName) == 12 and str.isdigit(folderName)):

View File

@ -1,3 +1,4 @@
from __future__ import unicode_literals
import zipfile
import os.path
import sys
@ -92,7 +93,7 @@ class ZipFileSystem(Vfs):
aFile = xbmcvfs.File(xbmc.translatePath(source),'r')
self.zip.writestr(utils.encode(dest),aFile.read())
self.zip.writestr(dest,aFile.readBytes())
return True
@ -140,9 +141,9 @@ class DropboxFileSystem(Vfs):
for aFile in metadata.entries:
if(isinstance(aFile,dropbox.files.FolderMetadata)):
dirs.append(utils.encode(aFile.name))
dirs.append(aFile.name)
else:
files.append(utils.encode(aFile.name))
files.append(aFile.name)
return [dirs,files]
else:
@ -304,9 +305,9 @@ class GoogleDriveFilesystem(Vfs):
for aFile in fileList:
if(aFile['mimeType'] == self.FOLDER_TYPE):
dirs.append(utils.encode(aFile['title']))
dirs.append(aFile['title'])
else:
files.append(utils.encode(aFile['title']))
files.append(aFile['title'])
return [dirs,files]