Merge pull request #101 from da-Kai/main

Add barcode to cli --batch

Author: maresb

README.md

@@ -206,14 +206,16 @@ commands are:
 * `NEWLINE`: Adds an additional line to the current block of text or QR. Used to
   create multiline blocks.
 * `QR`: Creates a QR code block
+* `BARCODE`: Creates a barcode block. Optional: Can be preceded by #`TYPE`,
+  to generate a different barcode; default is CODE128, . e.g. `BARCODE#EAN:123456789012`
 
 For instance, this input:
 
 ```text
 LABELLE-LABEL-SPEC-VERSION:1
 TEXT:FD12
 NEWLINE:2013
-QR:1234
+BARCODE:1234
 TEXT:BIG
 TEXT:LINE1
 NEWLINE:LINE2
@@ -223,7 +225,7 @@ QR:12345
 Creates a label with:
 
 * A 2-line text block (first line `FD12`, second line `2013`)
-* Then, a QR code for 1234
+* Then, a barcode code for 1234
 * Then, a line-line text block with the text `BIG`
 * Then, another 2-line text block
 * Finally, a QR code

doc/batch-example.png

@@ -507,22 +507,34 @@ def render_text(lines):
     if batch:
         accumulator: List[str] = []
         accumulator_type: str = "empty"
+        accumulator_options: List[str] = []
 
         def flush_all():
             nonlocal accumulator
             nonlocal accumulator_type
+            nonlocal accumulator_options
             if accumulator_type == "text":
                 render_text(accumulator)
             elif accumulator_type == "qr":
                 render_engines.append(
                     QrRenderEngine(qr_callback("\n".join(accumulator)))
                 )
+            elif accumulator_type == "barcode":
+                barcode_type = (
+                    BarcodeType(accumulator_options[0].lower())
+                    if accumulator_options
+                    else DEFAULT_BARCODE_TYPE
+                )
+                render_engines.append(
+                    BarcodeRenderEngine("\n".join(accumulator), barcode_type)
+                )
 
             accumulator = []
             accumulator_type = "empty"
+            accumulator_options = []
 
         # Verify version
-        line = sys.stdin.readline().strip()
+        line: str = sys.stdin.readline().strip()
         parts = line.split(":", 1)
         if not (parts[0] == "LABELLE-LABEL-SPEC-VERSION" and parts[1] == "1"):
             err_console = Console(stderr=True)
@@ -533,17 +545,24 @@ def flush_all():
 
         for line in sys.stdin:
             line = line.rstrip("\r\n")
-            parts = line.split(":", 1)
-            if parts[0] == "TEXT":
+            settings, value = line.split(":", 1)
+            setting, *options = settings.split("#", 1)
+
+            if setting == "TEXT":
                 flush_all()
                 accumulator_type = "text"
-                accumulator.append(parts[1])
-            elif parts[0] == "QR":
+                accumulator.append(value)
+            elif setting == "QR":
                 flush_all()
                 accumulator_type = "qr"
-                accumulator.append(parts[1])
-            elif parts[0] == "NEWLINE":
-                accumulator.append(parts[1])
+                accumulator.append(value)
+            elif setting == "BARCODE":
+                flush_all()
+                accumulator_type = "barcode"
+                accumulator_options = options
+                accumulator.append(value)
+            elif setting == "NEWLINE":
+                accumulator.append(value)
             else:
                 print("WARNING: invalid command", line)
         flush_all()