Check for ID before recording a record

Author: Zsailer

jupyter_server_fileid/manager.py

@@ -311,19 +311,18 @@ def _from_normalized_path(self, path: Optional[str]) -> Optional[str]:
         return relpath
 
     def _create(self, path: str) -> str:
-        path = self._normalize_path(path)
-        id = self._uuid()
-        self.con.execute("INSERT INTO Files (id, path) VALUES (?, ?)", (id, path))
-        return id
-
-    def index(self, path: str) -> str:
         path = self._normalize_path(path)
         row = self.con.execute("SELECT id FROM Files WHERE path = ?", (path,)).fetchone()
         existing_id = row and row[0]
 
         if existing_id:
             return existing_id
+        
+        id = self._uuid()
+        self.con.execute("INSERT INTO Files (id, path) VALUES (?, ?)", (id, path))
+        return id
 
+    def index(self, path: str) -> str:
         # create new record
         id = self._create(path)
         self.con.commit()
@@ -613,8 +612,17 @@ def _sync_file(self, path, stat_info):
             "SELECT id, path, crtime FROM Files WHERE ino = ?", (stat_info.ino,)
         ).fetchone()
 
+
         # if ino is not in database, return None
         if src is None:
+            # If this path previously existed, but was removed OOB, 
+            # then there will be an outdated record that we should
+            # delete here to avoid old file ID's from being returned
+            # anywhere.
+            row = self.con.execute("SELECT id FROM Files WHERE path = ?", (path,)).fetchone()
+            if row:
+                old_id = row[0]
+                self.con.execute("DELETE FROM Files where id = ?", (old_id,))
             return None
         id, old_path, crtime = src
 
@@ -626,6 +634,7 @@ def _sync_file(self, path, stat_info):
         # otherwise update existing record with new path, moving any indexed
         # children if necessary. then return its id
         self._update(id, path=path)
+
         if stat_info.is_dir and old_path != path:
             self._move_recursive(old_path, path)
             self._update_cursor = True
@@ -672,6 +681,13 @@ def _create(self, path, stat_info):
         dangerous and may throw a runtime error if the file is not guaranteed to
         have a unique `ino`.
         """
+        row = self.con.execute("SELECT id FROM Files WHERE path = ?", (path,)).fetchone()
+        existing_id = row and row[0]
+
+        # If the file ID already exists, update it with stat_info.
+        if existing_id:
+            return existing_id
+            
         id = self._uuid()
         self.con.execute(
             "INSERT INTO Files (id, path, ino, crtime, mtime, is_dir) VALUES (?, ?, ?, ?, ?, ?)",