works fine

Author: UrszulaNeuman

dls_barcode/config/barcode_config.py

@@ -22,8 +22,11 @@ def __init__(self, file, file_manager):
 
         if IS_BUNDLED:
             default_store = "./store/"
+            default_backup = "./backup/"
         else:
             default_store = "../store/"
+            default_backup = "../backup/"
+
 
         self.color_ok = add(ColorConfigItem, "Pin/Puck Read", Color.Green())
         self.color_accept = add(ColorConfigItem, "Puck Partially Read", Color.Yellow())
@@ -43,8 +46,9 @@ def __init__(self, file, file_manager):
         self.image_crop = add(BoolConfigItem, "Crop to Puck", default=True)
 
         self.store_directory = add(DirectoryConfigItem, "Store Directory", default=default_store)
-        self.store_capacity = add(IntConfigItem, "Results History Size", default=50)
-        self.backup_time = add(IntConfigItem, "Backup in Weeks", default=3)
+        self.backup = add(BoolConfigItem, "Backup before Delete", default=True)
+        self.backup_directory = add(DirectoryConfigItem, "Backup Directory", default=default_backup)
+
 
         self.console_frame = add(BoolConfigItem, "Print Frame Summary", default=False)
         self.slot_images = add(BoolConfigItem, "Save Debug Images", default=False)
@@ -60,6 +64,12 @@ def __init__(self, file, file_manager):
 
         self.initialize_from_file()
 
+    def get_store_directory(self):
+        return self.store_directory.value()
+
+    def get_backup_directory(self):
+        return self.backup_directory.value()
+
     def col_ok(self):
         return self.color_ok.value()
 

dls_barcode/config/barcode_config_dialog.py

@@ -55,8 +55,8 @@ def _init_ui(self):
 
         self.start_group("Store")
         self._add_control(StoreDirectoryConfigControl(cfg.store_directory))
-        add(cfg.backup_time)
-        add(cfg.store_capacity)
+        add(cfg.backup)
+        add(cfg.backup_directory)
 
         self.start_group("Debug")
         add(cfg.console_frame)

dls_barcode/data_store/backup.py

@@ -1,33 +1,13 @@
-import time
-
-from dls_barcode.data_store.comms_manager import CommsManager
-
-
 class Backup:
 
     """
     Backup class maintains the short time backaup of records which is kept in the same folder as the store files.
     """
 
-    WEEK_IN_SECONDS = 604800
-
-    def __init__(self, comms_man, backup_time):
+    def __init__(self, comms_man):
         self._comms = comms_man
-        self._backup_time = backup_time.value()
-        self._records = self._comms.load_records_from_file()
-
-    def _truncate_record_list(self):
-        self._records = list(filter(lambda x: not self._is_old(x), self._records))
 
     def backup_records(self, to_back):
-        self._records.extend(to_back)
-        self._truncate_record_list()
-        self._comms.to_csv_file(self._records)
+        self._comms.to_csv_file(to_back)
 
-    def _is_old(self, record):
-        tm = time.time()
-        record_time = record.timestamp
-        delta = tm - record_time
-        weeks = self._backup_time * self.WEEK_IN_SECONDS  # weeks in seconds
-        return delta > weeks
 

dls_barcode/data_store/comms_manager.py

@@ -10,8 +10,10 @@ class CommsManager:
 
     def __init__(self, directory, file_name):
         self._file_manager = FileManager()
-        self._directory = directory.value()
+        self._make_dir(directory)
+        self._directory = directory
         self._file_name = file_name
+        self._img_dir = None
 
     def load_records_from_file(self):
         """ Clear the current record store and load a new set of records from the specified file. """
@@ -46,10 +48,15 @@ def to_csv_file(self, records):
         self._file_manager.write_lines(csv_file, record_lines)
 
     def make_img_dir(self):
-        img_dir = os.path.join(self._directory, "img_dir")
-        if not self._file_manager.is_dir(img_dir):
-            self._file_manager.make_dir(img_dir)
-        return img_dir
+        self._img_dir = os.path.join(self._directory, "img_dir")
+        self._make_dir(self._img_dir)
+
+    def get_img_dir(self):
+        return self._img_dir
+
+    def _make_dir(self, dr):
+        if not self._file_manager.is_dir(dr):
+            self._file_manager.make_dir(dr)
 
     def remove_img_file(self, record):
         if self._file_manager.is_file(record.image_path):

dls_barcode/data_store/store.py

@@ -1,6 +1,9 @@
 import uuid
 import os
+import time
 
+from dls_barcode.data_store.backup import Backup
+from dls_barcode.data_store.comms_manager import CommsManager
 from .record import Record
 
 
@@ -9,17 +12,15 @@ class Store:
     """ Maintains a list of records of previous barcodes scans. Any changes (additions
     or deletions) are automatically written to the backing file.
     """
-    MIN_STORE_CAPACITY = 2
 
-    def __init__(self, comms_manager, backup, store_capacity):
+    def __init__(self, comms_manager):
         """ Initializes a new instance of Store.
         """
-        self._store_capacity = store_capacity
-        self._backup = backup
         self._comms_manager = comms_manager
-        self._img_dir = self._comms_manager.make_img_dir()
-        self.records = self._comms_manager.load_records_from_file()
-        self._truncate_record_list()
+        self._comms_manager.make_img_dir()
+        self._img_dir = self._comms_manager.get_img_dir()
+        records = self._comms_manager.load_records_from_file()
+        self.records = records
         self._sort_records()
 
     def size(self):
@@ -53,6 +54,13 @@ def merge_record(self, holder_barcode, plate, holder_img, pins_img):
 
         self._add_record(holder_barcode, plate, holder_img, pins_img)
 
+    def backup_records(self, directory):
+        ts = time.localtime()
+        file_name = time.strftime("%Y-%m-%d_%H-%M-%S", ts)
+        backup_manger = CommsManager(directory, file_name)
+        backup = Backup(backup_manger)
+        backup.backup_records(self.records)
+
     def delete_records(self, records_to_delete):
         """ Remove all of the records in the supplied list from the store and
         save changes to the backing file.
@@ -63,23 +71,11 @@ def delete_records(self, records_to_delete):
 
         self._process_change()
 
-    def backup_records(self, records_to_backup):
-        self._backup.backup_records(records_to_backup)
-
-    def _truncate_record_list(self):
-
-        actual_store_capacity = max(self._store_capacity.value(), self.MIN_STORE_CAPACITY)
-
-        if len(self.records) > actual_store_capacity:
-            to_delete = self.records[actual_store_capacity:]
-            self.backup_records(to_delete)
-            self.delete_records(to_delete)
 
     def _process_change(self):
         """ Sort the records and save to file.
         """
         self._sort_records()
-        self._truncate_record_list()
         self._comms_manager.to_file(self.records)
         self._comms_manager.to_csv_file(self.records)
 

dls_barcode/data_store/store_manager.py

@@ -58,11 +58,14 @@ def interpret_bytes(data_bytes):
                 #log.error(NotImplementedError("Datamatrix Extended Channel Interpretation code not implemented"))
                 raise NotImplementedError("Datamatrix Extended Channel Interpretation code not implemented")
 
-            elif 242 <= byte < 256 or byte == 0:  # Unused parts of message space.
+            elif 242 <= byte < 256:  # Unused parts of message space.
                 #log = log = logging.getLogger(".".join([__name__]))
                 error = ValueError("Code {} is not used in Datamatrix specification".format(byte))
                 #.error(error)
                 raise error
+            elif byte == 0:
+                error = ValueError("Code {} is not used in Datamatrix specification".format(byte))
+                print(error)
 
         return ''.join(m for m in message)
 

dls_barcode/datamatrix/read/interpret.py

@@ -5,8 +5,7 @@
 from PyQt5.QtWidgets import QGroupBox, QVBoxLayout, QHBoxLayout, QTableWidget, QMessageBox
 
 from dls_barcode.data_store import Store
-from dls_barcode.data_store.store_manager import StoreManager
-from dls_util.file import FileManager
+from dls_barcode.data_store.comms_manager import CommsManager
 
 # todo: allow delete key to be used for deletion
 # todo: allow record selection with arrow keys
@@ -23,7 +22,8 @@ def __init__(self, barcode_table, image_frame, options):
         super(ScanRecordTable, self).__init__()
 
         # Read the store from file
-        self._store = StoreManager(options.store_directory, options.store_capacity, options.backup_time).create_store()
+        comms_manger = CommsManager(options.get_store_directory(), "store")
+        self._store = Store(comms_manger)
         self._options = options
 
         self._barcodeTable = barcode_table
@@ -136,7 +136,8 @@ def _delete_selected_records(self):
                 record = self._store.get_record(index)
                 records_to_delete.append(record)
 
-            self._store.backup_records(records_to_delete)
+            if self._options.backup.value():
+                self._store.backup_records(self._options.get_backup_directory())
             self._store.delete_records(records_to_delete)
 
             self._load_store_records()