[Zope3-checkins] CVS: Zope3/src/zope/app/browser/content - fssync.py:1.16

[Guido van Rossum]

Update of /cvs-repository/Zope3/src/zope/app/browser/content
In directory cvs.zope.org:/tmp/cvs-serv20741/zope/app/browser/content

Modified Files:
	fssync.py 
Log Message:
Refactored the Committer class, separating it out (again!) into a
Checker class and a Committer class.  The Committer class no longer
modifies the filesystem; that's toFS()'s responsibility (also due for
a rewrite).  The unit tests for Committer are much more sensible now.


=== Zope3/src/zope/app/browser/content/fssync.py 1.15 => 1.16 ===
--- Zope3/src/zope/app/browser/content/fssync.py:1.15	Mon Jun  2 16:44:41 2003
+++ Zope3/src/zope/app/browser/content/fssync.py	Tue Jun  3 13:08:51 2003
@@ -28,7 +28,7 @@
 from zope.app.interfaces.exceptions import UserError
 from zope.fssync.snarf import Snarfer, Unsnarfer
 from zope.app.fssync.syncer import toFS
-from zope.app.fssync.committer import Committer
+from zope.app.fssync.committer import Committer, Checker
 from zope.fssync.metadata import Metadata
 
 def snarf_dir(response, dirname):
@@ -91,7 +91,7 @@
             istr.seek(0)
             uns = Unsnarfer(istr)
             uns.unsnarf(working)
-            # 3) Commit; this includes the uptodate check and updates
+            # 3) Check uptodateness (may raise SynchronizationError)
             name = objectName(self.context)
             container = getParent(self.context)
             if container is None and name == "":
@@ -101,21 +101,11 @@
             else:
                 fspath = os.path.join(working, name)
             md = Metadata()
-            c = Committer(md)
-            c.synch(container, name, fspath)
-            # 4) Generate response (snarfed archive or error text)
-            errors = c.get_errors()
-            if not errors:
-                # The flush() isn't really needed, but it's better to
-                # waste some cycles now than to have this corrupt some
-                # files later.
-                md.flush()
-                # Do a fresh toFS(), to be sure to get all changes
-                shutil.rmtree(working)
-                os.mkdir(working)
-                toFS(self.context, objectName(self.context) or "root", working)
-                return snarf_dir(self.request.response, working)
-            else:
+            c = Checker(md)
+            c.check(container, name, fspath)
+            e = c.errors()
+            if e:
+                # 3.1) Generate error response
                 txn.abort()
                 lines = ["Up-to-date check failed:"]
                 working_sep = os.path.join(working, "") # E.g. foo -> foo/
@@ -124,6 +114,15 @@
                 lines.append("")
                 self.request.response.setHeader("Content-Type", "text/plain")
                 return "\n".join(lines)
+            # 4) Commit (may raise SynchronizationError)
+            c = Committer(md)
+            c.synch(container, name, fspath)
+            # 5) Call toFS() to return the complete new state
+            shutil.rmtree(working) # Start with clean slate
+            os.mkdir(working)
+            toFS(self.context, objectName(self.context) or "root", working)
+            # 6) Return successful response
+            return snarf_dir(self.request.response, working)
         finally:
             if os.path.exists(working):
                 shutil.rmtree(working)