remove mtime fallback (#47)

Author: dlqqq

jupyter_server_fileid/manager.py

@@ -547,14 +547,6 @@ def _sync_dir(self, dir_path):
 
         scan_iter.close()
 
-    def _check_timestamps(self, stat_info, src_crtime, src_mtime):
-        """Returns True if the timestamps of a file match those recorded in the
-        Files table. Returns False otherwise."""
-
-        src_timestamp = src_crtime if src_crtime is not None else src_mtime
-        dst_timestamp = stat_info.crtime if stat_info.crtime is not None else stat_info.mtime
-        return src_timestamp == dst_timestamp
-
     def _sync_file(self, path, stat_info):
         """
         Syncs the file at `path` with the Files table by detecting whether the
@@ -588,16 +580,16 @@ def _sync_file(self, path, stat_info):
             return None
 
         src = self.con.execute(
-            "SELECT id, path, crtime, mtime FROM Files WHERE ino = ?", (stat_info.ino,)
+            "SELECT id, path, crtime FROM Files WHERE ino = ?", (stat_info.ino,)
         ).fetchone()
 
         # if ino is not in database, return None
         if src is None:
             return None
-        id, old_path, crtime, mtime = src
+        id, old_path, crtime = src
 
         # if timestamps don't match, delete existing record and return None
-        if not self._check_timestamps(stat_info, crtime, mtime):
+        if crtime != stat_info.crtime:
             self.con.execute("DELETE FROM Files WHERE id = ?", (id,))
             return None
 
@@ -744,21 +736,17 @@ def get_path(self, id):
         # optimistic approach: first check to see if path was not yet moved
         for retry in [True, False]:
             row = self.con.execute(
-                "SELECT path, ino, crtime, mtime FROM Files WHERE id = ?", (id,)
+                "SELECT path, ino, crtime FROM Files WHERE id = ?", (id,)
             ).fetchone()
 
             # if file ID does not exist, return None
             if not row:
                 return None
 
-            path, ino, crtime, mtime = row
+            path, ino, crtime = row
             stat_info = self._stat(path)
 
-            if (
-                stat_info
-                and ino == stat_info.ino
-                and self._check_timestamps(stat_info, crtime, mtime)
-            ):
+            if stat_info and ino == stat_info.ino and crtime == stat_info.crtime:
                 # if file already exists at path and the ino and timestamps match,
                 # then return the correct path immediately (best case)
                 return self._from_normalized_path(path)

tests/test_manager.py

@@ -209,6 +209,10 @@ def test_index_oob_move(fid_manager, old_path, new_path, fs_helpers):
     assert fid_manager.index(new_path) == id
 
 
+crtime_support = os.name == "nt" or hasattr(os.stat_result, "st_birthtime")
+
+
+@pytest.mark.skipif(not crtime_support, reason="Requires crtime support.")
 def test_index_after_deleting_dir_in_same_path(fid_manager, test_path, fs_helpers):
     old_id = fid_manager.index(test_path)
 
@@ -221,6 +225,7 @@ def test_index_after_deleting_dir_in_same_path(fid_manager, test_path, fs_helper
     assert fid_manager.get_path(new_id) == test_path
 
 
+@pytest.mark.skipif(not crtime_support, reason="Requires crtime support.")
 def test_index_after_deleting_regfile_in_same_path(fid_manager, test_path_child, fs_helpers):
     old_id = fid_manager.index(test_path_child)