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

migrate to offlineimap 6.5
[etc/offlineimap.git] / .offlineimap / helper.py
index 840896febcd4e5d3f666281cf719d348ca681c4c..674adf351c382da47a06094b05d43ae57d4dd417 100644 (file)
@@ -1,26 +1,26 @@
 # -*- coding: utf-8 -*-
 
 # -*- coding: utf-8 -*-
 
-import re, os, stat, time, atexit
+import re
 
 
-base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent', 'Queue']
+base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent', 'Queue', 'sent', 'inbox']
 full_excludes_re = ['discard', 'spool', 'spam', 'store\..+']
 full_excludes_re = ['discard', 'spool', 'spam', 'store\..+']
-prioritised = ['outgoing','resubmit','drafts','inbox','ardex','debian','sudetia','admin','retrain']
+prioritised = ['outgoing','resubmit','drafts','INBOX','ardex','immo','debian','sudetia','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.startswith(prefix):
+        if x.name.startswith(prefix):
             return -1
             return -1
-        elif y.startswith(prefix):
+        elif y.name.startswith(prefix):
             return +1
     for prefix in deprioritised:
             return +1
     for prefix in deprioritised:
-        if x.startswith(prefix):
+        if x.name.startswith(prefix):
             return +1
             return +1
-        elif y.startswith(prefix):
+        elif y.name.startswith(prefix):
             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):
     return re.sub('^INBOX', 'inbox', x)
 
 def py_folderfilter_main(x):
@@ -32,6 +32,12 @@ def py_folderfilter_main(x):
 
     return True
 
 
     return True
 
+def py_foldersort_bulk(x, y):
+    if x == 'spool': return -1
+    if y == 'spool': return  1
+    if x in ('discard', 'spam'): return 1
+    if y in ('discard', 'spam'): return -1
+
 def py_folderfilter_bulk(x):
     if re.search('^(' + '|'.join(full_excludes_re) + ')', x):
         return True
 def py_folderfilter_bulk(x):
     if re.search('^(' + '|'.join(full_excludes_re) + ')', x):
         return True
@@ -40,5 +46,5 @@ def py_folderfilter_bulk(x):
 
 def py_folderfilter_mbnames(acct, x):
     full_excludes_re_mbnames = ['retrain/(sp|h)am'] + full_excludes_re
 
 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'] \
+    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)