pos3 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

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
 
@@ -709,26 +720,35 @@ class _Mirror:
     def _list_s3_objects(self, bucket: str, key: str, profile: Profile | None = None) -> Iterator[dict]:
         logger.debug("Listing S3 objects: bucket=%s, key=%s", bucket, key)
         client = self._get_client(profile)
-        # Skip head_object for directory-like keys ending with '/'
-        # as we want to list contents, not check if the directory marker exists
-        if not key.endswith("/"):
+
+        # Determine the listing prefix - ensure it ends with "/" for directory-like operations
+        # This prevents "droid/recovery" from matching "droid/recovery_towels"
+        list_prefix = key
+
+        # If key doesn't end with "/", try to fetch it as a single object first
+        if key and not key.endswith("/"):
             try:
                 obj = client.head_object(Bucket=bucket, Key=key)
             except ClientError as exc:
                 error_code = exc.response["Error"]["Code"]
                 if error_code != "404":
                     raise
+                # Not a single file - treat as directory by adding "/"
+                list_prefix = key + "/"
             else:
+                # Found single object
                 logger.debug("Found single object via head_object: %s", key)
                 if "ContentLength" in obj and "Size" not in obj:
                     obj["Size"] = obj["ContentLength"]
                 yield {**obj, "Key": key}
                 return
+        # If key already ends with "/", skip head_object - it's clearly a directory prefix
 
+        # List with the directory prefix (guaranteed to end with "/")
         paginator = client.get_paginator("list_objects_v2")
-        for page in paginator.paginate(Bucket=bucket, Prefix=key):
+        for page in paginator.paginate(Bucket=bucket, Prefix=list_prefix):
             objects = page.get("Contents", [])
-            logger.debug("Listed %d objects with prefix %s", len(objects), key)
+            logger.debug("Listed %d objects with prefix %s", len(objects), list_prefix)
             yield from objects
 
     def _scan_s3(self, bucket: str, prefix: str, profile: Profile | None = None) -> Iterator[FileInfo]:
@@ -773,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.0.dist-info → pos3-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pos3
-Version: 0.2.0
+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.2.dist-info/RECORD

@@ -0,0 +1,6 @@
+pos3/__init__.py,sha256=clPuf7Qs8GTi8wWxPNEDXMmjxGkYd8on-fYGUPQx5ls,37934
+pos3-0.2.2.dist-info/licenses/LICENSE,sha256=e815_YqPTxHS3WrNI7dotEuLkgHFAgsf9avLhDYBj9s,11354
+pos3-0.2.2.dist-info/METADATA,sha256=ZlcQCpVWamNY-of0jnGibWlgVzS-Bh6ONTQeYxDP1Xo,8637
+pos3-0.2.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pos3-0.2.2.dist-info/top_level.txt,sha256=JWOpXHz1F6cbH0nfanGWLaozt8RJFRmv5H3eKkxz7e8,5
+pos3-0.2.2.dist-info/RECORD,,

{pos3-0.2.0.dist-info → pos3-0.2.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pos3-0.2.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-pos3/__init__.py,sha256=ByRzIJ3ggRKFU6j8HtzDv7D3RW_6NZkbjp3etoMilys,37261
-pos3-0.2.0.dist-info/licenses/LICENSE,sha256=e815_YqPTxHS3WrNI7dotEuLkgHFAgsf9avLhDYBj9s,11354
-pos3-0.2.0.dist-info/METADATA,sha256=LF6o86VvogFSbkcsfy39yVmf-37IjbZdqJZ3guem4CA,8637
-pos3-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pos3-0.2.0.dist-info/top_level.txt,sha256=JWOpXHz1F6cbH0nfanGWLaozt8RJFRmv5H3eKkxz7e8,5
-pos3-0.2.0.dist-info/RECORD,,