offlineimap rev 562

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

Author: jgoerzen
Date: 2003-08-13 11:02:01 -0500 (Wed, 13 Aug 2003)
New Revision: 562

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

Log:
Removed some extraneous debugging code and began work on cleaning up the UI
situation.


Diff:
Modified: offlineimap/branches/twisted/offlineimap/accounts.py
===================================================================
--- offlineimap/branches/twisted/offlineimap/accounts.py	2003-08-13 15:23:28 UTC (rev 561)
+++ offlineimap/branches/twisted/offlineimap/accounts.py	2003-08-13 16:02:01 UTC (rev 562)
@@ -109,24 +109,27 @@
         # Connect to the local cache.
         self.statusrepos = offlineimap.repository.LocalStatus.LocalStatusRepository(self.getconf('localrepository'), self)
 
-        print "In nextstep"
+        #print "In nextstep"
         if not self.refreshperiod:
-            self.sync()
-            self.ui.acctdone(self.name)
-            return
+            d = self.sync()
+            d.addCallback(self.acctdone)
+            return d
         looping = 1
         while looping:
             self.sync()
             looping = self.sleeper() != 2
         self.ui.acctdone(self.name)
 
+    def acctdone(self, ignore):
+        self.ui.acctdone(self.name)
+
     def getaccountmeta(self):
         return os.path.join(self.metadatadir, 'Account-' + self.name)
 
     
 
     def sync(self):
-        print "This is sync."
+        #print "This is sync."
         # We don't need an account lock because syncitall() goes through
         # each account once, then waits for all to finish.
         remoterepos = self.remoterepos
@@ -136,13 +139,12 @@
         d = self.remoterepos.syncfoldersto(self.localrepos)
         d.addCallback(self.sync_getfolders)
         d.addCallback(self.sync_runfolders)
+        return d
 
     def sync_getfolders(self, d):
-        print "sync_getfolders"
         return self.remoterepos.getfolders()
 
     def sync_runfolders(self, remotefolders):
-        print "sync_runfolders"
         dl = defer.DeferredList([])
         for remotefolder in remotefolders:
             sf = SyncFolder(self.name, self.remoterepos, remotefolder,
@@ -152,7 +154,6 @@
         dl.addCallback(self.sync_finish)
 
     def sync_finish(self, d):
-        print "sync_finish"
         mbnames.write()
         #localrepos.holdordropconnections()
         #remoterepos.holdordropconnections()
@@ -163,8 +164,6 @@
 class SyncFolder:
     def __init__(self, accountname, remoterepos, remotefolder, localrepos,
                statusrepos):
-        print "SyncFolder instanaiated for", accountname, remoterepos, \
-              remotefolder, localrepos, statusrepos
         self.accountname = accountname
         self.remoterepos = remoterepos
         self.remotefolder = remotefolder
@@ -173,7 +172,6 @@
         self.ui = UIBase.getglobalui()
 
     def start(self):
-        print "SyncFolder start"
         self.ui.registerthread(self.accountname)
         self.localfolder = self.localrepos.\
             getfolder(self.remotefolder.getvisiblename().\
@@ -190,7 +188,6 @@
         return d
 
     def local_cache(self):
-        print "SyncFolder local_cache"
         # Load local folder.
         # Write the mailboxes
         mbnames.add(self.accountname, self.localfolder.getvisiblename())
@@ -201,7 +198,6 @@
         return self.localfolder.cachemessagelist()
 
     def status_load(self, d):
-        print "SyncFolder status_load"
         self.ui.messagelistloaded(self.localrepos, self.localfolder,
                              len(self.localfolder.getmessagelist().keys()))
         # Load status folder.
@@ -211,7 +207,6 @@
                                                   self.statusrepos.getsep()))
     
     def status_cache(self, d):
-        print "Syncfolder status_cache"
         self.statusfolder = d
         
         if self.localfolder.getuidvalidity() == None:
@@ -222,7 +217,6 @@
         return self.statusfolder.cachemessagelist()
 
     def load_validities(self, d):
-        print "SyncFolder load_validities"
         self.validities = {}
 
         deferreds = []
@@ -239,11 +233,9 @@
         return defer.DeferredList(deferreds)
 
     def _set_validities(self, value, name):
-        print "SyncFolder _set_validities"
         self.validities[name] = value
 
     def check_validities(self, d):
-        print "SyncFolder check_validities"
         # If either the local or the status folder has messages and
         # there is a UID validity problem, warn and abort.  If there
         # are no messages, UW IMAPd loses UIDVALIDITY.  But we don't
@@ -272,14 +264,12 @@
 
 
     def check_local_deleted(self, d):
-        print "SyncFolder check_local_deleted"
         self.ui.messagelistloaded(self.remoterepos, self.remotefolder,
                              len(self.remotefolder.getmessagelist().keys()))
 
 
 
         if not self.statusfolder.isnewfolder():
-            print "Not new folder..."
             # Delete local copies of remote messages.  This way,
             # if a message's flag is modified locally but it has been
             # deleted remotely, we'll delete it locally.  Otherwise, we
@@ -300,7 +290,6 @@
             #localfolder.syncmessagesto(statusfolder, [remotefolder, statusfolder])
             
     def sync_remote_changes(self, d):
-        print "sync_remote_changes"
         # Synchronize remote changes.
         self.ui.syncingmessages(self.remoterepos, self.remotefolder,
                            self.localrepos, self.localfolder)
@@ -309,13 +298,11 @@
                                                  self.statusfolder])
 
     def sync_status(self, d):
-        print "sync_status"
         # Make sure the status folder is up-to-date.
         self.ui.syncingmessages(self.localrepos, self.localfolder,
                            self.statusrepos, self.statusfolder)
         return self.localfolder.syncmessagesto(self.statusfolder)
 
     def finish(self, d):
-        print "finish"
         self.statusfolder.save()
 

Modified: offlineimap/branches/twisted/offlineimap/folder/IMAP.py
===================================================================
--- offlineimap/branches/twisted/offlineimap/folder/IMAP.py	2003-08-13 15:23:28 UTC (rev 561)
+++ offlineimap/branches/twisted/offlineimap/folder/IMAP.py	2003-08-13 16:02:01 UTC (rev 562)
@@ -1,5 +1,5 @@
 # IMAP folder support
-# Copyright (C) 2002 John Goerzen
+# Copyright (C) 2002, 2003 John Goerzen
 # <[email protected]>
 #
 #    This program is free software; you can redistribute it and/or modify

Modified: offlineimap/branches/twisted/offlineimap/repository/IMAP.py
===================================================================
--- offlineimap/branches/twisted/offlineimap/repository/IMAP.py	2003-08-13 15:23:28 UTC (rev 561)
+++ offlineimap/branches/twisted/offlineimap/repository/IMAP.py	2003-08-13 16:02:01 UTC (rev 562)
@@ -147,10 +147,6 @@
         #print "getfolders_real"
         retval = []
         for flags, delim, name in listresult:
-            print type(flags)
-            print type(delim)
-            print type(name)
-            print flags, delim, name
             flaglist = [x.lower() for x in flags]
             if '\\noselect' in flaglist:
                 continue