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

test per bug casuale updater su windows

Browse Source
This commit is contained in:
marco
2019-10-07 17:54:42 +02:00
parent e31121e729
commit d202bfdf33
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platformcode/updater.py
+16 -14
View File
@@ -107,29 +107,20 @@ def check_addon_init():
alreadyApplied = False alreadyApplied = False
else: # nel caso ci siano stati problemi else: # nel caso ci siano stati problemi
logger.info('lo sha non corrisponde, scarico il file') logger.info('lo sha non corrisponde, scarico il file')
try: remove(addonDir + file["filename"])
os.remove(addonDir + file["filename"])
except:
pass
downloadtools.downloadfile(file['raw_url'], addonDir + file['filename'], downloadtools.downloadfile(file['raw_url'], addonDir + file['filename'],
silent=True, continuar=True, resumir=False) silent=True, continuar=True, resumir=False)
else: # è un file NON testuale, lo devo scaricare else: # è un file NON testuale, lo devo scaricare
# se non è già applicato # se non è già applicato
if not (filetools.isfile(addonDir + file['filename']) and getSha( if not (filetools.isfile(addonDir + file['filename']) and getSha(
filetools.read(addonDir + file['filename']) == file['sha'])): filetools.read(addonDir + file['filename']) == file['sha'])):
try: remove(addonDir + file["filename"])
os.remove(addonDir + file["filename"])
except:
pass
downloadtools.downloadfile(file['raw_url'], addonDir + file['filename'], silent=True, downloadtools.downloadfile(file['raw_url'], addonDir + file['filename'], silent=True,
continuar=True, resumir=False) continuar=True, resumir=False)
alreadyApplied = False alreadyApplied = False
elif file['status'] == 'removed': elif file['status'] == 'removed':
try: remove(addonDir+file["filename"])
os.remove(addonDir+file["filename"]) alreadyApplied = False
alreadyApplied = False
except:
pass
elif file['status'] == 'renamed': elif file['status'] == 'renamed':
# se non è già applicato # se non è già applicato
if not (filetools.isfile(addonDir + file['filename']) and getSha( if not (filetools.isfile(addonDir + file['filename']) and getSha(
@@ -257,7 +248,7 @@ def updateFromZip():
filetools.rename(destpathname + "addon-" + branch, addonDir) filetools.rename(destpathname + "addon-" + branch, addonDir)
logger.info("Cancellando il file zip...") logger.info("Cancellando il file zip...")
os.remove(localfilename) remove(localfilename)
dp.update(100) dp.update(100)
return hash return hash
@@ -290,3 +281,14 @@ def _pbhook(numblocks, blocksize, filesize, url, dp):
except: except:
percent = 90 percent = 90
dp.update(percent) dp.update(percent)
def remove(file):
if os.path.isfile(file):
removed = False
while not removed:
try:
os.remove(file)
removed = True
except:
logger.info('File ' + file + ' NON eliminato')