FIX copy and move metadata for localclient (#107)

Co-authored-by: Aditya Vaidya <[email protected]>

Author: kroq-gar78

cottoncandy/localclient.py

@@ -97,6 +97,7 @@ def upload_file(self, file_name, cloud_name, permissions):
             source_bucket=None,
             destination_bucket=None,
             overwrite=True,
+            copy_metadata=False,
         )
 
     def upload_multipart(self, stream, cloud_name, metadata, permissions,
@@ -219,7 +220,7 @@ def list_objects(self, **kwargs):
         return results
 
     def copy(self, source, destination, source_bucket, destination_bucket,
-             overwrite):
+             overwrite, copy_metadata=True):
         """Copies an object
 
         Parameters
@@ -232,6 +233,9 @@ def copy(self, source, destination, source_bucket, destination_bucket,
         destination_bucket : ignored
         overwrite : bool
             overwrite if destination exists
+        copy_metadata : bool
+            also copy metadata file? (we don't want to do this if copying from
+            the local filesystem)
 
         Returns
         -------
@@ -245,6 +249,11 @@ def copy(self, source, destination, source_bucket, destination_bucket,
             destination_bucket = source_bucket
         source = os.path.join(source_bucket, source)
         destination = os.path.join(destination_bucket, destination)
+        if copy_metadata:
+            source_metadata = os.path.join(source_bucket, source + METADATA_SUFFIX)
+            destination_metadata = os.path.join(destination_bucket, destination + METADATA_SUFFIX)
+            shutil.copy(source_metadata, destination_metadata)
+
         auto_makedirs(destination)
         return shutil.copy(source, destination)
 
@@ -272,8 +281,10 @@ def move(self, source, destination, source_bucket, destination_bucket,
             destination_bucket = source_bucket
         source = os.path.join(source_bucket, source)
         destination = os.path.join(destination_bucket, destination)
+        source_metadata = os.path.join(source_bucket, source + METADATA_SUFFIX)
+        destination_metadata = os.path.join(destination_bucket, destination + METADATA_SUFFIX)
         auto_makedirs(destination)
-        return shutil.move(source, destination)
+        return shutil.move(source, destination) and shutil.move(source_metadata, destination_metadata)
 
     def delete(self, cloud_name, recursive=False, delete=False):
         """Deletes an object
@@ -294,6 +305,9 @@ def delete(self, cloud_name, recursive=False, delete=False):
         cloud_name = os.path.join(self.path, cloud_name)
         if os.path.isfile(cloud_name):
             os.remove(cloud_name)
+            cloud_metadata_name = cloud_name + METADATA_SUFFIX
+            if os.path.isfile(cloud_metadata_name):
+                os.remove(cloud_metadata_name)
         else:
             if recursive:
                 shutil.rmtree(cloud_name)

cottoncandy/tests/test_roundtrip.py

@@ -146,3 +146,30 @@ def test_dict2cloud(cci, object_name):
         for k, v in content['deep'].items():
             assert np.allclose(v, dat['deep'][k])
         cci.rm(object_name, recursive=True)
+
+
+def test_copy(cci, object_name):
+    # Tests that the object contents _and_ metadata are copied correctly
+    dest_object_name = object_name + '_temp'
+    for content in content_generator():
+        cci.upload_raw_array(object_name, content)
+        time.sleep(cci.wait_time)
+        cci.cp(object_name, dest_object_name, overwrite=True)
+        assert cci.exists_object(object_name)
+        dat = cci.download_raw_array(dest_object_name)
+        assert np.allclose(dat, content)
+        cci.rm(object_name)
+        cci.rm(dest_object_name)
+
+
+def test_move(cci, object_name):
+    # Tests that the object contents _and_ metadata are moved correctly
+    dest_object_name = object_name + '_temp'
+    for content in content_generator():
+        cci.upload_raw_array(object_name, content)
+        time.sleep(cci.wait_time)
+        cci.mv(object_name, dest_object_name, overwrite=True)
+        assert not cci.exists_object(object_name)
+        dat = cci.download_raw_array(dest_object_name)
+        assert np.allclose(dat, content)
+        cci.rm(dest_object_name)