Use SQL Lite databases for LocalStatus (instead of flat files)

[offlineimap] / offlineimap / accounts.py

diff --git a/offlineimap/accounts.py b/offlineimap/accounts.py
index 9f224d03d943cf10747aec8cba692fa56429883d..2a6d848ba98969741785acd9dd2c15c0a3c328e1 100644 (file)
--- a/offlineimap/accounts.py
+++ b/offlineimap/accounts.py
@@ -145,7 +145,7 @@ class AccountSynchronizationMixin:
             localrepos = self.localrepos
             statusrepos = self.statusrepos
             self.ui.syncfolders(remoterepos, localrepos)
-            remoterepos.syncfoldersto(localrepos)
+            remoterepos.syncfoldersto(localrepos, [statusrepos])
 
             folderthreads = []
             for remotefolder in remoterepos.getfolders():
@@ -205,13 +205,13 @@ def syncfolder(accountname, remoterepos, remotefolder, localrepos,
     ui.syncingfolder(remoterepos, remotefolder, localrepos, localfolder)
     ui.loadmessagelist(localrepos, localfolder)
     localfolder.cachemessagelist()
-    ui.messagelistloaded(localrepos, localfolder, len(localfolder.getmessagelist().keys()))
+    ui.messagelistloaded(localrepos, localfolder, localfolder.getmessagecount())
 
     # 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 localfolder.getmessagecount() or statusfolder.getmessagecount():
         if not localfolder.isuidvalidityok():
             ui.validityproblem(localfolder)
            localrepos.restore_atime()
@@ -228,7 +228,7 @@ def syncfolder(accountname, remoterepos, remotefolder, localrepos,
     ui.loadmessagelist(remoterepos, remotefolder)
     remotefolder.cachemessagelist()
     ui.messagelistloaded(remoterepos, remotefolder,
-                         len(remotefolder.getmessagelist().keys()))
+                         remotefolder.getmessagecount())
 
 
     #