Skip to content

Commit fccbe47

Browse files
committed
Store records should be truncated with every change
1 parent 7463f92 commit fccbe47

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

dls_barcode/data_store/record.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ def to_string(self):
126126
def _all_barcodes(self):
127127
return [self.holder_barcode] + self.barcodes
128128

129-
def image(self):
129+
def _image(self):
130130
image = Image.from_file(self.image_path)
131131
return image
132132

133133
def marked_image(self, options):
134134
geo = self.geometry
135-
image = self.image()
135+
image = self._image()
136136

137137
if options.image_puck.value():
138138
geo.draw_plate(image, Color.Blue())

dls_barcode/data_store/store.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ def _add_record(self, holder_barcode, plate, holder_img, pins_img):
6464

6565
self.records.append(record)
6666
self._process_change()
67-
self._truncate_record_list()
6867

6968
def merge_record(self, holder_barcode, plate, holder_img, pins_img):
7069
""" Create new record or replace existing record if it has the same holder barcode as the most
@@ -86,17 +85,18 @@ def delete_records(self, records_to_delete):
8685
self._process_change()
8786

8887
def _truncate_record_list(self):
89-
number = self._store_capacity.value()
90-
number = max(number, 2)
88+
min_store_capacity = 2
89+
actual_store_capacity = max(self._store_capacity.value(), min_store_capacity)
9190

92-
if len(self.records) > number:
93-
to_delete = self.records[number:]
91+
if len(self.records) > actual_store_capacity:
92+
to_delete = self.records[actual_store_capacity:]
9493
self.delete_records(to_delete)
9594

9695
def _process_change(self):
9796
""" Sort the records and save to file.
9897
"""
9998
self._sort_records()
99+
self._truncate_record_list()
100100
self._to_file()
101101
self._to_csv_file()
102102

0 commit comments

Comments
 (0)