From 485ce9850fa46593e2556ec2e50b69ef07ce2413 Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 10 Feb 2020 22:48:31 +0100 Subject: [PATCH] fix vari --- lib/githash.py | 2 +- platformcode/launcher.py | 3 --- platformcode/platformtools.py | 2 +- platformcode/updater.py | 4 ++-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/githash.py b/lib/githash.py index cae72976..37b301d0 100644 --- a/lib/githash.py +++ b/lib/githash.py @@ -74,7 +74,7 @@ def blob_hash(stream, size): while True: # We read just 64K at a time to be kind to # runtime storage requirements. - data = stream.read(65536).encode('ascii') + data = stream.read(65536) if data == b'': break nread += len(data) diff --git a/platformcode/launcher.py b/platformcode/launcher.py index df812dc2..71a3df92 100644 --- a/platformcode/launcher.py +++ b/platformcode/launcher.py @@ -83,9 +83,6 @@ def run(item=None): else: item = Item(channel="channelselector", action="getmainlist", viewmode="movie") if not config.get_setting('show_once'): - if not config.dev_mode(): - from platformcode import updater - updater.calcCurrHash() from platformcode import xbmc_videolibrary xbmc_videolibrary.ask_set_content(1, config.get_setting('videolibrary_kodi_force')) config.set_setting('show_once', True) diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index 30019d9e..5f2a0b72 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -797,7 +797,7 @@ def play_video(item, strm=False, force_direct=False, autoplay=False): # Reproduce xbmc_player.play(playlist, xlistitem) else: - set_player(item, xlistitem, mediaurl, view, strm, autoplay) + set_player(item, xlistitem, mediaurl, view, strm) def stop_video(): diff --git a/platformcode/updater.py b/platformcode/updater.py index 658622e4..c389b315 100644 --- a/platformcode/updater.py +++ b/platformcode/updater.py @@ -2,7 +2,7 @@ import io import os import shutil -from lib.six import StringIO +from lib.six import BytesIO from core import filetools from platformcode import logger, platformtools @@ -259,7 +259,7 @@ def getSha(path): def getShaStr(str): - return githash.blob_hash(StringIO(str), len(str)).hexdigest() + return githash.blob_hash(BytesIO(str.encode('utf-8')), len(str)).hexdigest() def updateFromZip(message='Installazione in corso...'):