destroy blobfiles if they exist

Fixes [SF#1654132]

Author: Justus Pendleton

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-#$Id: back_anydbm.py,v 1.206 2007-09-11 21:33:30 jpend Exp $
+#$Id: back_anydbm.py,v 1.207 2007-09-16 06:51:48 jpend Exp $
 '''This module defines a backend that saves the hyperdatabase in a
 database chosen by anydbm. It is guaranteed to always be available in python
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -377,6 +377,7 @@ def destroynode(self, classname, nodeid):
 
         # add the destroy commit action
         self.transactions.append((self.doDestroyNode, (classname, nodeid)))
+        self.transactions.append((FileStorage.destroy, (self, classname, nodeid)))
 
     def serialise(self, classname, node):
         '''Copy the node contents, converting non-marshallable data into
@@ -718,9 +719,6 @@ def doDestroyNode(self, classname, nodeid):
         if db.has_key(nodeid):
             del db[nodeid]
 
-        # return the classname, nodeid so we reindex this content
-        return (classname, nodeid)
-
     def rollback(self):
         ''' Reverse all actions from the current transaction.
         '''
@@ -1522,7 +1520,7 @@ def getnodeids(self, db=None, retired=None):
         must_close = False
         if db is None:
             db = self.db.getclassdb(self.classname)
-            must_close = True 
+            must_close = True
         try:
             res = res + db.keys()
 
@@ -1561,7 +1559,7 @@ def _filter(self, search_matches, filterspec, proptree,
 
         The filter must match all properties specificed. If the property
         value to match is a list:
-        
+
         1. String properties must match all elements in the list, and
         2. Other properties must match any of the elements in the list.
         """

roundup/backends/blobfiles.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-#$Id: blobfiles.py,v 1.21 2007-09-12 16:15:40 jpend Exp $
+#$Id: blobfiles.py,v 1.22 2007-09-16 06:51:48 jpend Exp $
 '''This module exports file storage for roundup backends.
 Files are stored into a directory hierarchy.
 '''
@@ -163,4 +163,21 @@ def rollbackStoreFile(self, classname, nodeid, property, **databases):
             name += '.tmp'
         os.remove(name)
 
+    def isStoreFile(self, classname, nodeid):
+        '''See if there is actually any FileStorage for this node.
+           Is there a better way than using self.filename?
+        '''
+        try:
+            fname = self.filename(classname, nodeid)
+            return True
+        except IOError:
+            return False
+
+    def destroy(self, classname, nodeid):
+        '''If there is actually FileStorage for this node
+           remove it from the filesystem
+        '''
+        if self.isStoreFile(classname, nodeid):
+            os.remove(self.filename(classname, nodeid))
+
 # vim: set filetype=python ts=4 sw=4 et si

roundup/backends/rdbms_common.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-#$Id: rdbms_common.py,v 1.189 2007-09-11 21:33:30 jpend Exp $
+#$Id: rdbms_common.py,v 1.190 2007-09-16 06:51:48 jpend Exp $
 """ Relational database (SQL) backend common code.
 
 Basics:
@@ -1025,6 +1025,9 @@ def destroynode(self, classname, nodeid):
         sql = 'delete from %s__journal where nodeid=%s'%(classname, self.arg)
         self.sql(sql, (nodeid,))
 
+        # cleanup any blob filestorage when we commit
+        self.transactions.append((FileStorage.destroy, (self, classname, nodeid)))
+
     def hasnode(self, classname, nodeid):
         """ Determine if the database has a given node.
         """

test/db_test_base.py

@@ -15,9 +15,9 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: db_test_base.py,v 1.89 2007-09-03 17:14:09 jpend Exp $
+# $Id: db_test_base.py,v 1.90 2007-09-16 06:51:48 jpend Exp $
 
-import unittest, os, shutil, errno, imp, sys, time, pprint, sets, base64
+import unittest, os, shutil, errno, imp, sys, time, pprint, sets, base64, os.path
 
 from roundup.hyperdb import String, Password, Link, Multilink, Date, \
     Interval, DatabaseError, Boolean, Number, Node
@@ -548,6 +548,15 @@ def testTransactions(self):
         name2 = self.db.user.get('1', 'username')
         self.assertEqual(name1, name2)
 
+    def testDestroyBlob(self):
+        # destroy an uncommitted blob
+        f1 = self.db.file.create(content='hello', type="text/plain")
+        self.db.commit()
+        fn = self.db.filename('file', f1)
+        self.db.file.destroy(f1)
+        self.db.commit()
+        self.assertEqual(os.path.exists(fn), False)
+
     def testDestroyNoJournalling(self):
         self.innerTestDestroy(klass=self.db.session)