X-Git-Url: https://git.madduck.net/etc/offlineimap.git/blobdiff_plain/8a99dcfaf1b4364abbeca1cc8392c81f2a33634a..42277b632fb6fdcb1f5c839935a2efbab264be5a:/.offlineimap/helper.py

diff --git a/.offlineimap/helper.py b/.offlineimap/helper.py
index 7719a8c..b0f97fa 100644
--- a/.offlineimap/helper.py
+++ b/.offlineimap/helper.py
@@ -1,6 +1,13 @@
+# -*- coding: utf-8 -*-
+
+import re, os, stat, time, atexit
+
+base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent', 'Queue']
+full_excludes_re = ['discard', 'spool', 'spam', 'store(\..+)?']
+prioritised = ['outgoing','resubmit','drafts','inbox','phd','ul','debian','sudetia','admin','retrain']
+deprioritised = ['discard','spam','store','spool']
+
 def py_foldersort_seamus(x, y):
-    prioritised = ('outgoing','resubmit','drafts','inbox','phd','ul','debian','sudetia','admin','retrain')
-    deprioritised = ('discard','spam','store','spool')
     for prefix in prioritised:
         if x.startswith(prefix):
             return -1
@@ -13,23 +20,19 @@ def py_foldersort_seamus(x, y):
             return -1
     return cmp(x, y)
 
-import re
-
 def py_nametrans_seamus(x):
     return re.sub('^INBOX', 'inbox', x)
 
 def should_do_full_sync():
-    import os, stat, time
     FILE = os.path.expanduser('~/.var/offlineimap/lastrun')
     INTERVAL = 86400/2
     now = int(time.time())
 
     try:
-        mtime = os.stat(FILE)[stat.ST_MTIME]
-    except OSError:
-        mtime = 0
+        since = now - os.stat(FILE)[stat.ST_MTIME]
+    except:
+        since = INTERVAL + 1
 
-    since = now - mtime
     if since > INTERVAL:
         file(FILE, 'wb').close()
         return True
@@ -40,19 +43,16 @@ def should_do_full_sync():
 
 do_full_sync = should_do_full_sync()
 def py_folderfilter_seamus(x):
-    base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent']
-
-    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):
-            return False
+
+    if x in base_excludes:
+        return False
+
+    elif re.search('^(' + '|'.join(full_excludes_re) + ')', x):
+        return do_full_sync
+
     return True
 
 def py_folderfilter_mbnames(acct, x):
+    full_excludes_re_mbnames = ['retrain/(sp|h)am'] + full_excludes_re
     return acct in ['seamus.madduck.net'] \
-            and not re.search('^(store(/.+)?|retrain/(ham|spam)|spool|discard|spam)', x)
+            and not re.search('^(' + '|'.join(full_excludes_re_mbnames) + ')', x)