Changeset 4190

Timestamp:

27 May 2009, 11:57:16 (16 years ago)

Author:

uli

Message:

Use new helper function with datacenter storage settings.

Location:

waeup/branches/ulif-rewrite/src/waeup

Files:

• datacenter.py (modified) (5 diffs)
• datacenter_templates/settingsmain.pt (modified) (1 diff)

waeup/branches/ulif-rewrite/src/waeup/datacenter.py

@@ -13 +13 @@
 from zope.interface import Interface
 from waeup.interfaces import IWAeUPObject, IWAeUPCSVImporter, ICSVDataReceivers
+from waeup.utils.helpers import copyFileSystemTree
 from waeup.viewlets import Index, MainArea, LeftSidebar
 
@@ -71 +72 @@
         return result
 
-    def setStoragePath(self, path, move=False):
+    def setStoragePath(self, path, move=False, overwrite=False):
         """Set the path where to store files.
         """
         path = os.path.abspath(path)
+        not_copied = []
         if not os.path.exists(path):
             raise ValueError('The path given does not exist: %s' % path)
         if move is True:
-            # copy contents of old location to new one
-            srcdir = self.storage
-            dstdir = path
-            for item in os.listdir(srcdir):
-                if os.path.isdir(item):
-                    shutil.copytree(os.path.join(srcdir, item),
-                                    os.path.join(dstdir, item))
-                else:
-                    shutil.copy2(os.path.join(srcdir, item), dstdir)
+
+            not_copied = copyFileSystemTree(self.storage, path,
+                                            overwrite=overwrite)
         
         self.storage = path
-
+        return not_copied
 
     def getCSVDataReceivers(self, obj):
@@ -244 +240 @@
     grok.template('master')
 
-    def update(self, newpath=None, save=None, cancel=None):
+    def update(self, newpath=None, move=False, overwrite=False,
+               save=None, cancel=None):
+        if move:
+            move = True
+        if overwrite:
+            overwrite = True
         if newpath is None:
             return
@@ -251 +252 @@
             return
         try:
-            self.context.setStoragePath(newpath)
+            not_copied = self.context.setStoragePath(newpath, move=move)
+            for name in not_copied:
+                self.flash('File already existed (not copied): %s' % name)
         except ValueError:
             self.flash('Given storage path cannot be used.')
@@ -257 +260 @@
             return
         if newpath:
+            self.flash('New storage path succefully set.')
             self.redirect(self.url(self.context))
         return

waeup/branches/ulif-rewrite/src/waeup/datacenter_templates/settingsmain.pt

@@ -7 +7 @@
            tal:attributes="value context/storage" />
     <br />
+    <div>
+      <input type="checkbox" name="move" checked="checked" />
+      <label for="move">Copy existing data to new storage?</label>
+    </div>
+    <div>
+      <input type="checkbox" name="overwrite" checked="no" />
+      <label for="overwrite">Overwrite contents in new location?</label>
+    </div>
+
     <input type="submit" name="save" value="Save" />
     <input type="reset" name="reset" value="Reset" />