diff options
| -rwxr-xr-x | soas-assimilator.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/soas-assimilator.py b/soas-assimilator.py index b6edb03..1ea7775 100755 --- a/soas-assimilator.py +++ b/soas-assimilator.py @@ -311,16 +311,17 @@ class tDeviceListener (object) : if self.mode == 'write' : self.assimilate(str(props['storage.model']), str(props['block.device']), - int(props['storage.removable.media_size'])) + int(props['storage.removable.media_size']), str(props.get('storage.serial', 'n_a'))) elif self.mode == 'read' : self.readImage(str(props['storage.model']), str(props['block.device']), - int(props['storage.removable.media_size'])) + int(props['storage.removable.media_size']), str(props['storage.serial'])) except : # don't break if we have trouble with a single device, but show the error traceback.print_exc() - def assimilate(self, model, dev_path, dev_size) : + def assimilate(self, model, dev_path, dev_size, serial_nr) : + model = "%s (serial# %s)" % (model, serial_nr) try : image_size, (image_path, image_checksum) = self._find_image(dev_size) @@ -350,8 +351,9 @@ class tDeviceListener (object) : finally : self._write_q_cond.release() - def readImage(self, model, dev_path, dev_size) : - image_prefix = "dump-%s" % (formatSize(dev_size),) + def readImage(self, model, dev_path, dev_size, serial_nr) : + image_prefix = "dump-%s-%s" % (serial_nr.replace('/', '_').replace(':', '_'), formatSize(dev_size)) + model = "%s (serial# %s)" % (model, serial_nr) thread = ReadThread(dev_path, model, dev_size, os.path.join(self.image_dir, image_prefix), self.status_cb) thread.start() |