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

readying for offlineimap3
[etc/offlineimap.git] / .offlineimap / helper.py
index 32f46314cb2710511178848b418fd8237e77b28d..d758d9527834c7d78e1ed3857a5899aa320b661a 100644 (file)
@@ -2,7 +2,7 @@
 
 import re
 
-base_excludes = ['delayed', 'outgoing', 'Trash', 'Queue', 'inbox']
+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']
@@ -19,7 +19,7 @@ def py_foldersort_main(x, y):
             return +1
         elif y.startswith(prefix):
             return -1
-    return cmp(x, y)
+    return (x > y) - (x < y)
 
 def py_nametrans(x):
     return re.sub('^INBOX', 'inbox', x)
@@ -49,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)