Generate each label individually to always get fresh template rendering (new UUIDs, random and counter values as well as current datetime)

Signed-off-by: DL6ER <[email protected]>

Author: DL6ER

app/labeldesigner/label.py

@@ -92,6 +92,7 @@ def __init__(
             border_distance=(0, 0),
             border_color=(0, 0, 0),
             timestamp=0,
+            counter=1,
             red_support=False):
         self._width = width
         self._height = height
@@ -111,7 +112,7 @@ def __init__(
         self._border_roundness = border_roundness
         self._border_distance = border_distance
         self._border_color = border_color
-        self._counter = 1
+        self._counter = counter
         self._timestamp = timestamp
         self._red_support = red_support
 
@@ -213,9 +214,6 @@ def random_replacer(match):
                 return ''.join(random.choices(string.ascii_letters + string.digits + string.punctuation, k=length))
             line['text'] = re.sub(r"\{\{random(?:\:(\d+))?\}\}", random_replacer, line['text'])
 
-        # Increment counter
-        self._counter += 1
-
     def generate(self, rotate = False):
         # Process possible templates in the text
         self.process_templates()

app/labeldesigner/printer.py

@@ -45,15 +45,12 @@ def label_size(self):
     def label_size(self, value):
         self._label_size = value
 
-    def add_label_to_queue(self, label, count, cut_once=False, high_res: bool = False):
-        for cnt in range(0, count):
-            cut = (cut_once == False) or (cut_once and cnt == count-1)
-
-            self._printQueue.append(
-                {'label': label,
-                 'cut': cut,
-                 'high_res': high_res
-                 })
+    def add_label_to_queue(self, label, cut: bool = True, high_res: bool = False):
+        self._printQueue.append(
+            {'label': label,
+             'cut': cut,
+             'high_res': high_res
+             })
 
     def process_queue(self) -> bool:
         qlr = BrotherQLRaster(self._model)

app/labeldesigner/routes.py

@@ -115,7 +115,6 @@ def print_label():
             if isinstance(level, int):
                 current_app.logger.setLevel(level)
         printer = create_printer_from_request(request)
-        label = create_label_from_request(request)
         print_count = int(request.values.get('print_count', 1))
         if print_count < 1:
             raise ValueError("print_count must be greater than 0")
@@ -127,9 +126,15 @@ def print_label():
         # Generate error 400 response
         return make_response(jsonify(return_dict), 400)
 
-    printer.add_label_to_queue(label, print_count, cut_once, high_res)
-
     try:
+        for i in range(print_count):
+            label = create_label_from_request(request, i + 1)
+            # Cut only if we
+            # - always cut, or
+            # - we cut only once and this is the last label to be generated
+            cut = (cut_once == False) or (cut_once and i == print_count-1)
+            printer.add_label_to_queue(label, cut, high_res)
+
         status = printer.process_queue()
     except Exception as e:
         return_dict['message'] = str(e)
@@ -159,7 +164,7 @@ def parse_text_form(input):
         return []
     return json.loads(input)
 
-def create_label_from_request(request):
+def create_label_from_request(request, counter: int = 1):
     d=request.values
     label_size = d.get('label_size', "62")
     kind = [label.form_factor for label in ALL_LABELS if label.identifier == label_size][0]
@@ -312,5 +317,6 @@ def get_uploaded_image(image):
         border_roundness=context['border_roundness'],
         border_distance=(context['border_distanceX'], context['border_distanceY']),
         border_color=border_color,
-        timestamp=context['timestamp']
+        timestamp=context['timestamp'],
+        counter=counter
     )