X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fmv%2Fplugins%2Fdovecot.rb;h=bd3084edde576d7e9d1eb57dc6a25644f2d4e46d;hp=9cdfc36ead95a013f03cacadd5763c674ea521fc;hb=f819b178c5c1cb8adda0182c610e5c52fad8bea7;hpb=8a3e804a4c5f33bee1d80243be6b139e45f07a48

diff --git a/lib/mv/plugins/dovecot.rb b/lib/mv/plugins/dovecot.rb
index 9cdfc36..bd3084e 100644
--- a/lib/mv/plugins/dovecot.rb
+++ b/lib/mv/plugins/dovecot.rb
@@ -9,36 +9,43 @@ class DovecotMv
   include DovecotPlugin
   include MvPlugin
 
-  def mv_user(user_from, user_to)
-    # Move the user's mail directory from one domain (that should
-    # exist) to another domain (that should exist).
+  def mv_user(src, dst)
+    # It's obviously an error if the source user does not exist.
+    raise NonexistentUserError.new(src.to_s()) if not user_exists(src)
+
+    # And it's an error if the destination user exists already.
+    raise UserAlreadyExistsError.new(dst.to_s()) if user_exists(dst)
+
+    # But is it an error if the target domain does not exist? That's a
+    # bit subtle... The domain may exist in the database, but if it
+    # has not received any mail yet, then its directory won't exist
+    # on-disk.
+    #
+    # There are two possible "oops" scenarios resulting from the fact
+    # that we may run either the Postfixadmin move first or the
+    # Dovecot move first. If we move the user in the database, we
+    # definitely want to move him on disk (that is, we should create
+    # the directory here). But if we move him on disk first, then we
+    # don't know if the database move will fail! We don't want to move
+    # his mail files if he won't get moved in the database.
     #
-    # This is actually a little subtle, because none of the
-    # directories in question have to exist. If I create two new
-    # domains in postfixadmin and one mailbox but never deliver any
-    # mail, it should be possible to move the mailbox to the other
-    # domain. No directories will exist until mail is delivered,
-    # though.
-
-    # get_user_path() will fail if there's no mailbox to move. It will
-    # also fail on an invalid user -- oh well!
-    begin
-      from_path = self.get_user_path(user_from)
-    rescue NonexistentUserError
-      # Do nothing, there's no source mailbox...
-      return
+    # Faced with two equally-bad (but easy-to-fix) options, we do the
+    # simplest thing and fail if the destination domain directory
+    # doesn't exist. If nothing else, this is at least consistent.
+    if not self.domain_exists(dst.domain()) then
+      raise NonexistentDomainError.new(dst.domainpart())
     end
 
     # We may need to create the target domain directory, even if the
     # domain exists in the database.
-    domain_to = user_to.split('@')[1]
-    domain_dir = self.get_domain_path(domain_to)
-    FileUtils.mkdir_p(domain_dir)
-
-    # The from_path exists or else we would have returned earlier. The
-    # parent of to_path exists because we just created it.
-    to_path = self.get_user_path(user_to, false)
-    FileUtils.mv(from_path, to_path)
+    FileUtils.mkdir_p(self.get_domain_path(dst.domain()))
+
+    # The parent of dst_path exists because we just created it.The
+    # source path should exist too, because the "source user" does,
+    # and, well, how did we determine that?
+    src_path = self.get_user_path(src)
+    dst_path = self.get_user_path(dst)
+    FileUtils.mv(src_path, dst_path)
   end
 
 end