X-Git-Url: https://git.madduck.net/etc/offlineimap.git/blobdiff_plain/40a3cfa3569396308ce8c168c0abf7f0f1be0b8c..2e8f8dc9be6b854bb0b6704cd4f2456ac7fea2a1:/.offlineimap/helper.py

diff --git a/.offlineimap/helper.py b/.offlineimap/helper.py
index 09cec66..822a835 100644
--- a/.offlineimap/helper.py
+++ b/.offlineimap/helper.py
@@ -1,5 +1,7 @@
+# -*- coding: utf-8 -*-
+
 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):
@@ -21,7 +23,7 @@ def py_nametrans_seamus(x):
 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:
@@ -30,32 +32,29 @@ def should_do_full_sync():
         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()
-        print 'Running a full sync...'
         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
 
-#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']
+    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
-        if re.search('^store\..+', x):
+        if re.search('^store(\..+)?', 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)