offlineimap rev 530

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

Author: jgoerzen
Date: 2003-07-27 17:18:37 -0500 (Sun, 27 Jul 2003)
New Revision: 530

Modified:
  offlineimap/branches/twisted/offlineimap/accounts.py
  offlineimap/branches/twisted/offlineimap/folder/Maildir.py
  offlineimap/branches/twisted/offlineimap/repository/Maildir.py

Log:
More work Twistedifying


Diff:
Modified: offlineimap/branches/twisted/offlineimap/accounts.py
==============================================================================
--- offlineimap/branches/twisted/offlineimap/accounts.py	2003-07-27 22:03:25 UTC (rev 529)
+++ offlineimap/branches/twisted/offlineimap/accounts.py	2003-07-27 22:18:37 UTC (rev 530)
@@ -175,10 +175,11 @@
 
     def start(self):
         self.ui.registerthread(self.accountname)
-        d = self.localrepos.\
+        self.localfolder = self.localrepos.\
             getfolder(self.remotefolder.getvisiblename().\
                       replace(self.remoterepos.getsep(),
                               self.localrepos.getsep()))
+        d = self.local_cache()
         d.addCallback(self.local_cache)
         d.addCallback(self.status_load)
         d.addCallback(self.status_cache)
@@ -189,19 +190,18 @@
         d.addCallback(self.finish)
         return d
 
-    def local_cache(self, d):
-        self.localfolder = d
+    def local_cache(self):
         # Load local folder.
         # Write the mailboxes
-        mbnames.add(accountname, self.localfolder.getvisiblename())
+        mbnames.add(self.accountname, self.localfolder.getvisiblename())
         # Load local folder
-        ui.syncingfolder(self.remoterepos, self.remotefolder,
-                         self.localrepos, self.localfolder)
-        ui.loadmessagelist(self.localrepos, self.localfolder)
+        self.ui.syncingfolder(self.remoterepos, self.remotefolder,
+                              self.localrepos, self.localfolder)
+        self.ui.loadmessagelist(self.localrepos, self.localfolder)
         return self.localfolder.cachemessagelist()
 
     def status_load(self, d):
-        ui.messagelistloaded(self.localrepos, self.localfolder,
+        self.ui.messagelistloaded(self.localrepos, self.localfolder,
                              len(self.localfolder.getmessagelist().keys()))
         # Load status folder.
         #statusfolder =

Modified: offlineimap/branches/twisted/offlineimap/folder/Maildir.py
==============================================================================
--- offlineimap/branches/twisted/offlineimap/folder/Maildir.py	2003-07-27 22:03:25 UTC (rev 529)
+++ offlineimap/branches/twisted/offlineimap/folder/Maildir.py	2003-07-27 22:18:37 UTC (rev 530)
@@ -21,7 +21,9 @@
 from offlineimap.ui import UIBase
 from threading import Lock
 import os.path, os, re, time, socket, md5
+from offlineimap.imaputil import rd
 
+
 foldermatchre = re.compile(',FMD5=([0-9a-f]{32})')
 uidmatchre = re.compile(',U=(\d+)')
 flagmatchre = re.compile(':.*2,([A-Z]+)')
@@ -113,6 +115,7 @@
 
     def cachemessagelist(self):
         self.messagelist = self._scanfolder()
+        return rd(None)
             
     def getmessagelist(self):
         return self.messagelist

Modified: offlineimap/branches/twisted/offlineimap/repository/Maildir.py
==============================================================================
--- offlineimap/branches/twisted/offlineimap/repository/Maildir.py	2003-07-27 22:03:25 UTC (rev 529)
+++ offlineimap/branches/twisted/offlineimap/repository/Maildir.py	2003-07-27 22:18:37 UTC (rev 530)
@@ -86,7 +86,7 @@
     def deletefolder(self, foldername):
         self.ui.warn("NOT YET IMPLEMENTED: DELETE FOLDER %s" % foldername)
 
-    def getfolder(self, foldername):
+    def getfolder(self, foldername, deferred = 1):
         return folder.Maildir.MaildirFolder(self.root, foldername,
                                             self.getsep(), self, self.accountname)