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

rework logic when to do partial syncs
[etc/offlineimap.git] / .offlineimap / helper.py
index f238a7dc894e82f4ede0632e1b747d0541534707..d7b47d3720dd830b61a49911ea99adc575cebed3 100644 (file)
@@ -1,6 +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
@@ -13,49 +20,42 @@ 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 = 30
+    INTERVAL = 86400/2
     now = int(time.time())
 
     try:
-        mtime = os.stat(FILE)[stat.ST_MTIME]
-    except OSError:
-        mtime = 0
+        since = now - os.stat(FILE)[stat.ST_MTIME]
+    except:
+        since = INTERVAL + 1
 
-    since = now - mtime
-    print 'now=%d mtime=%d since=%d INTERVAL=%d' \
-            % (now, mtime, since, INTERVAL)
     if since > INTERVAL:
         file(FILE, 'wb').close()
-        print 'Running a full sync...'
         return True
 
-    print 'Running a partial sync, next full sync in %d seconds...' \
+    print 'Partial sync; next full sync in %d seconds...' \
             % (INTERVAL - since)
     return False
 
-#do_full = should_do_full_sync()
-do_full = True
+do_full_sync = should_do_full_sync()
 def py_folderfilter_seamus(x):
-    base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent']
 
-    if do_full:
+    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):
+        if re.search('^store(\..+)?', x):
             return False
     return True
 
 def py_folderfilter_mbnames(acct, x):
-    return not re.search('^(store(/.+)?|retrain/(ham|spam)|spool|discard|spam)', x)
+    full_excludes_re_mbnames = ['retrain/(sp|h)am'] + full_excludes_re
+    return acct in ['seamus.madduck.net'] \
+            and not re.search('^(' + '|'.join(full_excludes_re_mbnames) + ')', x)