]> git.madduck.net Git - etc/offlineimap.git/commitdiff

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:

add bulk account, remove full run logic
authormartin f. krafft <madduck@madduck.net>
Wed, 23 Jun 2010 06:35:26 +0000 (08:35 +0200)
committermartin f. krafft <madduck@madduck.net>
Wed, 23 Jun 2010 06:58:00 +0000 (08:58 +0200)
.crontab.d/offlineimap
.offlineimap/helper.py
.offlineimaprc

index c3afd5d0d3155434b9259f32071f79a61968693e..6c496988f2c00fc5a619587cee8fb823fe9ca570 100644 (file)
@@ -1,2 +1,3 @@
 */30 * * * * sleep $((900 * $RANDOM / 32768)) && ip r | grep -q via && $HOME/.bin/offlineimap
 38 */4 * * * sleep $((60 * $RANDOM / 32768)) && ip r | grep -q via && $HOME/.bin/offlineimap -a logcheck
 */30 * * * * sleep $((900 * $RANDOM / 32768)) && ip r | grep -q via && $HOME/.bin/offlineimap
 38 */4 * * * sleep $((60 * $RANDOM / 32768)) && ip r | grep -q via && $HOME/.bin/offlineimap -a logcheck
+55 */8 * * * sleep $((300 * $RANDOM / 32768)) && ip r | grep -q via && $HOME/.bin/offlineimap -a madduck.net-bulk
index 590e201a4264a560fbfee4fc366064c2ba04953d..840896febcd4e5d3f666281cf719d348ca681c4c 100644 (file)
@@ -4,7 +4,7 @@ import re, os, stat, time, atexit
 
 base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent', 'Queue']
 full_excludes_re = ['discard', 'spool', 'spam', 'store\..+']
 
 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']
+prioritised = ['outgoing','resubmit','drafts','inbox','ardex','debian','sudetia','admin','retrain']
 deprioritised = ['discard','spam','store','spool']
 
 def py_foldersort_main(x, y):
 deprioritised = ['discard','spam','store','spool']
 
 def py_foldersort_main(x, y):
@@ -23,40 +23,22 @@ def py_foldersort_main(x, y):
 def py_nametrans_main(x):
     return re.sub('^INBOX', 'inbox', x)
 
 def py_nametrans_main(x):
     return re.sub('^INBOX', 'inbox', x)
 
-def should_do_full_sync():
-    FILE = os.path.expanduser('~/.var/offlineimap/lastrun')
-    INTERVAL = 86400/6
-    now = int(time.time())
-
-    try:
-        since = now - os.stat(FILE)[stat.ST_MTIME]
-    except:
-        since = INTERVAL + 1
-
-    if since > INTERVAL:
-        @atexit.register
-        def write_trace():
-            print 'Writing trace file…'
-            file(FILE, 'wb').close()
-        return True
-
-    @atexit.register
-    def write_sync_notice():
-        print 'Partial sync complete; next full sync in %d seconds…' \
-            % (INTERVAL - since)
-
-    return False
-
 def py_folderfilter_main(x):
     if x in base_excludes:
         return False
 
     elif re.search('^(' + '|'.join(full_excludes_re) + ')', x):
 def py_folderfilter_main(x):
     if x in base_excludes:
         return False
 
     elif re.search('^(' + '|'.join(full_excludes_re) + ')', x):
-        return should_do_full_sync()
+        return False
 
     return True
 
 
     return True
 
+def py_folderfilter_bulk(x):
+    if re.search('^(' + '|'.join(full_excludes_re) + ')', x):
+        return True
+
+    return False
+
 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'] \
+    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)
index 2d15b607af24d86b49302f7456c20be24c3e29b8..4bb5f3bcfae9a9b52d2ebd3ed7e19409da113b86 100644 (file)
@@ -23,6 +23,12 @@ remoterepository = madduck.net
 autorefresh = 15
 quick = 16
 
 autorefresh = 15
 quick = 16
 
+[Account madduck.net-bulk]
+localrepository = local-main
+remoterepository = madduck.net-bulk
+autorefresh = 15
+quick = 16
+
 [Repository local-main]
 type = Maildir
 localfolders = ~/mail
 [Repository local-main]
 type = Maildir
 localfolders = ~/mail
@@ -39,6 +45,14 @@ nametrans = py_nametrans_main
 folderfilter = py_folderfilter_main
 idlefolders = ['inbox', 'mass', 'debian', 'ul', 'phd', 'admin']
 
 folderfilter = py_folderfilter_main
 idlefolders = ['inbox', 'mass', 'debian', 'ul', 'phd', 'admin']
 
+[Repository madduck.net-bulk]
+type = IMAP
+maxconnections = 3
+holdconnectionopen = yes
+preauthtunnel = SSH_AUTH_SOCK= ssh -TCaxS ~/.var/offlineimap/ssh_ctl_sock -o "ControlMaster auto" -o "ProtocolKeepAlives 10" -o "ConnectTimeout 60" -i ~/.offlineimap/id_rsa.imap@seamus imap.madduck.net
+expunge = yes
+folderfilter = py_folderfilter_bulk
+
 [Account logcheck]
 localrepository = local-logcheck
 remoterepository = logcheck
 [Account logcheck]
 localrepository = local-logcheck
 remoterepository = logcheck