Attempt to fix a crashing bug in Gmail driver

[offlineimap] / offlineimap / accounts.py

diff --git a/offlineimap/accounts.py b/offlineimap/accounts.py
index 74791b9a566ecfe1c4e44892047d2e596152e560..8e96347944f58c37fcada83fd98fb18dca16e23a 100644 (file)
--- a/offlineimap/accounts.py
+++ b/offlineimap/accounts.py
@@ -13,7 +13,7 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 from offlineimap import threadutil, mbnames, CustomConfig
 import offlineimap.repository.Base, offlineimap.repository.LocalStatus
@@ -45,6 +45,7 @@ class Account(CustomConfig.ConfigHelperMixin):
         self.localeval = config.getlocaleval()
         self.ui = UIBase.getglobalui()
         self.refreshperiod = self.getconffloat('autorefresh', 0.0)
+        self.quicknum = 0
         if self.refreshperiod == 0.0:
             self.refreshperiod = None
 
@@ -125,12 +126,26 @@ class AccountSynchronizationMixin:
     def sync(self):
         # We don't need an account lock because syncitall() goes through
         # each account once, then waits for all to finish.
+
+        quickconfig = self.getconfint('quick', 0)
+        if quickconfig < 0:
+            quick = True
+        elif quickconfig > 0:
+            if self.quicknum == 0 or self.quicknum > quickconfig:
+                self.quicknum = 1
+                quick = False
+            else:
+                self.quicknum = self.quicknum + 1
+                quick = True
+        else:
+            quick = False
+
         try:
             remoterepos = self.remoterepos
             localrepos = self.localrepos
             statusrepos = self.statusrepos
             self.ui.syncfolders(remoterepos, localrepos)
-            remoterepos.syncfoldersto(localrepos)
+            remoterepos.syncfoldersto(localrepos, [statusrepos])
 
             folderthreads = []
             for remotefolder in remoterepos.getfolders():
@@ -140,12 +155,14 @@ class AccountSynchronizationMixin:
                     name = "Folder sync %s[%s]" % \
                     (self.name, remotefolder.getvisiblename()),
                     args = (self.name, remoterepos, remotefolder, localrepos,
-                            statusrepos))
+                            statusrepos, quick))
                 thread.setDaemon(1)
                 thread.start()
                 folderthreads.append(thread)
             threadutil.threadsreset(folderthreads)
             mbnames.write()
+            localrepos.forgetfolders()
+            remoterepos.forgetfolders()
             localrepos.holdordropconnections()
             remoterepos.holdordropconnections()
         finally:
@@ -155,7 +172,7 @@ class SyncableAccount(Account, AccountSynchronizationMixin):
     pass
 
 def syncfolder(accountname, remoterepos, remotefolder, localrepos,
-               statusrepos):
+               statusrepos, quick):
     global mailboxes
     ui = UIBase.getglobalui()
     ui.registerthread(accountname)
@@ -165,12 +182,6 @@ def syncfolder(accountname, remoterepos, remotefolder, localrepos,
                             replace(remoterepos.getsep(), localrepos.getsep()))
     # Write the mailboxes
     mbnames.add(accountname, localfolder.getvisiblename())
-    # Load local folder
-    ui.syncingfolder(remoterepos, remotefolder, localrepos, localfolder)
-    ui.loadmessagelist(localrepos, localfolder)
-    localfolder.cachemessagelist()
-    ui.messagelistloaded(localrepos, localfolder, len(localfolder.getmessagelist().keys()))
-
 
     # Load status folder.
     statusfolder = statusrepos.getfolder(remotefolder.getvisiblename().\
@@ -183,18 +194,31 @@ def syncfolder(accountname, remoterepos, remotefolder, localrepos,
         
     statusfolder.cachemessagelist()
 
+    if quick:
+        if not localfolder.quickchanged(statusfolder) \
+               and not remotefolder.quickchanged(statusfolder):
+            ui.skippingfolder(remotefolder)
+            localrepos.restore_atime()
+            return
+
+    # Load local folder
+    ui.syncingfolder(remoterepos, remotefolder, localrepos, localfolder)
+    ui.loadmessagelist(localrepos, localfolder)
+    localfolder.cachemessagelist()
+    ui.messagelistloaded(localrepos, localfolder, len(localfolder.getmessagelist().keys()))
+
     # 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 really need it if both local folders are
     # empty.  So, in that case, just save it off.
     if len(localfolder.getmessagelist()) or len(statusfolder.getmessagelist()):
         if not localfolder.isuidvalidityok():
-            ui.validityproblem(localfolder, localfolder.getsaveduidvalidity(),
-                               localfolder.getuidvalidity())
+            ui.validityproblem(localfolder)
+           localrepos.restore_atime()
             return
         if not remotefolder.isuidvalidityok():
-            ui.validityproblem(remotefolder, remotefolder.getsaveduidvalidity(),
-                               remotefolder.getuidvalidity())
+            ui.validityproblem(remotefolder)
+           localrepos.restore_atime()
             return
     else:
         localfolder.saveuidvalidity()
@@ -230,4 +254,5 @@ def syncfolder(accountname, remoterepos, remotefolder, localrepos,
     ui.syncingmessages(localrepos, localfolder, statusrepos, statusfolder)
     localfolder.syncmessagesto(statusfolder)
     statusfolder.save()
+    localrepos.restore_atime()