debugging upload script

Australian-Imaging-Service · Feb 9, 2024 · e4e6d59 · e4e6d59
1 parent aa0ffd3
commit e4e6d59
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/xnat_ingest/cli/upload.py b/xnat_ingest/cli/upload.py
@@ -174,7 +174,7 @@ def xnat_session_exists(project_id, subject_id, session_id):
                 session_objs[session_ids].append((path_parts[3:-1], obj))
 
             session_objs = {
-                (ids, objs)
+                ids: objs
                 for ids, objs in session_objs.items()
                 if not xnat_session_exists(*ids)
             }
@@ -190,7 +190,10 @@ def iter_staged_sessions():
                     session_tmp_dir = tmp_download_dir.joinpath(*ids)
                     session_tmp_dir.mkdir(parents=True, exist_ok=True)
                     for relpath, obj in objs:
-                        with open(session_tmp_dir.joinpath(relpath), "wb") as f:
+                        obj_path = session_tmp_dir.joinpath(*relpath)
+                        obj_path.parent.mkdir(parents=True, exist_ok=True)
+                        with open(obj_path, "wb") as f:
+                            logger.debug("Downloading %s to %s", obj, obj_path)
                             bucket.download_fileobj(obj.key, f)
                     yield session_tmp_dir
                     shutil.rmtree(
@@ -357,5 +360,3 @@ def iter_staged_sessions():
                     continue
                 else:
                     raise
-
-    shutil.rmtree(tmp_download_dir)