do not run from cron if lockfile exists

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

diff --git a/.offlineimap/helper.py b/.offlineimap/helper.py
index 6b7a6e04976a5eaba270ec0ce432f74a584ae672..1744243b75322dec1c282295a1e8dd494f41a064 100644 (file)
--- a/.offlineimap/helper.py
+++ b/.offlineimap/helper.py
@@ -2,9 +2,10 @@
 
 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']
+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):
@@ -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
 
@@ -45,6 +49,6 @@ def py_folderfilter_bulk(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)