moved escape(), unescape() to _utils.py

tikuma-lsuhsc · hokiedsp · commit b6aeedd1fae2 · 2025-06-01T10:26:39.000-04:00
diff --git a/src/ffmpegio/_utils.py b/src/ffmpegio/_utils.py
@@ -168,3 +168,73 @@ def is_fileobj(
         raise ValueError("Requested non-writable file object but it is writable.")
 
     return True
+
+def escape(txt: str) -> str:
+    """apply FFmpeg single quote escaping
+
+    :param txt: Unescaped string
+    :return: Escaped string
+
+    See https://ffmpeg.org/ffmpeg-utils.html#Quoting-and-escaping
+    """
+
+    txt = str(txt)
+
+    if re.search(r"\s", txt, re.MULTILINE):
+        # quote if txt has any white space
+        txt = txt.replace("'", r"'\''")
+        return f"'{txt}'"
+    else:
+        # if not quoted, escape quotes and backslashes
+        return re.sub(r"(['\\])", r"\\\1", txt)
+
+
+def unescape(txt: str) -> str:
+    """undo FFmpeg single quote escaping
+
+    :param txt: Escaped string
+    :return: Original string
+
+    See https://ffmpeg.org/ffmpeg-utils.html#Quoting-and-escaping
+    """
+
+    n = len(txt)
+    if not n:
+        return txt
+
+    re_start = re.compile(r"[^\\](?:\\\\)*'")
+    re_sub = re.compile(r"\\([\\'])")
+
+    blks = []
+
+    # look for a first quoted text block
+    m = re.search(r"(?:^|[^\\])(?:\\\\)*'", txt)
+    if m:
+        i0 = m.end()
+        if i0 > 1:
+            # unescape the initial unquoted block
+            blks.append(re_sub.sub(r"\1", txt[0 : i0 - 1]))
+    else:
+        # no quoted text block, unescape the whole string
+        return re_sub.sub(r"\1", txt)
+
+    # always starts with quoted block
+    in_quote = True
+
+    while i0 < n:
+
+        if in_quote:
+            # find the end quote
+            i1 = txt.find("'", i0)
+            if i1 < 0:
+                raise ValueError("incorrectly escaped text: missing a closing quote.")
+            blks.append(txt[i0:i1])
+        else:
+            # find the next starting quote
+            m = re_start.search(txt, i0 - 1)
+            i1 = m.end() - 1 if m else n
+            blks.append(re_sub.sub(r"\1", txt[i0:i1]))
+        i0 = i1 + 1
+        in_quote = not in_quote
+
+    return "".join(blks)
diff --git a/src/ffmpegio/utils/__init__.py b/src/ffmpegio/utils/__init__.py
@@ -18,80 +18,6 @@
 # import sys
 # sys.byteorder
 
-
-
-
-def escape(txt: str) -> str:
-    """apply FFmpeg single quote escaping
-
-    :param txt: Unescaped string
-    :return: Escaped string
-
-    See https://ffmpeg.org/ffmpeg-utils.html#Quoting-and-escaping
-    """
-
-    txt = str(txt)
-
-    if re.search(r"\s", txt, re.MULTILINE):
-        # quote if txt has any white space
-        txt = txt.replace("'", r"'\''")
-        return f"'{txt}'"
-    else:
-        # if not quoted, escape quotes and backslashes
-        return re.sub(r"(['\\])", r"\\\1", txt)
-
-
-def unescape(txt: str) -> str:
-    """undo FFmpeg single quote escaping
-
-    :param txt: Escaped string
-    :return: Original string
-
-    See https://ffmpeg.org/ffmpeg-utils.html#Quoting-and-escaping
-    """
-
-    n = len(txt)
-    if not n:
-        return txt
-
-    re_start = re.compile(r"[^\\](?:\\\\)*'")
-    re_sub = re.compile(r"\\([\\'])")
-
-    blks = []
-
-    # look for a first quoted text block
-    m = re.search(r"(?:^|[^\\])(?:\\\\)*'", txt)
-    if m:
-        i0 = m.end()
-        if i0 > 1:
-            # unescape the initial unquoted block
-            blks.append(re_sub.sub(r"\1", txt[0 : i0 - 1]))
-    else:
-        # no quoted text block, unescape the whole string
-        return re_sub.sub(r"\1", txt)
-
-    # always starts with quoted block
-    in_quote = True
-
-    while i0 < n:
-
-        if in_quote:
-            # find the end quote
-            i1 = txt.find("'", i0)
-            if i1 < 0:
-                raise ValueError("incorrectly escaped text: missing a closing quote.")
-            blks.append(txt[i0:i1])
-        else:
-            # find the next starting quote
-            m = re_start.search(txt, i0 - 1)
-            i1 = m.end() - 1 if m else n
-            blks.append(re_sub.sub(r"\1", txt[i0:i1]))
-        i0 = i1 + 1
-        in_quote = not in_quote
-
-    return "".join(blks)
-
-
 def get_pixel_config(
     input_pix_fmt: str, pix_fmt: str | None = None
 ) -> tuple[str, int, str, bool]:
diff --git a/src/ffmpegio/utils/concat.py b/src/ffmpegio/utils/concat.py
@@ -10,7 +10,7 @@
 
 logger = logging.getLogger("ffmpegio")
 
-from . import escape, unescape
+from .._utils import escape, unescape
 
 # https://trac.ffmpeg.org/wiki/Concatenate
 # https://ffmpeg.org/ffmpeg-formats.html#concat
