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

- logger.info -> logger.log

Browse Source 
- fix unshortenit kodi 19
This commit is contained in:
Alhaziel01
2020-08-17 11:17:55 +02:00
parent bfb80f6889
commit c7e41f41a2
162 changed files with 1011 additions and 1034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
platformcode/updater.py
View File

@@ -34,7 +34,7 @@ changelogFile = "special://profile/addon_data/plugin.video.kod/changelog.txt"
def loadCommits(page=1):
apiLink = 'https://api.github.com/repos/' + user + '/' + repo + '/commits?sha=' + branch + "&page=" + str(page)
logger.info(apiLink)
logger.log(apiLink)
# riprova ogni secondo finchè non riesce (ad esempio per mancanza di connessione)
for n in range(10):
try:
@@ -54,7 +54,7 @@ def loadCommits(page=1):
def check(background=False):
if not addon.getSetting('addon_update_enabled'):
return False, False
logger.info('Cerco aggiornamenti..')
logger.log('Cerco aggiornamenti..')
commits = loadCommits()
if not commits:
return False, False
@@ -66,7 +66,7 @@ def check(background=False):
localCommitFile = open(os.path.join(addonDir, trackingFile), 'r+')
localCommitSha = localCommitFile.read()
localCommitSha = localCommitSha.replace('\n', '') # da testare
logger.info('Commit locale: ' + localCommitSha)
logger.log('Commit locale: ' + localCommitSha)
updated = False
serviceChanged = False
@@ -91,7 +91,7 @@ def check(background=False):
# evitiamo di applicare i merge commit
if 'Merge' in commitJson['commit']['message']:
continue
logger.info('aggiornando a ' + commitJson['sha'])
logger.log('aggiornando a ' + commitJson['sha'])
alreadyApplied = True
# major update
@@ -108,7 +108,7 @@ def check(background=False):
if file["filename"] == trackingFile: # il file di tracking non si modifica
continue
else:
logger.info(file["filename"])
logger.log(file["filename"])
if 'resources/language' in file["filename"]:
poFilesChanged = True
if 'service.py' in file["filename"]:
@@ -138,7 +138,7 @@ def check(background=False):
localFile.writelines(patched)
localFile.close()
else: # nel caso ci siano stati problemi
logger.info('lo sha non corrisponde, scarico il file')
logger.log('lo sha non corrisponde, scarico il file')
localFile.close()
urllib.urlretrieve(file['raw_url'], os.path.join(addonDir, file['filename']))
else: # è un file NON testuale, lo devo scaricare
@@ -191,7 +191,7 @@ def check(background=False):
elif changelog:
platformtools.dialog_ok(config.get_localized_string(20000), config.get_localized_string(80041) + changelog)
else:
logger.info('Nessun nuovo aggiornamento')
logger.log('Nessun nuovo aggiornamento')
return updated, serviceChanged
@@ -207,7 +207,7 @@ def showSavedChangelog():
def calcCurrHash():
treeHash = githash.tree_hash(addonDir).hexdigest()
logger.info('tree hash: ' + treeHash)
logger.log('tree hash: ' + treeHash)
commits = loadCommits()
lastCommitSha = commits[0]['sha']
page = 1
@@ -227,7 +227,7 @@ def calcCurrHash():
if found:
break
else:
logger.info('Non sono riuscito a trovare il commit attuale, scarico lo zip')
logger.log('Non sono riuscito a trovare il commit attuale, scarico lo zip')
hash = updateFromZip()
# se ha scaricato lo zip si trova di sicuro all'ultimo commit
localCommitFile = open(os.path.join(xbmc.translatePath("special://home/addons/"), 'plugin.video.kod', trackingFile), 'w')
@@ -294,9 +294,9 @@ def updateFromZip(message=config.get_localized_string(80050)):
destpathname = xbmc.translatePath("special://home/addons/")
extractedDir = filetools.join(destpathname, "addon-" + branch)
logger.info("remotefilename=%s" % remotefilename)
logger.info("localfilename=%s" % localfilename)
logger.info('extract dir: ' + extractedDir)
logger.log("remotefilename=%s" % remotefilename)
logger.log("localfilename=%s" % localfilename)
logger.log('extract dir: ' + extractedDir)
# pulizia preliminare
remove(localfilename)
@@ -307,24 +307,24 @@ def updateFromZip(message=config.get_localized_string(80050)):
lambda nb, bs, fs, url=remotefilename: _pbhook(nb, bs, fs, url, dp))
except Exception as e:
platformtools.dialog_ok(config.get_localized_string(20000), config.get_localized_string(80031))
logger.info('Non sono riuscito a scaricare il file zip')
logger.info(e)
logger.log('Non sono riuscito a scaricare il file zip')
logger.log(e)
dp.close()
return False
# Lo descomprime
logger.info("decompressione...")
logger.info("destpathname=%s" % destpathname)
logger.log("decompressione...")
logger.log("destpathname=%s" % destpathname)
if os.path.isfile(localfilename):
logger.info('il file esiste')
logger.log('il file esiste')
dp.update(80, config.get_localized_string(20000) + '\n' + config.get_localized_string(80032))
import zipfile
try:
hash = fixZipGetHash(localfilename)
logger.info(hash)
logger.log(hash)
with zipfile.ZipFile(filetools.file_open(localfilename, 'rb', vfs=False)) as zip:
size = sum([zinfo.file_size for zinfo in zip.filelist])
@@ -335,7 +335,7 @@ def updateFromZip(message=config.get_localized_string(80050)):
dp.update(int(80 + cur_size * 15 / size))
except Exception as e:
logger.info('Non sono riuscito ad estrarre il file zip')
logger.log('Non sono riuscito ad estrarre il file zip')
logger.error(e)
import traceback
logger.error(traceback.print_exc())
@@ -355,7 +355,7 @@ def updateFromZip(message=config.get_localized_string(80050)):
rename(extractedDir, 'plugin.video.kod')
addonDir = filetools.join(destpathname, 'plugin.video.kod')
logger.info("Cancellando il file zip...")
logger.log("Cancellando il file zip...")
remove(localfilename)
dp.update(100)
@@ -384,7 +384,7 @@ def remove(file):
try:
os.remove(file)
except:
logger.info('File ' + file + ' NON eliminato')
logger.log('File ' + file + ' NON eliminato')
def onerror(func, path, exc_info):
@@ -411,7 +411,7 @@ def removeTree(dir):
try:
shutil.rmtree(dir, ignore_errors=False, onerror=onerror)
except Exception as e:
logger.info('Cartella ' + dir + ' NON eliminata')
logger.log('Cartella ' + dir + ' NON eliminata')
logger.error(e)
@@ -419,7 +419,7 @@ def rename(dir1, dir2):
try:
filetools.rename(dir1, dir2, silent=True, vfs=False)
except:
logger.info('cartella ' + dir1 + ' NON rinominata')
logger.log('cartella ' + dir1 + ' NON rinominata')
# https://stackoverflow.com/questions/3083235/unzipping-file-results-in-badzipfile-file-is-not-a-zip-file