Added some extra checks for deleting files when the file is brand new, and updated the test to check it works

2020-05-30 15:34:28 +02:00
parent f3f61c43f0
commit 724e597d9c
4 changed files with 36 additions and 16 deletions
@@ -152,15 +152,19 @@ class NWProject():
        self.projTree.append(None, pHandle, newItem)
        return newItem.itemHandle

-    def addTrash(self):
+    def trashFolder(self):
        """Add the special trash root folder to the project.
        """
-        newItem = NWItem(self)
-        newItem.setName("Trash")
-        newItem.setType(nwItemType.TRASH)
-        newItem.setClass(nwItemClass.TRASH)
-        self.projTree.append(None, None, newItem)
-        return newItem.itemHandle
+        trashHandle = self.projTree.trashRoot()
+        if trashHandle is None:
+            newItem = NWItem(self)
+            newItem.setName("Trash")
+            newItem.setType(nwItemType.TRASH)
+            newItem.setClass(nwItemClass.TRASH)
+            self.projTree.append(None, None, newItem)
+            return newItem.itemHandle
+
+        return trashHandle

    ##
    #  Project Methods