Another fix for not starting path with /

d-j-hatton · d-j-hatton · commit c09445caa2d0 · 2025-03-19T09:12:42.000Z
diff --git a/src/murfey/client/contexts/spa_metadata.py b/src/murfey/client/contexts/spa_metadata.py
@@ -163,11 +163,16 @@ def post_transfer(
                     atlas=Path(partial_path), sample=sample
                 )
                 url = f"{str(environment.url.geturl())}/visits/{environment.visit}/{environment.murfey_session}/register_data_collection_group"
-                dcg_search_dir = "/" + "/".join(
+                dcg_search_dir = "/".join(
                     p
-                    for p in transferred_file.parent.parts[1:]
+                    for p in transferred_file.parent.parent.parts
                     if p != environment.visit
                 )
+                dcg_search_dir = (
+                    dcg_search_dir[1:]
+                    if dcg_search_dir.startswith("//")
+                    else dcg_search_dir
+                )
                 dcg_images_dirs = sorted(
                     Path(dcg_search_dir).glob("Images-Disc*"),
                     key=lambda x: x.stat().st_ctime,

Original file line number	Diff line number	Diff line change
`@@ -163,11 +163,16 @@ def post_transfer(`
`163`	`163`	`atlas=Path(partial_path), sample=sample`
`164`	`164`	`)`
`165`	`165`	`url = f"{str(environment.url.geturl())}/visits/{environment.visit}/{environment.murfey_session}/register_data_collection_group"`
`166`		`- dcg_search_dir = "/" + "/".join(`
	`166`	`+ dcg_search_dir = "/".join(`
`167`	`167`	`p`
`168`		`- for p in transferred_file.parent.parts[1:]`
	`168`	`+ for p in transferred_file.parent.parent.parts`
`169`	`169`	`if p != environment.visit`
`170`	`170`	`)`
	`171`	`+ dcg_search_dir = (`
	`172`	`+ dcg_search_dir[1:]`
	`173`	`+ if dcg_search_dir.startswith("//")`
	`174`	`+ else dcg_search_dir`
	`175`	`+ )`
`171`	`176`	`dcg_images_dirs = sorted(`
`172`	`177`	`Path(dcg_search_dir).glob("Images-Disc*"),`
`173`	`178`	`key=lambda x: x.stat().st_ctime,`