rework logic when to do partial syncs 2

diff --git a/.offlineimap/helper.py b/.offlineimap/helper.py
index d7b47d3720dd830b61a49911ea99adc575cebed3..b0f97fab8d1d2deab39fde2a83ec8c6b6226541e 100644 (file)
--- a/.offlineimap/helper.py
+++ b/.offlineimap/helper.py
@@ -44,15 +44,12 @@ def should_do_full_sync():
 do_full_sync = should_do_full_sync()
 def py_folderfilter_seamus(x):
 
 do_full_sync = should_do_full_sync()
 def py_folderfilter_seamus(x):
 

-    if do_full_sync:
-        return x not in base_excludes
-    else:
-        if x in base_excludes:
-            return False
-        if x in ('spool', 'discard', 'spam'):
-            return False
-        if re.search('^store(\..+)?', x):
-            return False
+    if x in base_excludes:
+        return False
+
+    elif re.search('^(' + '|'.join(full_excludes_re) + ')', x):
+        return do_full_sync
+

     return True
 
 def py_folderfilter_mbnames(acct, x):
     return True
 
 def py_folderfilter_mbnames(acct, x):