Merge pull request #446 from TomW1605/allow-prefix-and-suffix-with-double-braces

allow prefix and suffix with double braces in label format

client/src/pages/printing/printing.tsx

@@ -95,12 +95,35 @@ function applyTextFormatting(text: string): JSX.Element[] {
   });
   return elements;
 }
+
 export function renderLabelContents(template: string, spool: ISpool): JSX.Element {
   // Find all {tags} in the template string and loop over them
-  let result = template.replace(/\{(.*?)\}/g, function (_, tag) {
-    return getTagValue(tag, spool);
+  // let matches = [...template.matchAll(/(?:{(.*?))?{(.*?)}(.*?)(?:}(.*?))?/gs)];
+  let matches = [...template.matchAll(/{(?:[^}{]|{[^}{]*})*}/gs)];
+// console.log(matches){(?:[^}{]|{[^}{]*})*}
+  let label_text = template;
+  matches.forEach((match) => {
+    // console.log(match)
+    if ((match[0].match(/{/g)||[]).length == 1) {
+      let tag = match[0].replace(/[{}]/g, "");
+      // console.log(tag)
+      let tagValue = getTagValue(tag, spool)
+      label_text = label_text.replace(match[0], tagValue);
+    }
+    else if ((match[0].match(/{/g)||[]).length == 2) {
+      let structure = match[0].match(/{(.*?){(.*?)}(.*?)}/);
+      if (structure != null) {
+        const tag = structure[2];
+        let tagValue = getTagValue(tag, spool);
+        if (tagValue == "?") {
+          label_text = label_text.replace(match[0], "");
+        } else {
+          label_text = label_text.replace(match[0], structure[1] + tagValue + structure[3]);
+        }
+      }
+    }
   });
 
   // Split string on \n into individual lines
-  return <>{applyTextFormatting(result)}</>;
+  return <>{applyTextFormatting(label_text)}</>;
 }

client/src/pages/printing/spoolQrCodePrintingDialog.tsx

@@ -157,10 +157,10 @@ const SpoolQRCodePrintingDialog: React.FC<SpoolQRCodePrintingDialog> = ({ spoolI
     `**{filament.vendor.name} - {filament.name}
 #{id} - {filament.material}**
 Spool Weight: {filament.spool_weight} g
-ET: {filament.settings_extruder_temp} °C
-BT: {filament.settings_bed_temp} °C
-Lot Nr: {lot_nr}
-{comment}
+{ET: {filament.settings_extruder_temp} °C}
+{BT: {filament.settings_bed_temp} °C}
+{Lot Nr: {lot_nr}}
+{{comment}}
 {filament.comment}
 {filament.vendor.comment}`;