'mid_dir' SHOULD contain everything after the data directory Path part

Author: tieneupin

src/murfey/client/destinations.py

@@ -28,14 +28,7 @@ def find_longest_data_directory(
             len(base_dir.parts) if base_dir else 0
         ):
             base_dir = dd_base
-            # Extract the path parts from immediately after the visit directory
-            mid_dir = Path(
-                "/".join(
-                    list(
-                        match_path.absolute().relative_to(Path(base_dir)).parent.parts
-                    )[1:]
-                )
-            )
+            mid_dir = match_path.absolute().relative_to(Path(base_dir)).parent
     return base_dir, mid_dir
 
 

tests/client/test_destinations.py

@@ -17,22 +17,22 @@
         (
             "X:/cm12345-6/Supervisor/Images-Disc1/file",
             True,
-            ("X:/", "Supervisor/Images-Disc1"),
+            ("X:/", "cm12345-6/Supervisor/Images-Disc1"),
         ),
         (
             "X:/DATA/cm12345-6/Supervisor/Images-Disc1/file",
             False,
-            ("X:/DATA", "Supervisor/Images-Disc1"),
+            ("X:/DATA", "cm12345-6/Supervisor/Images-Disc1"),
         ),
         (
             "X:/DoseFractions/cm12345-6/Supervisor/Images-Disc1/file",
             True,
-            ("X:/DoseFractions", "Supervisor/Images-Disc1"),
+            ("X:/DoseFractions", "cm12345-6/Supervisor/Images-Disc1"),
         ),
         (
             "X:/DoseFractions/DATA/cm12345-6/Supervisor/Images-Disc1/file",
             False,
-            ("X:/DoseFractions/DATA", "Supervisor/Images-Disc1"),
+            ("X:/DoseFractions/DATA", "cm12345-6/Supervisor/Images-Disc1"),
         ),
     ),
 )