basic backup added

added store manager that creates store an backup and the comms objects.
strore test adapted to the new version of the program

Author: UrszulaNeuman

dls_barcode/data_store/backup.py

@@ -9,26 +9,26 @@ class Backup:
     Backup class maintains the short time backaup of records which is kept in the same folder as the store files.
     """
 
-    def __init__(self, directory, backup_time):
-        self.comms = CommsManager(directory, "backup")
-        self.backup_time = backup_time
-        self.records = self.comms.load_records_from_file()
+    def __init__(self, comms_man, backup_time):
+        self._comms = comms_man
+        self._backup_time = backup_time.value()
+        self._records = self._comms.load_records_from_file()
         self._truncate_record_list()
 
     def _truncate_record_list(self):
-        for record in self.records:
+        for record in self._records:
             if self._is_old(record):
-                self.records.remove(record)
+                self._records.remove(record)
 
     def backup_records(self, to_back):
-        self.records.extend(to_back)
+        self._records.extend(to_back)
         self._truncate_record_list()
-        self.comms.to_csv_file(self.records)
+        self._comms.to_csv_file(self._records)
 
     def _is_old(self, record):
         tm = time.time()
         record_time = record.timestamp
         delta = tm - record_time
-        weeks = self.backup_time * 604800  # weeks in seconds
+        weeks = self._backup_time * 604800  # weeks in seconds
         return delta > weeks
 

dls_barcode/data_store/comms_manager.py

@@ -10,7 +10,7 @@ class CommsManager:
 
     def __init__(self, directory, file_name):
         self._file_manager = FileManager()
-        self._directory = directory
+        self._directory = directory.value()
         self._file_name = file_name
 
     def load_records_from_file(self):
@@ -45,9 +45,11 @@ def to_csv_file(self, records):
         record_lines = [rec.to_csv_string() + "\n" for rec in records]
         self._file_manager.write_lines(csv_file, record_lines)
 
-    def make_img_dir(self, img_dir):
+    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
 
     def remove_img_file(self, record):
         if self._file_manager.is_file(record.image_path):

dls_barcode/data_store/store.py

@@ -1,8 +1,6 @@
 import uuid
 import os
 
-from dls_barcode.data_store.backup import Backup
-from dls_barcode.data_store.comms_manager import CommsManager
 from .record import Record
 
 
@@ -13,15 +11,13 @@ class Store:
     """
     MIN_STORE_CAPACITY = 2
 
-    def __init__(self, directory, store_capacity, backup_time):
+    def __init__(self, comms_manager, backup, store_capacity):
         """ Initializes a new instance of Store.
         """
         self._store_capacity = store_capacity
-        self._backup = Backup(directory, backup_time)
-        self._comms_manager = CommsManager(directory, "store")
-        self._img_dir = os.path.join(directory, "img_dir")
-        self._comms_manager.make_img_dir(self._img_dir)
-
+        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._sort_records()

dls_barcode/data_store/store_manager.py

@@ -0,0 +1,31 @@
+from dls_barcode.data_store import Store
+from dls_barcode.data_store.backup import Backup
+from dls_barcode.data_store.comms_manager import CommsManager
+
+
+class StoreManager:
+
+    def __init__(self, directory, store_capacity, backup_time):
+        self._store_capacity = store_capacity
+        self._directory = directory
+        self._backup_time = backup_time
+
+    def create_store(self):
+        comms_manager = self._create_store_comms_manager()
+        backup_comms_manager = self._create_backup_comms_manager()
+        backup = self._create_backup(backup_comms_manager)
+        return Store(comms_manager, backup, self._store_capacity)
+
+    def _create_store_comms_manager(self):
+        return CommsManager(self._directory, "store")
+
+    def _create_backup(self, backup_comms_manager):
+        return Backup(backup_comms_manager, self._backup_time)
+
+    def _create_backup_comms_manager(self):
+        return CommsManager(self._directory, "backup")
+
+
+
+
+

dls_barcode/gui/record_table.py

@@ -5,6 +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
 
 # todo: allow delete key to be used for deletion
@@ -22,7 +23,7 @@ def __init__(self, barcode_table, image_frame, options):
         super(ScanRecordTable, self).__init__()
 
         # Read the store from file
-        self._store = Store(options.store_directory.value(), options.store_capacity, 3)#options.backup_time
+        self._store = StoreManager(options.store_directory, options.store_capacity, options.backup_time).create_store()
         self._options = options
 
         self._barcodeTable = barcode_table

tests/system_tests/test_unipuck_scan.py

@@ -2,6 +2,7 @@
 
 from dls_barcode.config.barcode_config import BarcodeConfig
 from dls_barcode.data_store import Store
+from dls_barcode.data_store.store_manager import StoreManager
 from dls_barcode.scan import GeometryScanner
 from dls_util.image import Image
 from dls_util.file import FileManager
@@ -15,11 +16,11 @@
 OPTIONS = BarcodeConfig(CONFIG_FILE, FILE_MANAGER)
 
 # Clear store before creating a new one
-store_dir = OPTIONS.store_directory.value()
+store_dir = OPTIONS.store_directory
 if os.path.isdir(store_dir):
     shutil.rmtree(store_dir)
 
-STORE = Store(store_dir, OPTIONS.store_capacity, FILE_MANAGER)
+STORE = StoreManager(store_dir, OPTIONS.store_capacity, OPTIONS.backup_time).create_store()
 
 
 def test_generator():

tests/system_tests/test_unipuck_scan_locator.py

@@ -5,6 +5,7 @@
 
 from dls_barcode.config.barcode_config import BarcodeConfig
 from dls_barcode.data_store import Store
+from dls_barcode.data_store.store_manager import StoreManager
 from dls_barcode.geometry.unipuck import Unipuck
 from dls_barcode.scan import GeometryScanner
 from dls_util import Color
@@ -22,11 +23,11 @@
 OPTIONS = BarcodeConfig(CONFIG_FILE, FILE_MANAGER)
 
 # Clear store before creating a new one
-store_dir = OPTIONS.store_directory.value()
+store_dir = OPTIONS.store_directory
 if os.path.isdir(store_dir):
     shutil.rmtree(store_dir)
 
-STORE = Store(store_dir, OPTIONS.store_capacity, FILE_MANAGER)
+STORE = StoreManager(store_dir, OPTIONS.store_capacity, OPTIONS.backup_time).create_store()
 
 def test_generator():
     TEST_CASES = generate_test_cases()