Changeset 5:573fdae8b1f6 in mailjam for postman/storage.py

Timestamp:

May 16, 2012, 11:41:47 AM (12 years ago)

Author:

Francisco de Borja Lopez Rio <borja@…>

Branch:

default

Phase:

public

Message:

Added tests for postman.daemon.Postman

Added a method to postman.daemon.Postman to "clear" all the storage associated
to a given postman instance (removing all the files from disk)

Fixed some bugs, mostly caused by typos through the sources, detected while
writing more tests

Removed the storage and archive attributes from postman.models.MailingList,
now they are methods "marked" as properties using the @property decorator.
This keeps the storage objects from being serialized into json objects by
the storage backend (de-serializing them caused some trouble and it is not
necessary at all)

Added create() and delete() methods to postman.storage.JsonStorage. the first
one ensures the path to the storage file exists (creating all subdirs if
necessary) and the second one deletes the storage file from disk

File:

• postman/storage.py (modified) (4 diffs)

postman/storage.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 
-import os, json
+import os, errno, json
+
 
 class JsonStorage():
@@ -17 +18 @@
         return os.path.exists(self.path)    
 
+    def create(self):
+        """
+        Ensure all the subdirectories in the path to the storage file
+        exist
+        """
+        try:
+            os.makedirs(os.path.dirname(self.path))
+        except OSError, e:
+            # If the dir already exists do not complain, if it is
+            # any other error, raise the exception
+            if e.errno != errno.EEXIST:
+                raise
+    
     def jsonize(self, obj):
         """
@@ -45 +59 @@
         
     def write(self, data):
+        if not self.exists():
+            # ensure the path to the storage file exists
+            self.create()
         with open(self.path, 'w') as storage:
             json.dump(data, storage, sort_keys=True, indent=4,
@@ -64 +81 @@
         return data
 
+    def delete(self):
+        """
+        Remove the storage file
+        """
+        if self.exists():
+            os.remove(self.path)
+            return True
+        return False