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

ennesimo fix updater (merge commits)

Browse Source
This commit is contained in:
mac12m99
2019-08-22 20:01:00 +02:00
parent 26690d1e69
commit 7e48899b61
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platformcode/updater.py
View File

@@ -11,6 +11,7 @@ import json
import xbmc import xbmc
import re import re
import xbmcaddon import xbmcaddon
from lib import githash
addon = xbmcaddon.Addon('plugin.video.kod') addon = xbmcaddon.Addon('plugin.video.kod')
@@ -72,9 +73,6 @@ def check_addon_init():
for c in reversed(commits[:pos]): for c in reversed(commits[:pos]):
commit = httptools.downloadpage(c['url']).data commit = httptools.downloadpage(c['url']).data
commitJson = json.loads(commit) commitJson = json.loads(commit)
# evitiamo di applicare i merge commit
if 'Merge' in commitJson['commit']['message']:
continue
logger.info('aggiornando a ' + commitJson['sha']) logger.info('aggiornando a ' + commitJson['sha'])
alreadyApplied = True alreadyApplied = True
@@ -140,7 +138,7 @@ def check_addon_init():
filetools.mkdir(addonDir + d) filetools.mkdir(addonDir + d)
filetools.move(addonDir + file['previous_filename'], addonDir + file['filename']) filetools.move(addonDir + file['previous_filename'], addonDir + file['filename'])
alreadyApplied = False alreadyApplied = False
if not alreadyApplied: # non mando notifica se già applicata (es. scaricato zip da github) if not alreadyApplied and 'Merge' not in commitJson['commit']['message']: # non mando notifica se già applicata (es. scaricato zip da github) o se è un merge
changelog += commitJson['commit']['message'] + " | " changelog += commitJson['commit']['message'] + " | "
nCommitApplied += 1 nCommitApplied += 1
if addon.getSetting("addon_update_message"): if addon.getSetting("addon_update_message"):
@@ -159,7 +157,6 @@ def check_addon_init():
def calcCurrHash(): def calcCurrHash():
from lib import githash
treeHash = githash.tree_hash(addonDir).hexdigest() treeHash = githash.tree_hash(addonDir).hexdigest()
logger.info('tree hash: ' + treeHash) logger.info('tree hash: ' + treeHash)
commits = loadCommits() commits = loadCommits()
@@ -220,7 +217,7 @@ def apply_patch(s,patch,revert=False):
def getSha(fileText): def getSha(fileText):
return hashlib.sha1("blob " + str(len(fileText)) + "\0" + fileText).hexdigest() return githash.blob_hash(open(fileText, 'r'), githash.classify(fileText)[2]).hexdigest()
def updateFromZip(): def updateFromZip():