process_tracker_python-71 Extract Location Names

✨ Location Names are now ensured to be unique (number added to end)
🐛 Paths that end in filename should now use parent directory for location name

Closes #71

Author: OpenDataAlex

process_tracker/location_tracker.py

@@ -58,13 +58,13 @@ def derive_location_name(self):
         location_prefix = None
 
         current_name = (
-            self.session.query(Location.location_name)
+            self.session.query(Location)
             .filter(Location.location_path == self.location_path)
             .first()
         )
 
         if current_name is not None:
-            location_name = current_name[0].location_name
+            location_name = current_name.location_name
         else:
             location_name = ""
 

tests/test_extract_tracker.py

@@ -246,7 +246,7 @@ def test_derive_location_name_local_path(self):
         )
 
         given_result = location[0].location_name
-        expected_result = "extract_dir2"
+        expected_result = "local - extract_dir2"
 
         self.assertEqual(expected_result, given_result)
 
@@ -266,7 +266,7 @@ def test_derive_location_name_s3(self):
         )
 
         given_result = location[0].location_name
-        expected_result = "s3 - extract_dir"
+        expected_result = "s3 test-test - extract_dir"
 
         self.assertEqual(expected_result, given_result)