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

fix updater

Browse Source
This commit is contained in:
marco
2019-10-09 18:09:48 +02:00
parent 491ed144c8
commit 0afd723690
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platformcode/updater.py
+6 -2
View File
@@ -3,6 +3,7 @@ import hashlib
import io import io
import os import os
import shutil import shutil
from cStringIO import StringIO
from core import httptools, filetools, downloadtools from core import httptools, filetools, downloadtools
from core.ziptools import ziptools from core.ziptools import ziptools
@@ -100,7 +101,7 @@ def check_addon_init():
patched = apply_patch(text, (file['patch']+'\n').encode('utf-8')) patched = apply_patch(text, (file['patch']+'\n').encode('utf-8'))
if patched != text: # non eseguo se già applicata (es. scaricato zip da github) if patched != text: # non eseguo se già applicata (es. scaricato zip da github)
if getSha(patched) == file['sha']: if getShaStr(patched) == file['sha']:
localFile.seek(0) localFile.seek(0)
localFile.truncate() localFile.truncate()
localFile.writelines(patched) localFile.writelines(patched)
@@ -210,7 +211,10 @@ def apply_patch(s,patch,revert=False):
def getSha(path): def getSha(path):
f = open(path).read() f = open(path).read()
return githash.generic_hash(path, '100644', len(f)).hexdigest() return githash.blob_hash(path, len(f)).hexdigest()
def getShaStr(str):
return githash.blob_hash(StringIO(str), len(str)).hexdigest()
def updateFromZip(): def updateFromZip():