Removed preservation of access time in copy/move/mirror functions as changing the access time itself was an access.

Author: atollk

fs/_bulk.py

@@ -13,12 +13,11 @@
 
 from .copy import copy_file_internal
 from .errors import BulkCopyFailed
-from .tools import copy_file_data
 
 if typing.TYPE_CHECKING:
     from .base import FS
     from types import TracebackType
-    from typing import IO, List, Optional, Text, Type
+    from typing import List, Optional, Text, Type
 
 
 class _Worker(threading.Thread):

fs/base.py

@@ -22,7 +22,7 @@
 import six
 
 from . import copy, errors, fsencode, iotools, move, tools, walk, wildcard
-from .copy import copy_metadata
+from .copy import copy_cmtime
 from .glob import BoundGlobber
 from .mode import validate_open_mode
 from .path import abspath, join, normpath
@@ -419,7 +419,7 @@ def copy(
             with closing(self.open(src_path, "rb")) as read_file:
                 # FIXME(@althonos): typing complains because open return IO
                 self.upload(dst_path, read_file)  # type: ignore
-            copy_metadata(self, src_path, self, dst_path)
+            copy_cmtime(self, src_path, self, dst_path)
 
     def copydir(
         self,
@@ -1130,8 +1130,8 @@ def move(self, src_path, dst_path, overwrite=False, preserve_time=False):
             with self.open(src_path, "rb") as read_file:
                 # FIXME(@althonos): typing complains because open return IO
                 self.upload(dst_path, read_file)  # type: ignore
+            copy_cmtime(self, src_path, self, dst_path)
             self.remove(src_path)
-            copy_metadata(self, src_path, self, dst_path)
 
     def open(
         self,

fs/copy.py

@@ -159,7 +159,7 @@ def copy_file(
                     else:
                         with _src_fs.openbin(src_path) as read_file:
                             _dst_fs.upload(dst_path, read_file)
-                    copy_metadata(_src_fs, src_path, _dst_fs, dst_path)
+                    copy_cmtime(_src_fs, src_path, _dst_fs, dst_path)
 
 
 def copy_file_internal(
@@ -199,7 +199,7 @@ def copy_file_internal(
         with src_fs.openbin(src_path) as read_file:
             dst_fs.upload(dst_path, read_file)
 
-    copy_metadata(src_fs, src_path, dst_fs, dst_path)
+    copy_cmtime(src_fs, src_path, dst_fs, dst_path)
 
 
 def copy_file_if_newer(
@@ -445,14 +445,14 @@ def dst():
                             on_copy(_src_fs, dir_path, _dst_fs, copy_path)
 
 
-def copy_metadata(
+def copy_cmtime(
     src_fs,  # type: Union[FS, Text]
     src_path,  # type: Text
     dst_fs,  # type: Union[FS, Text]
     dst_path,  # type: Text
 ):
     # type: (...) -> None
-    """Copies metadata from one file to another.
+    """Copy modified time metadata from one file to another.
 
     Arguments:
         src_fs (FS or str): Source filesystem (instance or URL).
@@ -461,7 +461,13 @@ def copy_metadata(
         dst_path (str): Path to a directory on the destination filesystem.
 
     """
-    # TODO(preserve_time)
+    namespaces = ("details", "metadata_changed", "modified")
     with manage_fs(src_fs, writeable=False) as _src_fs:
         with manage_fs(dst_fs, create=True) as _dst_fs:
-            pass
+            src_meta = _src_fs.getinfo(src_path, namespaces)
+            src_details = src_meta.raw.get("details", {})
+            dst_details = {}
+            for value in ("metadata_changed", "modified"):
+                if value in src_details:
+                    dst_details[value] = src_details[value]
+            _dst_fs.setinfo(dst_path, {"details": dst_details})

fs/wrapfs.py

@@ -177,8 +177,8 @@ def move(self, src_path, dst_path, overwrite=False, preserve_time=False):
                 raise errors.DestinationExists(_dst_path)
             move_file(src_fs, _src_path, dst_fs, _dst_path, preserve_time=preserve_time)
 
-    def movedir(self, src_path, dst_path, create=False):
-        # type: (Text, Text, bool) -> None
+    def movedir(self, src_path, dst_path, create=False, preserve_time=False):
+        # type: (Text, Text, bool, bool) -> None
         src_fs, _src_path = self.delegate_path(src_path)
         dst_fs, _dst_path = self.delegate_path(dst_path)
         with unwrap_errors({_src_path: src_path, _dst_path: dst_path}):

tests/test_copy.py

@@ -37,12 +37,10 @@ def test_copy_fs(self, workers):
         dst_file1_info = dst_fs.getinfo("test.txt", namespaces)
         dst_file2_info = dst_fs.getinfo("foo/bar/baz.txt", namespaces)
         self.assertEqual(dst_file1_info.modified, src_file1_info.modified)
-        self.assertEqual(dst_file1_info.accessed, src_file1_info.accessed)
         self.assertEqual(
             dst_file1_info.metadata_changed, src_file1_info.metadata_changed
         )
         self.assertEqual(dst_file2_info.modified, src_file2_info.modified)
-        self.assertEqual(dst_file2_info.accessed, src_file2_info.accessed)
         self.assertEqual(
             dst_file2_info.metadata_changed, src_file2_info.metadata_changed
         )
@@ -53,6 +51,28 @@ def test_copy_value_error(self):
         with self.assertRaises(ValueError):
             fs.copy.copy_fs(src_fs, dst_fs, workers=-1)
 
+    def test_copy_dir0(self):
+        namespaces = ("details", "accessed", "metadata_changed", "modified")
+
+        src_fs = open_fs("mem://")
+        src_fs.makedirs("foo/bar")
+        src_fs.makedirs("foo/empty")
+        src_fs.touch("test.txt")
+        src_fs.touch("foo/bar/baz.txt")
+        src_file2_info = src_fs.getinfo("foo/bar/baz.txt", namespaces)
+
+        with open_fs("mem://") as dst_fs:
+            fs.copy.copy_dir(src_fs, "/foo", dst_fs, "/", workers=0, preserve_time=True)
+            self.assertTrue(dst_fs.isdir("bar"))
+            self.assertTrue(dst_fs.isdir("empty"))
+            self.assertTrue(dst_fs.isfile("bar/baz.txt"))
+
+            dst_file2_info = dst_fs.getinfo("bar/baz.txt", namespaces)
+            self.assertEqual(dst_file2_info.modified, src_file2_info.modified)
+            self.assertEqual(
+                dst_file2_info.metadata_changed, src_file2_info.metadata_changed
+            )
+
     @parameterized.expand([(0,), (1,), (2,), (4,)])
     def test_copy_dir(self, workers):
         namespaces = ("details", "accessed", "metadata_changed", "modified")
@@ -62,7 +82,6 @@ def test_copy_dir(self, workers):
         src_fs.makedirs("foo/empty")
         src_fs.touch("test.txt")
         src_fs.touch("foo/bar/baz.txt")
-        src_file1_info = src_fs.getinfo("test.txt", namespaces)
         src_file2_info = src_fs.getinfo("foo/bar/baz.txt", namespaces)
 
         with open_fs("mem://") as dst_fs:
@@ -75,7 +94,6 @@ def test_copy_dir(self, workers):
 
             dst_file2_info = dst_fs.getinfo("bar/baz.txt", namespaces)
             self.assertEqual(dst_file2_info.modified, src_file2_info.modified)
-            self.assertEqual(dst_file2_info.accessed, src_file2_info.accessed)
             self.assertEqual(
                 dst_file2_info.metadata_changed, src_file2_info.metadata_changed
             )

tests/test_memoryfs.py

@@ -80,5 +80,4 @@ def test_copy_preserve_time(self):
 
         dst_info = self.fs.getinfo("bar/file.txt", namespaces)
         self.assertEqual(dst_info.modified, src_info.modified)
-        self.assertEqual(dst_info.accessed, src_info.accessed)
         self.assertEqual(dst_info.metadata_changed, src_info.metadata_changed)

tests/test_mirror.py

@@ -12,7 +12,7 @@
 class TestMirror(unittest.TestCase):
     def _contents(self, fs):
         """Extract an FS in to a simple data structure."""
-        namespaces = ("details", "accessed", "metadata_changed", "modified")
+        namespaces = ("details", "metadata_changed", "modified")
         contents = []
         for path, dirs, files in fs.walk():
             for info in dirs:
@@ -28,7 +28,6 @@ def _contents(self, fs):
                         "file",
                         _bytes,
                         _info.modified,
-                        _info.accessed,
                         _info.metadata_changed,
                     )
                 )

tests/test_move.py

@@ -32,12 +32,10 @@ def test_move_fs(self):
             dst_file1_info = dst_fs.getinfo("test.txt", namespaces)
             dst_file2_info = dst_fs.getinfo("foo/bar/baz.txt", namespaces)
             self.assertEqual(dst_file1_info.modified, src_file1_info.modified)
-            self.assertEqual(dst_file1_info.accessed, src_file1_info.accessed)
             self.assertEqual(
                 dst_file1_info.metadata_changed, src_file1_info.metadata_changed
             )
             self.assertEqual(dst_file2_info.modified, src_file2_info.modified)
-            self.assertEqual(dst_file2_info.accessed, src_file2_info.accessed)
             self.assertEqual(
                 dst_file2_info.metadata_changed, src_file2_info.metadata_changed
             )
@@ -62,7 +60,6 @@ def test_move_dir(self):
         if self.preserve_time:
             dst_file2_info = dst_fs.getinfo("bar/baz.txt", namespaces)
             self.assertEqual(dst_file2_info.modified, src_file2_info.modified)
-            self.assertEqual(dst_file2_info.accessed, src_file2_info.accessed)
             self.assertEqual(
                 dst_file2_info.metadata_changed, src_file2_info.metadata_changed
             )