Unify and optimize all the "toUnix" stuff into LineReader._to_unix.

Author: nedtwigg

python/selfie-lib/selfie_lib/LineReader.py

@@ -1,6 +1,13 @@
 import io
 
 
+def _to_unix(s: str) -> str:
+    if s.find("\r\n") == -1:
+        return s
+    else:
+        return s.replace("\r\n", "\n")
+
+
 class LineReader:
     def __init__(self, content: bytes):
         self.__buffer = io.BytesIO(content)

python/selfie-lib/selfie_lib/Snapshot.py

@@ -1,6 +1,7 @@
 from typing import Iterator, Union
 
 from .ArrayMap import ArrayMap
+from .LineReader import _to_unix
 from .SnapshotValue import SnapshotValue
 
 
@@ -36,7 +37,7 @@ def plus_facet(
             raise ValueError("The empty string is reserved for the subject.")
         return Snapshot(
             self._subject,
-            self._facet_data.plus(_unix_newlines(key), SnapshotValue.of(value)),
+            self._facet_data.plus(_to_unix(key), SnapshotValue.of(value)),
         )
 
     def plus_or_replace(
@@ -48,7 +49,7 @@ def plus_or_replace(
             return Snapshot(
                 self._subject,
                 self._facet_data.plus_or_noop_or_replace(
-                    _unix_newlines(key), SnapshotValue.of(value)
+                    _to_unix(key), SnapshotValue.of(value)
                 ),
             )
 
@@ -86,7 +87,3 @@ def of_items(items: Iterator[tuple[str, SnapshotValue]]) -> "Snapshot":
     def items(self) -> Iterator[tuple[str, SnapshotValue]]:
         yield ("", self._subject)
         yield from self._facet_data.items()
-
-
-def _unix_newlines(string: str) -> str:
-    return string.replace("\\r\\n", "\\n")

python/selfie-lib/selfie_lib/SnapshotValue.py

@@ -1,9 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Union
 
-
-def unix_newlines(string: str) -> str:
-    return string.replace("\r\n", "\n")
+from .LineReader import _to_unix
 
 
 class SnapshotValue(ABC):
@@ -24,7 +22,7 @@ def of(data: Union[bytes, str, "SnapshotValue"]) -> "SnapshotValue":
         if isinstance(data, bytes):
             return SnapshotValueBinary(data)
         elif isinstance(data, str):
-            return SnapshotValueString(unix_newlines(data))
+            return SnapshotValueString(_to_unix(data))
         elif isinstance(data, SnapshotValue):
             return data
         else:

python/selfie-lib/selfie_lib/SnapshotValueReader.py

@@ -7,10 +7,6 @@
 from .SnapshotValue import SnapshotValue
 
 
-def unix_newlines(string: str) -> str:
-    return string.replace("\r\n", "\n")
-
-
 class SnapshotValueReader:
     KEY_FIRST_CHAR = "╔"
     KEY_START = "╔═ "