X-Git-Url: http://git.droids-corp.org/?p=imapami.git;a=blobdiff_plain;f=imapami%2Factions.py;fp=imapami%2Factions.py;h=63f4f52577c99b4117ededbdc9264cccf8b0b07e;hp=7525133c530524448edbceefb85c8427b0f7dabf;hb=95f172d6c69c298e9cdb1cd90402281923506a0c;hpb=a5fad708a8f0fa43f183e5ec1044b0cd3da6d4ad

diff --git a/imapami/actions.py b/imapami/actions.py
index 7525133..63f4f52 100644
--- a/imapami/actions.py
+++ b/imapami/actions.py
@@ -273,13 +273,19 @@ class ImapamiActionMove(ImapamiAction):
         ImapamiAction.__init__(self, terminal=True)
         self.dest = dest
     def process(self, ami, mail):
-        ret = ImapamiActionCopy.process(
-            self, ami, mail)
-        if ret == False:
+        imap = ami.imap
+        dest = self.evaluate(self.dest, ami, mail.msg)
+        imap.create(dest)
+        ret, msg = imap.copy(mail.item, dest)
+        if ret != "OK":
+            ami.logger.warning(
+                "imap copy returned %s: %s" % (ret, str(msg)))
             return False
-        ret = ImapamiActionDelete.process(
-            self, ami, mail)
-        if ret == False:
+        ret, msg = imap.store(mail.item, '+FLAGS', '\\Deleted')
+        if ret != "OK":
+            ami.logger.warning(
+                "imap store '%s %s' returned %s: %s" % (
+                    cmd, flag, ret, str(msg)))
             return False
         return True
 register(ImapamiActionMove)