offlineimap rev 555

You are receiving this message because
all commits get sent to this address.

Author: jgoerzen
Date: 2003-08-05 15:52:50 -0500 (Tue, 05 Aug 2003)
New Revision: 555

Modified:
  offlineimap/branches/twisted/offlineimap/folder/Base.py
  offlineimap/branches/twisted/offlineimap/folder/IMAP.py
  offlineimap/branches/twisted/offlineimap/imaputil.py
  offlineimap/branches/twisted/twistedfixes/imap4.py

Log:
Making progress on saving messages.


Diff:
Modified: offlineimap/branches/twisted/offlineimap/folder/Base.py
==============================================================================
--- offlineimap/branches/twisted/offlineimap/folder/Base.py	2003-08-05 20:14:30 UTC (rev 554)
+++ offlineimap/branches/twisted/offlineimap/folder/Base.py	2003-08-05 20:52:50 UTC (rev 555)
@@ -235,27 +235,36 @@
         d = self.getmessage(uid)
         d.addCallback(self.syncmessagesto_neguid_msg_worker, uid, dest, applyto,
                       register)
+        return d
 
-    def syncmessagesto_neguid_worker(self, message, uid, dest, applyto,
+    def syncmessagesto_neguid_msg_worker(self, message, uid, dest, applyto,
                                      register):
         successobject = None
         successuid = None
         #message = self.getmessage(uid) Now passed in
         flags = self.getmessageflags(uid)
-        return syncmessagesto_neguid_tryappend(0, None,
-                                               trylist, flags, message, uid, dest,
-                                            applyto, register)
+        return self.syncmessagesto_neguid_msg_tryappend(0, None,
+                                                    applyto, flags, message,
+                                                    uid, dest,
+                                                    applyto, register)
 
-    def syncmessagesto_neguid_tryappend(self, successuid, lasttry,
+    def syncmessagesto_neguid_msg_tryappend(self, successuid, lasttry,
                                         trylist, flags,
                                         message, uid, dest, applyto, register):
-        if successuid >= 0:
+        print "This is syncmessagesto tryappend."
+        print "successuid", successuid
+        print "lasttry", lasttry
+        print "trylist", trylist
+        
+        if successuid > 0:
             # Last server took this message.  Proceed.
-            return syncmessagesto_neguid_realappend(successuid, lasttry,
+            print "Chaining to realappend."
+            return self.syncmessagesto_neguid_msg_realappend(successuid, lasttry,
                                              flags, message, uid, dest, applyto, register)
         if not len(trylist):
+            print "Returning nonde."
             # Did not find any server to take thie message.  Ignore.
-            return
+            return rd(None)
 
         # Process the next one.
         
@@ -263,13 +272,14 @@
         trylist = trylist[1:]
 
         d = tryappend.savemessage(uid, message, flags)
-        d.addCallback(self.syncmessagesto_neguid_tryappend,
+        d.addCallback(self.syncmessagesto_neguid_msg_tryappend,
                       tryappend, trylist, flags, message, uid, dest,
                       applyto, register)
+        print "Chaining to savemessage and myself."
         return d
 
 
-    def syncmessagesto_neguid_realappend(self, successuid, successobject,
+    def syncmessagesto_neguid_msg_realappend(self, successuid, successobject,
                                          flags, message, uid, dest, applyto,
                                          register):
         # Did we succeed?

Modified: offlineimap/branches/twisted/offlineimap/folder/IMAP.py
==============================================================================
--- offlineimap/branches/twisted/offlineimap/folder/IMAP.py	2003-08-05 20:14:30 UTC (rev 554)
+++ offlineimap/branches/twisted/offlineimap/folder/IMAP.py	2003-08-05 20:52:50 UTC (rev 555)
@@ -189,6 +189,7 @@
 
     def _savemessage_acquired(self, imapobj, uid, content, flags):
         ui = UIBase.getglobalui()
+        print "savemessage_acquired called"
         ui.debug('imap', 'savemessage_step1: called')
         d = imapobj.select(self.getfullname())
         d.addCallback(self._savemessage_step2, imapobj, uid, content, flags)
@@ -197,6 +198,7 @@
     def _savemessage_step2(self, ignore, imapobj, uid, content, flags):
         # This backend always assigns a new uid, so the uid arg is ignored.
         # In order to get the new uid, we need to save off the message ID.
+        print "savemessage_step2 called"
         ui = UIBase.getglobalui()
         message = rfc822.Message(StringIO(content))
         datetuple = rfc822.parsedate(message.getheader('Date'))
@@ -239,6 +241,7 @@
 
     def savemessage_fetchuid(self, ignore, imapobj, headername, headervalue,
                              flags, previousattempts):
+        print "This is savemessage_fetchuid"
         ui = UIBase.getglobalui()
         ui.debug('imap', 'savemessage: attempt %d to get new UID' \
                  % previousattempts)
@@ -255,6 +258,7 @@
 
     def savemessage_tryregister(self, uid, imapobj, headername, headervalue,
                                 flags, previousattempts):
+        print "This is savemessage_tryregister"
         if not uid:
             d = imapobj.noop()
             d.addCallback(self.savemessage_fetchuid, imapobj, headername,
@@ -265,6 +269,7 @@
             return self.savemessage_register(None, uid, flags)
 
     def savemessage_register(self, ignore, uid, flags):
+        print "This is savemessage_register"
         #self.imapserver.releaseconnection(imapobj)
         self.messagelist[uid] = {'uid': uid, 'flags': flags}
         ui.debug('imap', 'savemessage: returning %d' % uid)

Modified: offlineimap/branches/twisted/offlineimap/imaputil.py
==============================================================================
--- offlineimap/branches/twisted/offlineimap/imaputil.py	2003-08-05 20:14:30 UTC (rev 554)
+++ offlineimap/branches/twisted/offlineimap/imaputil.py	2003-08-05 20:52:50 UTC (rev 555)
@@ -21,10 +21,14 @@
 import re, string, types
 from offlineimap.ui import UIBase
 from twisted.internet import defer
-from imaplib import Time2Internaldate, Internaldate2tuple
+import imaplib
+from imaplib import Internaldate2tuple
 
 quotere = re.compile('^("(?:[^"]|\\\\")*")')
 
+def Time2Internaldate(input):
+    return imaplib.Time2Internaldate(input)[1:-1]
+
 def debug(*args):
     msg = []
     for arg in args:

Modified: offlineimap/branches/twisted/twistedfixes/imap4.py
==============================================================================
--- offlineimap/branches/twisted/twistedfixes/imap4.py	2003-08-05 20:14:30 UTC (rev 554)
+++ offlineimap/branches/twisted/twistedfixes/imap4.py	2003-08-05 20:52:50 UTC (rev 555)
@@ -2189,6 +2189,10 @@
                     raise IllegalServerResponse('(%s %s): %s' % (k, status[k], str(e)))
         return status
 
+    def sendLine(self, line):
+        print 'C:', repr(line)
+        return basic.LineReceiver.sendLine(self, line)
+
     def append(self, mailbox, message, flags = (), date = None):
         """Add the given message to the currently selected mailbox