aea652c703
-Ridefinito il modo in cui vengono scritti i canali, per assicurare migliore stabilità, debuggabilità e coerenza -Riscritti di conseguenza molti canali, corregendo di fatto moltissimi problemi che avete segnalato -Quando aggiungi in videoteca da fonti in più lingue (ita/sub ita) o più qualità, ti viene chiesto quale tipo di fonte vuoi. -Per gli amanti degli anime, aggiunto VVVVID (senza bisogno di account!) -Aggiunti i server supervideo e hdload, fixato wstream -migliorie varie
352 lines
12 KiB
Python
352 lines
12 KiB
Python
# -*- coding: utf-8 -*-
|
|
import hashlib
|
|
import io
|
|
import os
|
|
import shutil
|
|
from cStringIO import StringIO
|
|
|
|
from core import httptools, filetools
|
|
from platformcode import logger, platformtools
|
|
import json
|
|
import xbmc
|
|
import re
|
|
import xbmcaddon
|
|
from lib import githash
|
|
import urllib
|
|
|
|
addon = xbmcaddon.Addon('plugin.video.kod')
|
|
|
|
_hdr_pat = re.compile("^@@ -(\d+),?(\d+)? \+(\d+),?(\d+)? @@.*")
|
|
|
|
branch = 'stable'
|
|
user = 'kodiondemand'
|
|
repo = 'addon'
|
|
addonDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))).replace('\\', '/') + '/'
|
|
maxPage = 5 # le api restituiscono 30 commit per volta, quindi se si è rimasti troppo indietro c'è bisogno di andare avanti con le pagine
|
|
trackingFile = "last_commit.txt"
|
|
|
|
|
|
def loadCommits(page=1):
|
|
apiLink = 'https://api.github.com/repos/' + user + '/' + repo + '/commits?sha=' + branch + "&page=" + str(page)
|
|
logger.info(apiLink)
|
|
# riprova ogni secondo finchè non riesce (ad esempio per mancanza di connessione)
|
|
while True:
|
|
try:
|
|
commitsLink = httptools.downloadpage(apiLink).data
|
|
ret = json.loads(commitsLink)
|
|
break
|
|
except:
|
|
xbmc.sleep(1000)
|
|
|
|
return ret
|
|
|
|
|
|
def check_addon_init():
|
|
if not addon.getSetting('addon_update_enabled'):
|
|
return False
|
|
logger.info('Cerco aggiornamenti..')
|
|
commits = loadCommits()
|
|
|
|
try:
|
|
localCommitFile = open(addonDir+trackingFile, 'r+')
|
|
except:
|
|
calcCurrHash()
|
|
localCommitFile = open(addonDir + trackingFile, 'r+')
|
|
localCommitSha = localCommitFile.read()
|
|
localCommitSha = localCommitSha.replace('\n', '') # da testare
|
|
logger.info('Commit locale: ' + localCommitSha)
|
|
updated = False
|
|
|
|
pos = None
|
|
for n, c in enumerate(commits):
|
|
if c['sha'] == localCommitSha:
|
|
pos = n
|
|
break
|
|
else:
|
|
# evitiamo che dia errore perchè il file è già in uso
|
|
localCommitFile.close()
|
|
calcCurrHash()
|
|
return True
|
|
|
|
if pos > 0:
|
|
changelog = ''
|
|
nCommitApplied = 0
|
|
for c in reversed(commits[:pos]):
|
|
commit = httptools.downloadpage(c['url']).data
|
|
commitJson = json.loads(commit)
|
|
# evitiamo di applicare i merge commit
|
|
if 'Merge' in commitJson['commit']['message']:
|
|
continue
|
|
logger.info('aggiornando a ' + commitJson['sha'])
|
|
alreadyApplied = True
|
|
|
|
# major update
|
|
if len(commitJson['files']) > 50:
|
|
localCommitFile.close()
|
|
c['sha'] = updateFromZip('Aggiornamento in corso...')
|
|
localCommitFile = open(addonDir + trackingFile, 'w') # il file di tracking viene eliminato, lo ricreo
|
|
changelog += commitJson['commit']['message'] + " | "
|
|
nCommitApplied += 3 # il messaggio sarà lungo, probabilmente, il tempo di vis. è maggiorato
|
|
break
|
|
|
|
for file in commitJson['files']:
|
|
if file["filename"] == trackingFile: # il file di tracking non si modifica
|
|
continue
|
|
else:
|
|
logger.info(file["filename"])
|
|
if file['status'] == 'modified' or file['status'] == 'added':
|
|
if 'patch' in file:
|
|
text = ""
|
|
try:
|
|
localFile = open(addonDir + file["filename"], 'r+')
|
|
text = localFile.read()
|
|
except IOError: # nuovo file
|
|
# crea le cartelle se non esistono
|
|
dirname = os.path.dirname(addonDir + file["filename"])
|
|
if not os.path.exists(dirname):
|
|
os.makedirs(dirname)
|
|
|
|
localFile = open(addonDir + file["filename"], 'w')
|
|
|
|
patched = apply_patch(text, (file['patch']+'\n').encode('utf-8'))
|
|
if patched != text: # non eseguo se già applicata (es. scaricato zip da github)
|
|
if getShaStr(patched) == file['sha']:
|
|
localFile.seek(0)
|
|
localFile.truncate()
|
|
localFile.writelines(patched)
|
|
localFile.close()
|
|
alreadyApplied = False
|
|
else: # nel caso ci siano stati problemi
|
|
logger.info('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
|
|
# se non è già applicato
|
|
if not (filetools.isfile(addonDir + file['filename']) and getSha(addonDir + file['filename']) == file['sha']):
|
|
urllib.urlretrieve(file['raw_url'], os.path.join(addonDir, file['filename']))
|
|
alreadyApplied = False
|
|
elif file['status'] == 'removed':
|
|
remove(addonDir+file["filename"])
|
|
alreadyApplied = False
|
|
elif file['status'] == 'renamed':
|
|
# se non è già applicato
|
|
if not (filetools.isfile(addonDir + file['filename']) and getSha(addonDir + file['filename']) == file['sha']):
|
|
dirs = file['filename'].split('/')
|
|
for d in dirs[:-1]:
|
|
if not filetools.isdir(addonDir + d):
|
|
filetools.mkdir(addonDir + d)
|
|
filetools.move(addonDir + file['previous_filename'], addonDir + file['filename'])
|
|
alreadyApplied = False
|
|
if not alreadyApplied: # non mando notifica se già applicata (es. scaricato zip da github)
|
|
changelog += commitJson['commit']['message'] + " | "
|
|
nCommitApplied += 1
|
|
if addon.getSetting("addon_update_message"):
|
|
time = nCommitApplied * 2000 if nCommitApplied < 10 else 20000
|
|
platformtools.dialog_notification('Kodi on Demand', 'Aggiornamenti applicati:\n' + changelog[:-3], time)
|
|
|
|
localCommitFile.seek(0)
|
|
localCommitFile.truncate()
|
|
localCommitFile.writelines(c['sha'])
|
|
localCommitFile.close()
|
|
xbmc.executebuiltin("UpdateLocalAddons")
|
|
else:
|
|
logger.info('Nessun nuovo aggiornamento')
|
|
|
|
return updated
|
|
|
|
|
|
def calcCurrHash():
|
|
treeHash = githash.tree_hash(addonDir).hexdigest()
|
|
logger.info('tree hash: ' + treeHash)
|
|
commits = loadCommits()
|
|
lastCommitSha = commits[0]['sha']
|
|
page = 1
|
|
while commits and page <= maxPage:
|
|
found = False
|
|
for n, c in enumerate(commits):
|
|
if c['commit']['tree']['sha'] == treeHash:
|
|
localCommitFile = open(addonDir + trackingFile, 'w')
|
|
localCommitFile.write(c['sha'])
|
|
localCommitFile.close()
|
|
found = True
|
|
break
|
|
else:
|
|
page += 1
|
|
commits = loadCommits(page)
|
|
|
|
if found:
|
|
break
|
|
else:
|
|
logger.info('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(addonDir + trackingFile, 'w')
|
|
localCommitFile.write(hash if hash else lastCommitSha)
|
|
localCommitFile.close()
|
|
|
|
|
|
# https://gist.github.com/noporpoise/16e731849eb1231e86d78f9dfeca3abc Grazie!
|
|
|
|
def apply_patch(s,patch,revert=False):
|
|
"""
|
|
Apply unified diff patch to string s to recover newer string.
|
|
If revert is True, treat s as the newer string, recover older string.
|
|
"""
|
|
s = s.splitlines(True)
|
|
p = patch.splitlines(True)
|
|
t = ''
|
|
i = sl = 0
|
|
(midx,sign) = (1,'+') if not revert else (3,'-')
|
|
while i < len(p) and p[i].startswith(("---","+++")): i += 1 # skip header lines
|
|
while i < len(p):
|
|
m = _hdr_pat.match(p[i])
|
|
if not m: raise Exception("Cannot process diff")
|
|
i += 1
|
|
l = int(m.group(midx))-1 + (m.group(midx+1) == '0')
|
|
t += ''.join(s[sl:l])
|
|
sl = l
|
|
while i < len(p) and p[i][0] != '@':
|
|
if i+1 < len(p) and p[i+1][0] == '\\': line = p[i][:-1]; i += 2
|
|
else: line = p[i]; i += 1
|
|
if len(line) > 0:
|
|
if line[0] == sign or line[0] == ' ': t += line[1:]
|
|
sl += (line[0] != sign)
|
|
t += ''.join(s[sl:])
|
|
return t
|
|
|
|
|
|
def getSha(path):
|
|
try:
|
|
f = open(path, 'rb')
|
|
except:
|
|
return ''
|
|
size = len(f.read())
|
|
f.seek(0)
|
|
return githash.blob_hash(f, size).hexdigest()
|
|
|
|
|
|
def getShaStr(str):
|
|
return githash.blob_hash(StringIO(str), len(str)).hexdigest()
|
|
|
|
|
|
def updateFromZip(message='Installazione in corso...'):
|
|
dp = platformtools.dialog_progress_bg('Kodi on Demand', message)
|
|
dp.update(0)
|
|
|
|
remotefilename = 'https://github.com/' + user + "/" + repo + "/archive/" + branch + ".zip"
|
|
localfilename = (xbmc.translatePath("special://home/addons/") + "plugin.video.kod.update.zip").encode('utf-8')
|
|
destpathname = xbmc.translatePath("special://home/addons/")
|
|
|
|
logger.info("remotefilename=%s" % remotefilename)
|
|
logger.info("localfilename=%s" % localfilename)
|
|
|
|
# pulizia preliminare
|
|
remove(localfilename)
|
|
removeTree(destpathname + "addon-" + branch)
|
|
|
|
urllib.urlretrieve(remotefilename, localfilename,
|
|
lambda nb, bs, fs, url=remotefilename: _pbhook(nb, bs, fs, url, dp))
|
|
|
|
# Lo descomprime
|
|
logger.info("decompressione...")
|
|
logger.info("destpathname=%s" % destpathname)
|
|
|
|
try:
|
|
hash = fixZipGetHash(localfilename)
|
|
import zipfile
|
|
with zipfile.ZipFile(io.FileIO(localfilename), "r") as zip_ref:
|
|
zip_ref.extractall(destpathname)
|
|
except Exception as e:
|
|
logger.info('Non sono riuscito ad estrarre il file zip')
|
|
logger.info(e)
|
|
dp.close()
|
|
return False
|
|
|
|
dp.update(95)
|
|
|
|
# puliamo tutto
|
|
removeTree(addonDir)
|
|
xbmc.sleep(1000)
|
|
|
|
rename(destpathname + "addon-" + branch, addonDir)
|
|
|
|
logger.info("Cancellando il file zip...")
|
|
remove(localfilename)
|
|
|
|
dp.update(100)
|
|
dp.close()
|
|
xbmc.executebuiltin("UpdateLocalAddons")
|
|
|
|
return hash
|
|
|
|
|
|
def remove(file):
|
|
if os.path.isfile(file):
|
|
try:
|
|
os.remove(file)
|
|
except:
|
|
logger.info('File ' + file + ' NON eliminato')
|
|
|
|
|
|
def onerror(func, path, exc_info):
|
|
"""
|
|
Error handler for ``shutil.rmtree``.
|
|
|
|
If the error is due to an access error (read only file)
|
|
it attempts to add write permission and then retries.
|
|
|
|
If the error is for another reason it re-raises the error.
|
|
|
|
Usage : ``shutil.rmtree(path, onerror=onerror)``
|
|
"""
|
|
import stat
|
|
if not os.access(path, os.W_OK):
|
|
# Is the error an access error ?
|
|
os.chmod(path, stat.S_IWUSR)
|
|
func(path)
|
|
else:
|
|
raise
|
|
|
|
def removeTree(dir):
|
|
if os.path.isdir(dir):
|
|
try:
|
|
shutil.rmtree(dir, ignore_errors=False, onerror=onerror)
|
|
except Exception as e:
|
|
logger.info('Cartella ' + dir + ' NON eliminata')
|
|
logger.error(e)
|
|
|
|
|
|
def rename(dir1, dir2):
|
|
try:
|
|
filetools.rename(dir1, dir2)
|
|
except:
|
|
logger.info('cartella ' + dir1 + ' NON rinominata')
|
|
|
|
|
|
# https://stackoverflow.com/questions/3083235/unzipping-file-results-in-badzipfile-file-is-not-a-zip-file
|
|
def fixZipGetHash(zipFile):
|
|
f = io.FileIO(zipFile, 'r+b')
|
|
data = f.read()
|
|
pos = data.find(b'\x50\x4b\x05\x06') # End of central directory signature
|
|
hash = ''
|
|
if pos > 0:
|
|
f.seek(pos + 20) # +20: see secion V.I in 'ZIP format' link above.
|
|
hash = f.read()[2:]
|
|
f.seek(pos + 20)
|
|
f.truncate()
|
|
f.write(
|
|
b'\x00\x00') # Zip file comment length: 0 byte length; tell zip applications to stop reading.
|
|
f.seek(0)
|
|
|
|
f.close()
|
|
|
|
return str(hash)
|
|
|
|
|
|
def _pbhook(numblocks, blocksize, filesize, url, dp):
|
|
try:
|
|
percent = min((numblocks*blocksize*90)/filesize, 100)
|
|
dp.update(percent)
|
|
except:
|
|
percent = 90
|
|
dp.update(percent) |