work with all known whitespace combinations

Author: clouless

lib/macro_storage_format_parser.py

@@ -2,7 +2,7 @@
 
 from lib.macro_storage_format_builder import MacroStorageFormatBuilder
 from lib.util import Util
-
+import re
 
 class MacroStorageFormatParser:
     def __init__(
@@ -15,18 +15,10 @@ def __init__(
         self.util = Util(forceUUIDsZeroed)
 
     def _split_macro_body_on_content_block(self, macro_body: str) -> tuple[str, str]:
-        if "[content]\r\n" in macro_body:
-            splitted = macro_body.split("[content]\r\n", 1)
-            return (splitted[0], splitted[1])
-        if "[content]\r" in macro_body:
-            splitted = macro_body.split("[content]\r", 1)
-            return (splitted[0], splitted[1])
-        if "[content]\n\r" in macro_body:
-            splitted = macro_body.split("[content]\n\r", 1)
-            return (splitted[0], splitted[1])
-        if "[content]\n" in macro_body:
-            splitted = macro_body.split("[content]\n", 1)
-            return (splitted[0], splitted[1])
+        if "[content]" in macro_body:
+            splitted = re.split(r'\[content\]\s*(\r\n|\r|\n\r|\n)', macro_body, maxsplit=1)
+            # re.split splits also the capturing group \n as [1]!
+            return (splitted[0], splitted[2])
         return ("ERROR SPLITTING AT [CONTENT]", "ERROR: INVALID NEWLINE")
 
     def transform(self):

lib/test_macro_storage_format_parser.py

@@ -121,3 +121,14 @@ def test_transform___newlines(self):
         self.assertTrue(isinstance(result4, tuple))
         self.assertEqual(result4[0], "foo\n")
         self.assertEqual(result4[1], "bar")
+        # ###########################################################################
+        # CASE5: U+0020 : SPACE [SP] and U+00A0 : NO-BREAK SPACE [NBSP] combos
+        #
+        # GIVEN
+        macro_body5 = "foo\n[content]    \nbar"
+        # WHEN
+        result5 = parser._split_macro_body_on_content_block(macro_body5)
+        # THEN
+        self.assertTrue(isinstance(result5, tuple))
+        self.assertEqual(result5[0], "foo\n")
+        self.assertEqual(result5[1], "bar")