X-Git-Url: https://git.madduck.net/etc/offlineimap.git/blobdiff_plain/60b6943f1562471884e69d277785a57303cff155..2c47d04aa4ac78b142e62c116a98c894125107a2:/.offlineimap/helper.py?ds=sidebyside;pf=etc

diff --git a/.offlineimap/helper.py b/.offlineimap/helper.py
index 840896f..674adf3 100644
--- a/.offlineimap/helper.py
+++ b/.offlineimap/helper.py
@@ -1,26 +1,26 @@
 # -*- coding: utf-8 -*-
 
-import re, os, stat, time, atexit
+import re
 
-base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent', 'Queue']
+base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent', 'Queue', 'sent', 'inbox']
 full_excludes_re = ['discard', 'spool', 'spam', 'store\..+']
-prioritised = ['outgoing','resubmit','drafts','inbox','ardex','debian','sudetia','admin','retrain']
+prioritised = ['outgoing','resubmit','drafts','INBOX','ardex','immo','debian','sudetia','admin','retrain']
 deprioritised = ['discard','spam','store','spool']
 
 def py_foldersort_main(x, y):
     for prefix in prioritised:
-        if x.startswith(prefix):
+        if x.name.startswith(prefix):
             return -1
-        elif y.startswith(prefix):
+        elif y.name.startswith(prefix):
             return +1
     for prefix in deprioritised:
-        if x.startswith(prefix):
+        if x.name.startswith(prefix):
             return +1
-        elif y.startswith(prefix):
+        elif y.name.startswith(prefix):
             return -1
     return cmp(x, y)
 
-def py_nametrans_main(x):
+def py_nametrans(x):
     return re.sub('^INBOX', 'inbox', x)
 
 def py_folderfilter_main(x):
@@ -32,6 +32,12 @@ def py_folderfilter_main(x):
 
     return True
 
+def py_foldersort_bulk(x, y):
+    if x == 'spool': return -1
+    if y == 'spool': return  1
+    if x in ('discard', 'spam'): return 1
+    if y in ('discard', 'spam'): return -1
+
 def py_folderfilter_bulk(x):
     if re.search('^(' + '|'.join(full_excludes_re) + ')', x):
         return True
@@ -40,5 +46,5 @@ def py_folderfilter_bulk(x):
 
 def py_folderfilter_mbnames(acct, x):
     full_excludes_re_mbnames = ['retrain/(sp|h)am'] + full_excludes_re
-    return acct in ['madduck.net', 'madduck.net-bulk'] \
+    return acct in ['madduck.net', 'madduck.net_bulk'] \
             and not re.search('^(' + '|'.join(full_excludes_re_mbnames) + ')', x)