enable partial syncs

[etc/offlineimap.git] / .offlineimap / helper.py

diff --git a/.offlineimap/helper.py b/.offlineimap/helper.py
index 061651ff4fa20bf4b9645803c94b80bc294f807f..7719a8c420fe0920bff8593f951e3b5604435529 100644 (file)
--- a/.offlineimap/helper.py
+++ b/.offlineimap/helper.py
@@ -1,5 +1,5 @@
 def py_foldersort_seamus(x, y):
 def py_foldersort_seamus(x, y):

-    prioritised = ('outgoing','resubmit','drafts','inbox','ul','debian','sudetia','admin','retrain')
+    prioritised = ('outgoing','resubmit','drafts','inbox','phd','ul','debian','sudetia','admin','retrain')

     deprioritised = ('discard','spam','store','spool')
     for prefix in prioritised:
         if x.startswith(prefix):
     deprioritised = ('discard','spam','store','spool')
     for prefix in prioritised:
         if x.startswith(prefix):


@@ -21,7 +21,7 @@ def py_nametrans_seamus(x):
 def should_do_full_sync():
     import os, stat, time
     FILE = os.path.expanduser('~/.var/offlineimap/lastrun')
 def should_do_full_sync():
     import os, stat, time
     FILE = os.path.expanduser('~/.var/offlineimap/lastrun')

-    INTERVAL = 30
+    INTERVAL = 86400/2

     now = int(time.time())
 
     try:
     now = int(time.time())
 
     try:


@@ -30,32 +30,29 @@ def should_do_full_sync():
         mtime = 0
 
     since = now - mtime
         mtime = 0
 
     since = now - mtime

-    print 'now=%d mtime=%d since=%d INTERVAL=%d' \
-            % (now, mtime, since, INTERVAL)

     if since > INTERVAL:
         file(FILE, 'wb').close()
     if since > INTERVAL:
         file(FILE, 'wb').close()

-        print 'Running a full sync...'

         return True
 
         return True
 

-    print 'Running a partial sync, next full sync in %d seconds...' \
+    print 'Partial sync; next full sync in %d seconds...' \

             % (INTERVAL - since)
     return False
 
             % (INTERVAL - since)
     return False
 

-#do_full = should_do_full_sync()
-do_full = True
+do_full_sync = should_do_full_sync()

 def py_folderfilter_seamus(x):
     base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent']
 
 def py_folderfilter_seamus(x):
     base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent']
 

-    if do_full:
+    if do_full_sync:

         return x not in base_excludes
     else:
         if x in base_excludes:
             return False
         if x in ('spool', 'discard', 'spam'):
             return False
         return x not in base_excludes
     else:
         if x in base_excludes:
             return False
         if x in ('spool', 'discard', 'spam'):
             return False

-        if re.search('^store\..+', x):
+        if re.search('^store(\..+)?', x):

             return False
     return True
 
 def py_folderfilter_mbnames(acct, x):
             return False
     return True
 
 def py_folderfilter_mbnames(acct, x):

-    return not re.search('^(store(/.+)?|retrain/.+|spool|discard|spam)', x)
+    return acct in ['seamus.madduck.net'] \
+            and not re.search('^(store(/.+)?|retrain/(ham|spam)|spool|discard|spam)', x)