fix sorting

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

diff --git a/.offlineimap/helper.py b/.offlineimap/helper.py
index 409faf3d995ae376f7a3095d70af3238e26debfd..8115898c3098058fae9d6005a7906f86585cc935 100644 (file)
--- a/.offlineimap/helper.py
+++ b/.offlineimap/helper.py
@@ -2,21 +2,22 @@
 
 import re
 
-base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent', 'Queue', 'sent', 'inbox']
-full_excludes_re = ['discard', 'spool', 'spam', 'store\..+']
-prioritised = ['outgoing','resubmit','drafts','INBOX','ardex','kbkg','toni','immo','uniwh','mkch','debian','sudetia','admin','retrain']
+base_excludes = ['delayed', 'outgoing', 'Trash', 'Queue', 'inbox']
+base_excludes_re = [ '[Ss]ent.*' ]
+full_excludes_re = ['discard', 'spool', 'spam', 'store/.+']
+prioritised = ['outgoing','resubmit','drafts','inbox','ardex','kbkg','toni','tahi','debian','mtfk','admin','retrain']
 deprioritised = ['discard','spam','store','spool']
 
 def py_foldersort_main(x, y):
     for prefix in prioritised:
-        if x.name.startswith(prefix):
+        if x.startswith(prefix):
             return -1
-        elif y.name.startswith(prefix):
+        elif y.startswith(prefix):
             return +1
     for prefix in deprioritised:
-        if x.name.startswith(prefix):
+        if x.startswith(prefix):
             return +1
-        elif y.name.startswith(prefix):
+        elif y.startswith(prefix):
             return -1
     return cmp(x, y)
 
@@ -27,6 +28,9 @@ def py_folderfilter_main(x):
     if x in base_excludes:
         return False
 
+    elif re.search('^(' + '|'.join(base_excludes_re) + ')', x):
+        return False
+
     elif re.search('^(' + '|'.join(full_excludes_re) + ')', x):
         return False