beremiz

python runtime: fix exception when transfering files with identical content.
py2compat
17 months ago, Edouard Tisserant
b7f5b640f805
Parents 18071ab59cb3
Children 5a17b0e7a360
python runtime: fix exception when transfering files with identical content.
1 files changed, 23 insertions(+), 10 deletions(-)
  • +23 -10
    runtime/PLCObject.py
    • --- a/runtime/PLCObject.py Thu Jan 09 09:45:21 2025 +0100
    +++ b/runtime/PLCObject.py Thu Jan 09 09:46:43 2025 +0100
    @@ -569,42 +569,55 @@
    return getPSKID(partial(self.LogMessage, 0))
    def _init_blobs(self):
    - self.blobs = {}
    + self.blobs = {} # dict of list
    if os.path.exists(self.tmpdir):
    shutil.rmtree(self.tmpdir)
    os.mkdir(self.tmpdir)
    + def _append_blob(self, blob, newBlobID):
    + self.blobs.setdefault(newBlobID,[]).append(blob)
    +
    + def _pop_blob(self, blobID):
    + blobs = self.blobs.pop(blobID, None)
    +
    + if blobs is None:
    + return None
    +
    + blob = blobs.pop()
    + if blobs:
    + # insert same blob list back if not empty
    + blobs = self.blobs[blobID] = blobs
    + return blob
    +
    @RunInMain
    def SeedBlob(self, seed):
    blob = (mkstemp(dir=self.tmpdir) + (hashlib.new('md5'),))
    _fd, _path, md5sum = blob
    md5sum.update(seed)
    newBlobID = md5sum.digest()
    - self.blobs[newBlobID] = blob
    + self._append_blob(blob, newBlobID)
    return newBlobID
    @RunInMain
    def AppendChunkToBlob(self, data, blobID):
    - blob = self.blobs.pop(blobID, None)
    -
    - if blob is None:
    - return None
    + blob = self._pop_blob(blobID)
    fd, _path, md5sum = blob
    md5sum.update(data)
    newBlobID = md5sum.digest()
    os.write(fd, data)
    - self.blobs[newBlobID] = blob
    + self._append_blob(blob, newBlobID)
    return newBlobID
    @RunInMain
    def PurgeBlobs(self):
    - for fd, _path, _md5sum in self.blobs.values():
    - os.close(fd)
    + for blobs in list(self.blobs.values()):
    + for fd, _path, _md5sum in blobs:
    + os.close(fd)
    self._init_blobs()
    def BlobAsFile(self, blobID, newpath):
    - blob = self.blobs.pop(blobID, None)
    + blob = self._pop_blob(blobID)
    if blob is None:
    raise Exception(_("Missing data to create file: {}").format(newpath))