Update filter to sort by cc first

main.py

@@ -67,13 +67,16 @@ def filter_files(files: List) -> List:
     table = np.zeros((2, 2), dtype=bool)
     bin_left = 0
     bin_right = 0
-    for file in file_paths:
+    cc_first = False
+    for idx, file in enumerate(file_paths):
 
         splits = file.name.split('_')
 
         # Check if view is present
         if any(['cc' in part.lower() for part in splits]):
             table[0, :] = [True, True]
+            if idx == 0:
+                cc_first = True
         if any(['mlo' in part.lower() for part in splits]):
             table[1, :] = [True, True]
 
@@ -85,6 +88,10 @@ def filter_files(files: List) -> List:
             table[:, 1] &= True
             bin_right += 1
 
+    # Ensure cc_first
+    if not cc_first:
+        file_paths.reverse()
+
     # Reset side that has not enough files
     if bin_left < 2:
         table[:, 0] &= False

tests/test_file_filters.py

@@ -23,13 +23,16 @@ def filter_files(files: List[str]):
     table = np.zeros((2, 2), dtype=bool)
     bin_left = 0
     bin_right = 0
-    for file in file_paths:
+    cc_first = False
+    for idx, file in enumerate(file_paths):
 
         splits = file.name.split('_')
 
         # Check if view is present
         if any(['cc' in part.lower() for part in splits]):
             table[0, :] = [True, True]
+            if idx == 0:
+                cc_first = True
         if any(['mlo' in part.lower() for part in splits]):
             table[1, :] = [True, True]
 
@@ -41,6 +44,10 @@ def filter_files(files: List[str]):
             table[:, 1] &= True
             bin_right += 1
 
+    # Ensure cc_first
+    if not cc_first:
+        file_paths.reverse()
+
     # Reset side that has not enough files
     if bin_left < 2:
         table[:, 0] &= False
@@ -61,7 +68,7 @@ def filter_files(files: List[str]):
                              (['left_cc.png', 'left_cc.png'], False),
                              (['left_mlo.png', 'right_cc.png'], False),
                              (['no_mlo.png', 'left_cc.png'], False),
-                             (['left_cc.png', 'left_mlo.png'], True),
+                             (['left_mlo.png', 'left_cc.png'], True),
                              (['right_cc.jpg', 'right_mlo.png'], True),
                          ]
                          )
@@ -72,3 +79,17 @@ def test_filter_files(file_paths, expectation):
     else:
         with pytest.raises(Exception) as _:
             _ = filter_files(file_paths)
+
+
+@pytest.mark.parametrize('unordered_paths,ordered_paths',
+                         [
+                             (['left_mlo.png', 'left_cc.png'],
+                              ['left_cc.png', 'left_mlo.png']),
+                             (['right_cc.jpg', 'right_mlo.png'],
+                              ['right_cc.jpg', 'right_mlo.png']),
+                         ]
+                         )
+def test_sort_files(unordered_paths, ordered_paths):
+    filtered_paths = filter_files(unordered_paths)
+    filtered_paths = [str(path) for path in filtered_paths]
+    assert filtered_paths == ordered_paths