From: martin f. krafft <madduck@madduck.net>
Date: Wed, 24 Mar 2010 20:18:28 +0000 (+0100)
Subject: globalise common settings in helper file
X-Git-Url: https://git.madduck.net/etc/offlineimap.git/commitdiff_plain/aefbbc15b27499b05113fa342fa165b3ab4341ba?ds=sidebyside;hp=2e8f8dc9be6b854bb0b6704cd4f2456ac7fea2a1

globalise common settings in helper file
---

diff --git a/.offlineimap/helper.py b/.offlineimap/helper.py
index 822a835..15824d2 100644
--- a/.offlineimap/helper.py
+++ b/.offlineimap/helper.py
@@ -1,8 +1,13 @@
 # -*- coding: utf-8 -*-
 
+import re, os, stat, time, atexit
+
+base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent', 'Queue']
+full_excludes_re = ['discard', 'spool', 'spam', 'store(\..+)?']
+prioritised = ['outgoing','resubmit','drafts','inbox','phd','ul','debian','sudetia','admin','retrain']
+deprioritised = ['discard','spam','store','spool']
+
 def py_foldersort_seamus(x, y):
-    prioritised = ('outgoing','resubmit','drafts','inbox','phd','ul','debian','sudetia','admin','retrain')
-    deprioritised = ('discard','spam','store','spool')
     for prefix in prioritised:
         if x.startswith(prefix):
             return -1
@@ -15,13 +20,10 @@ def py_foldersort_seamus(x, y):
             return -1
     return cmp(x, y)
 
-import re
-
 def py_nametrans_seamus(x):
     return re.sub('^INBOX', 'inbox', x)
 
 def should_do_full_sync():
-    import os, stat, time
     FILE = os.path.expanduser('~/.var/offlineimap/lastrun')
     INTERVAL = 86400/2
     now = int(time.time())
@@ -42,7 +44,6 @@ def should_do_full_sync():
 
 do_full_sync = should_do_full_sync()
 def py_folderfilter_seamus(x):
-    base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent']
 
     if do_full_sync:
         return x not in base_excludes
@@ -56,5 +57,6 @@ def py_folderfilter_seamus(x):
     return True
 
 def py_folderfilter_mbnames(acct, x):
+    full_excludes_re_mbnames = ['retrain/(sp|h)am'] + full_excludes_re
     return acct in ['seamus.madduck.net'] \
-            and not re.search('^(store(/.+)?|retrain/(ham|spam)|spool|discard|spam)', x)
+            and not re.search('^(' + '|'.join(full_excludes_re_mbnames) + ')', x)