fix regex to handle parsing multi-component file extensions with sing…

…le character components ("file.1.a.ext") (fixes #120)
justinfx · Jun 1, 2023 · 2434ea2 · 2434ea2
1 parent fbd2abd
commit 2434ea2
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 12 deletions.
diff --git a/src/fileseq/constants.py b/src/fileseq/constants.py
@@ -155,12 +155,12 @@ def __eq__(self, other):
 # Regular expression pattern for matching file names on disk.
 DISK_PATTERN = r"""
     \A
-    ((?:.*[/\\])?)            # dirname
-    (.*?)                     # basename
-    (-?\d+)?                  # frame
-    (                         # ext
-        (?:\.\w*[a-zA-Z]\w)*  #   optional leading alnum ext prefix (.foo.1bar)
-        (?:\.[^.]+)?          #   ext suffix
+    ((?:.*[/\\])?)             # dirname
+    (.*?)                      # basename
+    (-?\d+)?                   # frame
+    (                          # ext
+        (?:\.\w*[a-zA-Z]\w?)*  #   optional leading alnum ext prefix (.foo.1bar)
+        (?:\.[^.]+)?           #   ext suffix
     )
     \Z
     """
@@ -169,12 +169,12 @@ def __eq__(self, other):
 # Regular expression pattern for matching file names on disk allowing subframes.
 DISK_SUB_PATTERN = r"""
     \A
-    ((?:.*[/\\])?)            # dirname
-    (.*?)                     # basename
-    (-?\d+(?:\.\d+)?)?        # frame
-    (                         # ext
-        (?:\.\w*[a-zA-Z]\w)*  #   optional leading alnum ext prefix (.foo.1bar)
-        (?:\.[^.]+)?          #   ext suffix
+    ((?:.*[/\\])?)             # dirname
+    (.*?)                      # basename
+    (-?\d+(?:\.\d+)?)?         # frame
+    (                          # ext
+        (?:\.\w*[a-zA-Z]\w?)*  #   optional leading alnum ext prefix (.foo.1bar)
+        (?:\.[^.]+)?           #   ext suffix
     )
     \Z
     """

diff --git a/test/complex_ext/1.a.jpg b/test/complex_ext/1.a.jpg
diff --git a/test/complex_ext/2.a.jpg b/test/complex_ext/2.a.jpg
diff --git a/test/complex_ext/3.a.jpg b/test/complex_ext/3.a.jpg
diff --git a/test/complex_ext/file.5.a.ext b/test/complex_ext/file.5.a.ext
diff --git a/test/complex_ext/file.6.a.ext b/test/complex_ext/file.6.a.ext
diff --git a/test/complex_ext/file.7.a.ext b/test/complex_ext/file.7.a.ext
diff --git a/test/test_unit.py b/test/test_unit.py
@@ -1645,6 +1645,8 @@ def testFindSequenceOnDisk(self):
             ("subframe_seq/baz.#.0000.exr", "subframe_seq/baz.1-4#.0000.exr"),
             ("subframe_seq/baz.0001.#.exr", "subframe_seq/baz.0001.0-7500x2500#.exr"),
             ("subframe_seq/baz.0001.0000.exr", "subframe_seq/baz.0001.0-7500x2500#.exr"),
+            ("complex_ext/@.a.jpg", "complex_ext/1-3@.a.jpg"),
+            ("complex_ext/file.@.a.ext", "complex_ext/file.5-7@.a.ext"),
         ]
 
         for pattern, expected in tests:
@@ -1703,6 +1705,8 @@ def testStrictPadding(self):
             ("seq/big.#@.ext", None),
             ("multi_range/file_@@.0001.exr", None),
             ("multi_range/file_#.0001.exr", "multi_range/file_3-5#.0001.exr"),
+            ("complex_ext/#.a.jpg", None),
+            ("complex_ext/@.a.jpg", "complex_ext/1-3@.a.jpg"),
         ]
 
         for pattern, expected in tests: