Trash: Empty trash also deletes symlinks

Author: jorio

gitfourchette/trash.py

@@ -89,7 +89,7 @@ def refreshFiles(self):
     def makeRoom(self, maxFiles: int):
         while len(self.trashFiles) > maxFiles:
             f = self.trashFiles.pop()
-            if f.is_file():
+            if self.pathIsTrashManaged(f):
                 logger.debug(f"Deleting trash file {f}")
                 f.unlink()
 

test/test_trash.py

@@ -15,10 +15,17 @@ def _fillTrashWithJunk(n):
     trash = Trash.instance()
     trash.refreshFiles()
     trash.clear()
-    os.makedirs(trash.trashDir, exist_ok=True)
+    trash.trashDir.mkdir(parents=True, exist_ok=True)
+
     for i in range(n):
-        with open(F"{trash.trashDir}/19991231T235900-test{i}.txt", "w") as junk:
-            junk.write(F"test{i}")
+        junkPath = Path(trash.trashDir, f"19991231T235900-test{i}.txt")
+
+        # Alternate between bogus text files and bogus symlinks
+        if i % 2 == 0:
+            junkPath.write_text(f"test{i}")
+        else:
+            junkPath.symlink_to(trash.trashDir)
+
     trash.refreshFiles()
 
 
@@ -113,16 +120,21 @@ def testTrashFull(tempDir, mainWindow):
 
 
 def testClearTrash(mainWindow):
-    assert Trash.instance().count() == 0
+    trashInstance = Trash.instance()
+    assert trashInstance.count() == 0
 
     mainWindow.clearRescueFolder()
     acceptQMessageBox(mainWindow, "no discarded (patches|changes) to delete")
 
     _fillTrashWithJunk(40)
-    assert Trash.instance().count() == 40
+    assert trashInstance.count() == 40
     mainWindow.clearRescueFolder()
     acceptQMessageBox(mainWindow, "delete.+40.+discarded (patches|changes)")
-    assert Trash.instance().count() == 0
+    assert trashInstance.count() == 0
+
+    trashInstance.refreshFiles()
+    assert trashInstance.count() == 0
+    assert not list(trashInstance.trashDir.iterdir())
 
 
 def testOpenTrashFolder(mainWindow):