From d38846f126413bec8685c87beb8d681826a6de22 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Fri, 31 May 2019 15:08:30 +0200 Subject: [PATCH] Rev4099, Fix ZipStream for older Python versions --- plugins/Sidebar/ZipStream.py | 8 +++++--- src/Config.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/Sidebar/ZipStream.py b/plugins/Sidebar/ZipStream.py index b600ddc7..b6e05b21 100644 --- a/plugins/Sidebar/ZipStream.py +++ b/plugins/Sidebar/ZipStream.py @@ -6,6 +6,7 @@ class ZipStream(object): def __init__(self, dir_path): self.dir_path = dir_path self.pos = 0 + self.buff_pos = 0 self.zf = zipfile.ZipFile(self, 'w', zipfile.ZIP_DEFLATED, allowZip64=True) self.buff = io.BytesIO() self.file_list = self.getFileList() @@ -27,6 +28,7 @@ class ZipStream(object): back = self.buff.read() self.buff.truncate(0) self.buff.seek(0) + self.buff_pos += len(back) return back def write(self, data): @@ -37,9 +39,9 @@ class ZipStream(object): return self.pos def seek(self, pos, whence=0): - self.buff.seek(pos, whence) - self.pos = pos - pass + if pos >= self.buff_pos: + self.buff.seek(pos - self.buff_pos, whence) + self.pos = pos def flush(self): pass diff --git a/src/Config.py b/src/Config.py index 4ee95084..ae0428f8 100644 --- a/src/Config.py +++ b/src/Config.py @@ -13,7 +13,7 @@ class Config(object): def __init__(self, argv): self.version = "0.7.0" - self.rev = 4098 + self.rev = 4099 self.argv = argv self.action = None self.pending_changes = {}