pos3 0.2.1__tar.gz → 0.2.2__tar.gz

{pos3-0.2.1 → pos3-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pos3
-Version: 0.2.1
+Version: 0.2.2
 Summary: S3 Simple Sync - Make using S3 as simple as using local files
 Author-email: Positronic Robotics <hi@positronic.ro>
 License: Apache-2.0

{pos3-0.2.1 → pos3-0.2.2}/pos3/__init__.py

@@ -142,6 +142,17 @@ def _s3_paths_conflict(left: str, right: str) -> bool:
     return left_norm.startswith(right_norm + "/") or right_norm.startswith(left_norm + "/")
 
 
+def _make_s3_key(prefix: str, info: FileInfo) -> str:
+    """Build the canonical S3 key from a prefix and FileInfo, including trailing '/' for directories."""
+    if info.relative_path:
+        key = prefix + "/" + info.relative_path if prefix else info.relative_path
+    else:
+        key = prefix
+    if info.is_dir and not key.endswith("/"):
+        key += "/"
+    return key
+
+
 def _process_futures(futures, operation: str) -> None:
     for future in futures:
         try:
@@ -618,12 +629,12 @@ class _Mirror:
             )
 
             for info in to_copy:
-                s3_key = prefix + ("/" + info.relative_path if info.relative_path else "")
+                s3_key = _make_s3_key(prefix, info)
                 to_put.append((info, local_path, bucket, s3_key, profile))
                 total_bytes += info.size
 
             for info in to_delete if delete else []:
-                s3_key = prefix + ("/" + info.relative_path if info.relative_path else "")
+                s3_key = _make_s3_key(prefix, info)
                 to_remove.append((bucket, s3_key, profile))
 
         if to_put:
@@ -679,7 +690,7 @@ class _Mirror:
         total_bytes = 0
 
         for info in to_copy:
-            s3_key = prefix + ("/" + info.relative_path if info.relative_path else "")
+            s3_key = _make_s3_key(prefix, info)
             to_put.append((info, bucket, s3_key, local_path))
             total_bytes += info.size
 
@@ -782,7 +793,6 @@ class _Mirror:
         try:
             client = self._get_client(profile)
             if info.is_dir:
-                key += "/" if not key.endswith("/") else ""
                 client.put_object(Bucket=bucket, Key=key, Body=b"")
             else:
                 file_path = local_path / info.relative_path if info.relative_path else local_path

{pos3-0.2.1 → pos3-0.2.2}/pos3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pos3
-Version: 0.2.1
+Version: 0.2.2
 Summary: S3 Simple Sync - Make using S3 as simple as using local files
 Author-email: Positronic Robotics <hi@positronic.ro>
 License: Apache-2.0

{pos3-0.2.1 → pos3-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pos3"
-version = "0.2.1"
+version = "0.2.2"
 description = "S3 Simple Sync - Make using S3 as simple as using local files"
 readme = "README.md"
 requires-python = ">=3.9"

{pos3-0.2.1 → pos3-0.2.2}/tests/test_s3.py

@@ -29,6 +29,43 @@ def _setup_s3_mock(mock_boto_client, paginate_return_value=None):
     return mock_s3
 
 
+class TestMakeS3Key:
+    def test_file_with_prefix(self):
+        info = s3.FileInfo(relative_path="file.txt", size=100, is_dir=False)
+        assert s3._make_s3_key("data", info) == "data/file.txt"
+
+    def test_dir_with_prefix(self):
+        info = s3.FileInfo(relative_path="subdir", size=0, is_dir=True)
+        assert s3._make_s3_key("data", info) == "data/subdir/"
+
+    def test_root_dir(self):
+        info = s3.FileInfo(relative_path="", size=0, is_dir=True)
+        assert s3._make_s3_key("data", info) == "data/"
+
+    def test_empty_prefix_file(self):
+        info = s3.FileInfo(relative_path="file.txt", size=100, is_dir=False)
+        assert s3._make_s3_key("", info) == "file.txt"
+
+    def test_empty_prefix_dir(self):
+        info = s3.FileInfo(relative_path="subdir", size=0, is_dir=True)
+        assert s3._make_s3_key("", info) == "subdir/"
+
+    def test_nested_path(self):
+        info = s3.FileInfo(relative_path="a/b/c.txt", size=50, is_dir=False)
+        assert s3._make_s3_key("prefix", info) == "prefix/a/b/c.txt"
+
+    def test_nested_dir(self):
+        info = s3.FileInfo(relative_path="a/b", size=0, is_dir=True)
+        assert s3._make_s3_key("prefix", info) == "prefix/a/b/"
+
+    def test_dir_already_trailing_slash_prefix(self):
+        """Prefix with trailing slash in relative_path shouldn't double-slash."""
+        info = s3.FileInfo(relative_path="sub/", size=0, is_dir=True)
+        result = s3._make_s3_key("data", info)
+        assert result == "data/sub/"
+        assert "//" not in result
+
+
 class TestS3URLParsing:
     def test_parse_s3_url_valid(self):
         assert s3._parse_s3_url("s3://bucket/path/to/data") == (
@@ -159,6 +196,36 @@ class TestUpload:
         assert mock_s3.upload_file.call_count >= 1
         assert mock_s3.delete_object.call_count == 1
 
+    @patch(BOTO3_PATCH_TARGET)
+    def test_upload_delete_directory_marker_trailing_slash(self, mock_boto_client):
+        """Test that deleting a directory from S3 uses trailing slash to match directory markers."""
+        # S3 has a directory marker "output/subdir/" and a file "output/file.txt"
+        paginate = [
+            {
+                "Contents": [
+                    {"Key": "output/subdir/", "Size": 0},  # Directory marker with trailing slash
+                    {"Key": "output/file.txt", "Size": 5},
+                ]
+            }
+        ]
+        mock_s3 = _setup_s3_mock(mock_boto_client, paginate)
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            output = Path(tmpdir) / "output"
+            output.mkdir()
+            # Local only has file.txt - subdir was deleted locally
+            (output / "file.txt").write_text("content")
+
+            with s3.mirror(cache_root=tmpdir, show_progress=False):
+                s3.upload("s3://bucket/output", local=output, interval=None)
+
+        # The directory marker should be deleted with trailing slash
+        delete_calls = mock_s3.delete_object.call_args_list
+        deleted_keys = [call[1]["Key"] for call in delete_calls]
+        assert "output/subdir/" in deleted_keys, (
+            f"Expected delete of 'output/subdir/' but got: {deleted_keys}"
+        )
+
     @patch(BOTO3_PATCH_TARGET)
     def test_background_sync_uploads_repeatedly(self, mock_boto_client):
         mock_s3 = _setup_s3_mock(mock_boto_client)