]> git.madduck.net Git - etc/offlineimap.git/blobdiff - .offlineimap/helper.py

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

switch bulk offlineimap to systemd service
[etc/offlineimap.git] / .offlineimap / helper.py
index 25d59c3f6e3a1196d062732344e59079e81d93b0..454d1e697380d1c9bc77aef2d37eadf65291987a 100644 (file)
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 
 # -*- coding: utf-8 -*-
 
-import re, os, stat, time, atexit
+import re
 
 
-base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent', 'Queue', 'sent']
-full_excludes_re = ['discard', 'spool', 'spam', 'store\..+']
-prioritised = ['outgoing','resubmit','drafts','inbox','ardex','debian','sudetia','admin','retrain']
+base_excludes = ['delayed', 'outgoing', 'Trash', 'Queue', 'inbox', 'Spam', 'Sent', 'Drafts']
+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):
 deprioritised = ['discard','spam','store','spool']
 
 def py_foldersort_main(x, y):
@@ -20,13 +21,16 @@ def py_foldersort_main(x, y):
             return -1
     return cmp(x, y)
 
             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):
     if x in base_excludes:
         return False
 
     return re.sub('^INBOX', 'inbox', x)
 
 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
 
     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
-    return acct in ['madduck.net', 'madduck.net-bulk'] \
+    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)
             and not re.search('^(' + '|'.join(full_excludes_re_mbnames) + ')', x)