beremiz

Runtime: change PLCObject 'BlobAsFile' method to allow customization by overriding
mc9_backport_2
2020-12-22, Edouard Tisserant
865d254e7076
Parents d993825e3dc0
Children f8799cbc0d02
Runtime: change PLCObject 'BlobAsFile' method to allow customization by overriding
1 files changed, 6 insertions(+), 3 deletions(-)
  • +6 -3
    runtime/PLCObject.py
    • --- a/runtime/PLCObject.py Mon Dec 21 11:10:27 2020 +0100
    +++ b/runtime/PLCObject.py Tue Dec 22 14:53:15 2020 +0100
    @@ -545,12 +545,15 @@
    os.close(fd)
    self._init_blobs()
    - def _BlobAsFile(self, blobID, newpath):
    + def BlobAsFile(self, blobID, newpath):
    blob = self.blobs.pop(blobID, None)
    if blob is None:
    raise Exception(_("Missing data to create file: {}").format(newpath))
    + self._BlobAsFile(blob, newpath)
    +
    + def _BlobAsFile(self, blob, newpath):
    fd, path, _md5sum = blob
    fobj = os.fdopen(fd)
    fobj.flush()
    @@ -609,13 +612,13 @@
    try:
    # Create new PLC file
    - self._BlobAsFile(plc_object, new_PLC_filename)
    + self.BlobAsFile(plc_object, new_PLC_filename)
    # Then write the files
    log = open(extra_files_log, "w")
    for fname, blobID in extrafiles:
    fpath = os.path.join(self.workingdir, fname)
    - self._BlobAsFile(blobID, fpath)
    + self.BlobAsFile(blobID, fpath)
    log.write(fname+'\n')
    # Store new PLC filename based on md5 key