OP-2813 - fix wrong parsing when short label is used

openpype/lib/delivery.py

@@ -36,7 +36,7 @@ def collect_frames(files):
             src_tail = collection.tail
 
             # version recognized as a collection
-            if re.match(".*([^a-zA-Z0-9]v%[0-9]+d).*", collection.format()):
+            if re.match(".*([a-zA-Z0-9]%[0-9]+d).*", collection.format()):
                 continue
 
             for index in collection.indexes:

tests/unit/openpype/lib/test_delivery.py

@@ -47,6 +47,30 @@ def test_collect_frames_single_sequence():
     assert ret == expected, "Not matching"
 
 
+def test_collect_frames_single_sequence_shot():
+    files = ["testing_sh010_workfileCompositing_v001.aep"]
+    ret = collect_frames(files)
+
+    expected = {
+        "testing_sh010_workfileCompositing_v001.aep": None
+    }
+
+    print(ret)
+    assert ret == expected, "Not matching"
+
+
+def test_collect_frames_single_sequence_shot_with_frame():
+    files = ["testing_sh010_workfileCompositing_000_v001.aep"]
+    ret = collect_frames(files)
+
+    expected = {
+        "testing_sh010_workfileCompositing_000_v001.aep": "000"
+    }
+
+    print(ret)
+    assert ret == expected, "Not matching"
+
+
 def test_collect_frames_single_sequence_full_path():
     files = ['C:/test_project/assets/locations/Town/work/compositing\\renders\\aftereffects\\test_project_TestAsset_compositing_v001\\TestAsset_renderCompositingMain_v001.mov']  # noqa: E501
     ret = collect_frames(files)