For lpsdata files. If there are no uploaded directories preceeded by digits will create an Uploaded directory as a subdirectory to the source directory

Author: davezuckerman

mokelumne/util/file_transfer.py

@@ -202,8 +202,8 @@ def manifest_entry_matches_file(
 
 def _all_subdirs(upload_dir: Path) -> list:
     """get a list of all subdirectories for a given path"""
-    all_subdirs = [x for x in upload_dir.rglob("*") if x.is_dir()]
-    
+    #all_subdirs = [x for x in upload_dir.rglob("*") if x.is_dir()]
+    all_subdirs = [x for x in upload_dir.iterdir() if x.is_dir()] 
     return all_subdirs
 
 def _get_next_subdir_index(parent_dir: Path) -> int:
@@ -251,11 +251,13 @@ def move_to_uploaded(source_dir: str) -> tuple[str, int]:
     # If there is no uploaded directory we need to create one.
     # It needs to be prefixed with the next number in the queue.
     # e.g. if there's a directory 03_Files_to_Review.
-    # It would be 04_Uploaded
+    # It would be 04_Uploaded. If they are not preceded by
+    # by numbers it will create an Uploaded directory 
+    # as a subdirectory to source_dir 
     if not uploaded_dir:
         highest = _get_next_subdir_index(parent_dir)
         if highest is None:
-            uploaded_dir = f"{parent_dir}/Uploaded"
+            uploaded_dir = f"{source_dir}/Uploaded"
         else:
             uploaded_dir = f"{parent_dir}/{highest:02}_Uploaded"
 

test/unit/test_file_transfer.py

@@ -232,8 +232,11 @@ def test_move_to_uploaded_creates_new_uploaded_directory(
         result_path, moved_count = file_transfer.move_to_uploaded(str(source_dir))
 
         # Verify outcomes using the parameterized target name
-        expected_uploaded_dir = parent_dir / expected_uploaded_name
-        
+        if existing_dir_name == "No_Digits_Here":
+            expected_uploaded_dir = source_dir / expected_uploaded_name
+        else:
+            expected_uploaded_dir = parent_dir / expected_uploaded_name
+
         assert result_path == str(expected_uploaded_dir)
         assert moved_count == 1
         assert not source_file.exists()