Changeset 7568

Timestamp:

2 Feb 2012, 21:09:31 (13 years ago)

Author:

Henrik Bettermann

Message:

Move storage path configuration to SIRPUtils in order to ease customization.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• datacenter.py (modified) (3 diffs)
• interfaces.py (modified) (1 diff)
• utils/utils.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/datacenter.py

@@ -26 +26 @@
 import grok
 from datetime import datetime
+from zope.component import getUtility
 from zope.component.interfaces import ObjectEvent
 from waeup.sirp.interfaces import (IDataCenter, IDataCenterFile,
-                                   IDataCenterStorageMovedEvent)
+                                   IDataCenterStorageMovedEvent,
+                                   ISIRPUtils)
 from waeup.sirp.utils.helpers import copy_filesystem_tree
 from waeup.sirp.utils.logger import Logger
@@ -36 +38 @@
     """
     grok.implements(IDataCenter)
-    storage = os.path.join(os.path.dirname(__file__), 'files')
 
     logger_name = 'waeup.sirp.${sitename}.datacenter'
@@ -43 +44 @@
     def __init__(self, *args, **kw):
         super(DataCenter, self).__init__(*args, **kw)
+        self.storage = getUtility(ISIRPUtils).storage()
         self._createSubDirs()
 

main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py

@@ -143 +143 @@
     """A collection of methods which are subject to customization.
     """
+
+    def storage():
+        """Return the initial storage path of the data center.
+        """
+
     def sendContactForm(
           from_name,from_addr,rcpt_name,rcpt_addr,

main/waeup.sirp/trunk/src/waeup/sirp/utils/utils.py

@@ -18 +18 @@
 """General helper utilities for SIRP.
 """
+import os
 import grok
 import string
@@ -38 +39 @@
     """
     grok.implements(ISIRPUtils)
+
+    def storage(self):
+        """Return the initial storage path of the data center.
+        """
+        return os.path.dirname(__file__).replace('utils','files')
 
     def sendContactForm(self,from_name,from_addr,rcpt_name,rcpt_addr,