]> 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:

do not run from cron if lockfile exists
[etc/offlineimap.git] / .offlineimap / helper.py
index 3eb23460ac41442d16f7d6ff042deb40e1e414be..1744243b75322dec1c282295a1e8dd494f41a064 100644 (file)
@@ -5,19 +5,19 @@ import re
 base_excludes = ['delayed', 'outgoing', 'Trash', 'Queue', 'inbox']
 base_excludes_re = [ '[Ss]ent.*' ]
 full_excludes_re = ['discard', 'spool', 'spam', 'store/.+']
 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','immo','uniwh','mkch','debian','sudetia','admin','retrain']
+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)
 
@@ -49,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)