add v6 address to known hosts

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

diff --git a/.offlineimap/helper.py b/.offlineimap/helper.py
index c1290b24e8f574a5a4b2871ba1e179a6da01882a..1744243b75322dec1c282295a1e8dd494f41a064 100644 (file)
--- a/.offlineimap/helper.py
+++ b/.offlineimap/helper.py
@@ -2,21 +2,22 @@
 
 import re
 
 
 import re
 

-base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent', 'Queue', 'sent', 'inbox']
-full_excludes_re = ['discard', 'spool', 'spam', '(store|[Ss]ent)/.+']
-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 = ['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:
 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
             return -1

-        elif y.name.startswith(prefix):
+        elif y.startswith(prefix):

             return +1
     for prefix in deprioritised:
             return +1
     for prefix in deprioritised:

-        if x.name.startswith(prefix):
+        if x.startswith(prefix):

             return +1
             return +1

-        elif y.name.startswith(prefix):
+        elif y.startswith(prefix):

             return -1
     return cmp(x, y)
 
             return -1
     return cmp(x, y)
 


@@ -27,6 +28,9 @@ def py_folderfilter_main(x):
     if x in base_excludes:
         return False
 
     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
 
     elif re.search('^(' + '|'.join(full_excludes_re) + ')', x):
         return False
 


@@ -45,6 +49,6 @@ def py_folderfilter_bulk(x):
     return False
 
 def py_folderfilter_mbnames(acct, x):
     return False
 
 def py_folderfilter_mbnames(acct, x):

-    full_excludes_re_mbnames = ['retrain/(sp|h)am'] + full_excludes_re
+    full_excludes_re_mbnames = ['retrain(/(sp|h)am)?$'] + full_excludes_re

     return acct in ['madduck.net', 'madduck.net_bulk'] \
             and not re.search('^(' + '|'.join(full_excludes_re_mbnames) + ')', x)
     return acct in ['madduck.net', 'madduck.net_bulk'] \
             and not re.search('^(' + '|'.join(full_excludes_re_mbnames) + ')', x)