stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

try except unzipper -> workaround

Browse Source
This commit is contained in:
marco
2019-07-06 18:27:20 +02:00
committed by mac12m99
parent 1cefdb9a24
commit b7bac17db8
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/githash.py
+1 -1
View File
@@ -115,7 +115,7 @@ def tree_hash(path):
contents = os.listdir(path) contents = os.listdir(path)
tsize = 0 tsize = 0
to_skip = ('.', '..', '.git', '.DS_Store', '.idea', '.directory') to_skip = ('.', '..', '.git', '.DS_Store', '.idea', '.directory', 'custom_code.json', 'last_commit.txt')
to_skip_ext = ('pyo', 'pyc') to_skip_ext = ('pyo', 'pyc')
pass1 = [] pass1 = []
for entry in contents: for entry in contents:
platformcode/updater.py
+8 -5
View File
@@ -222,11 +222,14 @@ def updateFromZip():
destpathname = xbmc.translatePath("special://home/addons/") destpathname = xbmc.translatePath("special://home/addons/")
logger.info("destpathname=%s" % destpathname) logger.info("destpathname=%s" % destpathname)
# fix per android -> badZip file try:
hash = fixZipGetHash(localfilename) hash = fixZipGetHash(localfilename)
unzipper = ziptools()
unzipper = ziptools() unzipper.extract(localfilename, destpathname)
unzipper.extract(localfilename, destpathname) except Exception as e:
logger.info('Non sono riuscito ad estrarre il file zip')
logger.info(e)
return False
# puliamo tutto # puliamo tutto
shutil.rmtree(addonDir) shutil.rmtree(addonDir)