2003-01-04 05:57:46 +01:00
|
|
|
# Copyright (C) 2003 John Goerzen
|
|
|
|
# <jgoerzen@complete.org>
|
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
2003-04-16 21:23:45 +02:00
|
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
|
|
# (at your option) any later version.
|
2003-01-04 05:57:46 +01:00
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program; if not, write to the Free Software
|
2006-08-12 06:15:55 +02:00
|
|
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
2003-01-04 05:57:46 +01:00
|
|
|
|
2003-07-25 03:58:20 +02:00
|
|
|
from offlineimap import threadutil, mbnames, CustomConfig
|
|
|
|
import offlineimap.repository.Base, offlineimap.repository.LocalStatus
|
2003-01-04 05:57:46 +01:00
|
|
|
from offlineimap.ui import UIBase
|
|
|
|
from offlineimap.threadutil import InstanceLimitedThread, ExitNotifyThread
|
2009-01-14 07:05:00 +01:00
|
|
|
from subprocess import Popen, PIPE
|
2008-12-02 20:12:36 +01:00
|
|
|
from threading import Event, Lock
|
2003-01-04 05:57:46 +01:00
|
|
|
import os
|
2008-12-02 20:12:36 +01:00
|
|
|
from Queue import Queue, Empty
|
|
|
|
|
|
|
|
class SigListener(Queue):
|
|
|
|
def __init__(self):
|
|
|
|
self.folderlock = Lock()
|
|
|
|
self.folders = None
|
|
|
|
Queue.__init__(self, 20)
|
|
|
|
def put_nowait(self, sig):
|
|
|
|
self.folderlock.acquire()
|
|
|
|
try:
|
|
|
|
if sig == 1:
|
|
|
|
if self.folders is None or not self.autorefreshes:
|
|
|
|
# folders haven't yet been added, or this account is once-only; drop signal
|
|
|
|
return
|
|
|
|
elif self.folders:
|
2009-07-07 07:04:52 +02:00
|
|
|
for foldernr in range(len(self.folders)):
|
2008-12-02 20:12:36 +01:00
|
|
|
# requeue folder
|
2009-07-07 07:04:52 +02:00
|
|
|
self.folders[foldernr][1] = True
|
2008-12-02 20:12:36 +01:00
|
|
|
self.quick = False
|
|
|
|
return
|
|
|
|
# else folders have already been cleared, put signal...
|
|
|
|
finally:
|
|
|
|
self.folderlock.release()
|
|
|
|
Queue.put_nowait(self, sig)
|
|
|
|
def addfolders(self, remotefolders, autorefreshes, quick):
|
|
|
|
self.folderlock.acquire()
|
|
|
|
try:
|
2009-07-07 07:04:52 +02:00
|
|
|
self.folders = []
|
2008-12-02 20:12:36 +01:00
|
|
|
self.quick = quick
|
|
|
|
self.autorefreshes = autorefreshes
|
|
|
|
for folder in remotefolders:
|
|
|
|
# new folders are queued
|
2009-07-07 07:04:52 +02:00
|
|
|
self.folders.append([folder, True])
|
2008-12-02 20:12:36 +01:00
|
|
|
finally:
|
|
|
|
self.folderlock.release()
|
|
|
|
def clearfolders(self):
|
|
|
|
self.folderlock.acquire()
|
|
|
|
try:
|
2009-07-07 07:04:52 +02:00
|
|
|
for folder, queued in self.folders:
|
|
|
|
if queued:
|
2008-12-02 20:12:36 +01:00
|
|
|
# some folders still in queue
|
|
|
|
return False
|
2009-07-07 07:04:52 +02:00
|
|
|
self.folders[:] = []
|
2008-12-02 20:12:36 +01:00
|
|
|
return True
|
|
|
|
finally:
|
|
|
|
self.folderlock.release()
|
|
|
|
def queuedfolders(self):
|
|
|
|
self.folderlock.acquire()
|
|
|
|
try:
|
|
|
|
dirty = True
|
|
|
|
while dirty:
|
|
|
|
dirty = False
|
2009-07-07 07:04:52 +02:00
|
|
|
for foldernr, (folder, queued) in enumerate(self.folders):
|
|
|
|
if queued:
|
2008-12-02 20:12:36 +01:00
|
|
|
# mark folder as no longer queued
|
2009-07-07 07:04:52 +02:00
|
|
|
self.folders[foldernr][1] = False
|
2008-12-02 20:12:36 +01:00
|
|
|
dirty = True
|
|
|
|
quick = self.quick
|
|
|
|
self.folderlock.release()
|
|
|
|
yield (folder, quick)
|
|
|
|
self.folderlock.acquire()
|
|
|
|
finally:
|
|
|
|
self.folderlock.release()
|
2003-01-04 05:57:46 +01:00
|
|
|
|
2003-04-18 04:18:34 +02:00
|
|
|
def getaccountlist(customconfig):
|
|
|
|
return customconfig.getsectionlist('Account')
|
|
|
|
|
|
|
|
def AccountListGenerator(customconfig):
|
|
|
|
return [Account(customconfig, accountname)
|
|
|
|
for accountname in getaccountlist(customconfig)]
|
|
|
|
|
|
|
|
def AccountHashGenerator(customconfig):
|
|
|
|
retval = {}
|
|
|
|
for item in AccountListGenerator(customconfig):
|
|
|
|
retval[item.getname()] = item
|
|
|
|
return retval
|
|
|
|
|
2003-01-04 05:57:46 +01:00
|
|
|
mailboxes = []
|
|
|
|
|
2003-04-18 04:18:34 +02:00
|
|
|
class Account(CustomConfig.ConfigHelperMixin):
|
2003-01-04 05:57:46 +01:00
|
|
|
def __init__(self, config, name):
|
|
|
|
self.config = config
|
|
|
|
self.name = name
|
|
|
|
self.metadatadir = config.getmetadatadir()
|
|
|
|
self.localeval = config.getlocaleval()
|
|
|
|
self.ui = UIBase.getglobalui()
|
2003-04-29 04:25:42 +02:00
|
|
|
self.refreshperiod = self.getconffloat('autorefresh', 0.0)
|
2009-07-10 11:27:31 +02:00
|
|
|
self.quickrefreshcount = self.getconfint('quick', 0)
|
Daniel Jacobowitz patches
fixes deb#433732
Date: Sun, 30 Sep 2007 13:54:56 -0400
From: Daniel Jacobowitz <drow@false.org>
To: offlineimap@complete.org
Subject: Assorted patches
Here's the result of a lazy Sunday hacking on offlineimap. Sorry for
not breaking this into multiple patches. They're mostly logically
independent so just ask if that would make a difference.
First, a new -q (quick) option. The quick option means to only update
folders that seem to have had significant changes. For Maildir, any
change to any message UID or flags is significant, because checking
the flags doesn't add a significant cost. For IMAP, only a change to
the total number of messages or a change in the UID of the most recent
message is significant. This should catch everything except for
flags changes.
The difference in bandwidth is astonishing: a quick sync takes 80K
instead of 5.3MB, and 28 seconds instead of 90.
There's a configuration variable that lets you say every tenth sync
should update flags, but let all the intervening ones be lighter.
Second, a fix to the UID validity problems many people have been
reporting with Courier. As discussed in Debian bug #433732, I changed
the UID validity check to use SELECT unless the server complains that
the folder is read-only. This avoids the Courier bug (see the Debian
log for more details). This won't fix existing validity errors, you
need to remove the local status and validity files by hand and resync.
Third, some speedups in Maildir checking. It's still pretty slow
due to a combination of poor performance in os.listdir (never reads
more than 4K of directory entries at a time) and some semaphore that
leads to lots of futex wake operations, but at least this saves
20% or so of the CPU time running offlineimap on a single folder:
Time with quick refresh and md5 in loop: 4.75s user 0.46s system 12%
cpu 41.751 total
Time with quick refresh and md5 out of loop: 4.38s user 0.50s system
14% cpu 34.799 total
Time using string compare to check folder: 4.11s user 0.47s system 13%
cpu 34.788 total
And fourth, some display fixes for Curses.Blinkenlights. I made
warnings more visible, made the new quick sync message cyan, and
made all not explicitly colored messages grey. That last one was
really bugging me. Any time OfflineIMAP printed a warning in
this UI, it had even odds of coming out black on black!
Anyway, I hope these are useful. I'm happy to revise them if you see
a problem.
--
Daniel Jacobowitz
CodeSourcery
2007-10-01 23:20:37 +02:00
|
|
|
self.quicknum = 0
|
2003-04-29 04:25:42 +02:00
|
|
|
if self.refreshperiod == 0.0:
|
2003-01-04 05:57:46 +01:00
|
|
|
self.refreshperiod = None
|
|
|
|
|
2003-04-18 04:18:34 +02:00
|
|
|
def getlocaleval(self):
|
|
|
|
return self.localeval
|
|
|
|
|
|
|
|
def getconfig(self):
|
|
|
|
return self.config
|
|
|
|
|
|
|
|
def getname(self):
|
|
|
|
return self.name
|
|
|
|
|
|
|
|
def getsection(self):
|
|
|
|
return 'Account ' + self.getname()
|
2003-01-04 05:57:46 +01:00
|
|
|
|
Patch for signal handling to start a sync by Jim Pryor
Here's the way I'd like to use offlineimap on my laptop:
1. Have a regular cron job running infrequently. The cron job
checks to see
if I'm online, plugged in, and that no other copy of offlineimap is
running. If
all of these conditions are satisfied, it runs offlineimap just once:
"offlineimap -o -u Noninteractive.Quiet"
2. When I start up mutt, I do it by calling a wrapper script that
delays
until cron-started copies of offlineimap have finished, then starts
offlineimap
on its regular, stay-alive and keep checking schedule. When I quit
mutt, the
wrapper script tells offlineimap to stop.
This way I get frequent regular checks while I have mutt running, but
I don't
waste my battery/cpu checking frequently for mail when I'm not
interested in
it.
To make this work, though, it'd be nicer if it were easier to tell
offlineimap,
from the outside, things like "terminate cleanly now" and "when you've
finished
synching, then terminate instead of sleeping and synching again."
OK, to put my money where my mouth is, I attach two patches against
offlineimap
6.0.3.
The first, "cleanup.patch", cleans up a few spots that tend to throw
exceptions
for me as offlineimap is exiting from a KeyboardInterrupt.
The second adds signaling capabilities to offlineimap.
* sending a SIGTERM tells offlineimap to terminate immediately but
cleanly,
just as if "q" had been pressed in the GUI interface
* sending a SIGUSR1 tells every account to do a full sync asap: if
it's
sleeping, then wake up and do the sync now. If it's mid-sync, then
re-synch
any folders whose syncing has already been started or completed, and
continue
to synch the other, queued but not-yet-synched folders.
* sending a SIGHUP tells every account to die as soon as it can (but
not
immediately: only after finishing any synch it's now engaged in)
* sending a SIGUSR2 tells every account to do a full sync asap (as
with
SIGUSR1), then die
It's tricky to mix signals with threads, but I think I've done this
correctly.
I've been using it now for a few weeks without any obvious
problems. But I'm passing it
on so that others can review the code and test it out on their
systems. I developed the
patch when I was running Python 2.5.2, but to my knowledge I don't use
any Python 2.5-specific
code. Now I'm using the patch with Python 2.6.
Although I said "without any obvious problems," let me confess that
I'm
seeing offlineimap regularly choke when I do things like this: start
up
my offlineimap-wrapped copy of mutt, wait a while, put the machine to
sleep (not sure if offlineimap is active in the background or idling),
move to a different spot, wake the machine up again and it acquires a
new network, sometimes a wired network instead of wifi. Offlineimap
doesn't like that so much. I don't yet have any reason to think the
problems here come from my patches. But I'm just acknowledging them,
so
that if others are able to use offlineimap without any difficulty in
situations like I described, then maybe the fault is with my patches.
2008-12-01 23:13:16 +01:00
|
|
|
def sleeper(self, siglistener):
|
2003-01-04 05:57:46 +01:00
|
|
|
"""Sleep handler. Returns same value as UIBase.sleep:
|
|
|
|
0 if timeout expired, 1 if there was a request to cancel the timer,
|
|
|
|
and 2 if there is a request to abort the program.
|
|
|
|
|
|
|
|
Also, returns 100 if configured to not sleep at all."""
|
|
|
|
|
|
|
|
if not self.refreshperiod:
|
|
|
|
return 100
|
2003-04-18 04:18:34 +02:00
|
|
|
|
|
|
|
kaobjs = []
|
|
|
|
|
|
|
|
if hasattr(self, 'localrepos'):
|
|
|
|
kaobjs.append(self.localrepos)
|
|
|
|
if hasattr(self, 'remoterepos'):
|
|
|
|
kaobjs.append(self.remoterepos)
|
|
|
|
|
|
|
|
for item in kaobjs:
|
|
|
|
item.startkeepalive()
|
2009-07-10 11:27:31 +02:00
|
|
|
|
|
|
|
sleeptime = int(self.refreshperiod * 60)
|
|
|
|
if (self.quickrefreshcount > 0):
|
|
|
|
sleeptime = int(sleeptime / self.quickrefreshcount)
|
|
|
|
|
Patch for signal handling to start a sync by Jim Pryor
Here's the way I'd like to use offlineimap on my laptop:
1. Have a regular cron job running infrequently. The cron job
checks to see
if I'm online, plugged in, and that no other copy of offlineimap is
running. If
all of these conditions are satisfied, it runs offlineimap just once:
"offlineimap -o -u Noninteractive.Quiet"
2. When I start up mutt, I do it by calling a wrapper script that
delays
until cron-started copies of offlineimap have finished, then starts
offlineimap
on its regular, stay-alive and keep checking schedule. When I quit
mutt, the
wrapper script tells offlineimap to stop.
This way I get frequent regular checks while I have mutt running, but
I don't
waste my battery/cpu checking frequently for mail when I'm not
interested in
it.
To make this work, though, it'd be nicer if it were easier to tell
offlineimap,
from the outside, things like "terminate cleanly now" and "when you've
finished
synching, then terminate instead of sleeping and synching again."
OK, to put my money where my mouth is, I attach two patches against
offlineimap
6.0.3.
The first, "cleanup.patch", cleans up a few spots that tend to throw
exceptions
for me as offlineimap is exiting from a KeyboardInterrupt.
The second adds signaling capabilities to offlineimap.
* sending a SIGTERM tells offlineimap to terminate immediately but
cleanly,
just as if "q" had been pressed in the GUI interface
* sending a SIGUSR1 tells every account to do a full sync asap: if
it's
sleeping, then wake up and do the sync now. If it's mid-sync, then
re-synch
any folders whose syncing has already been started or completed, and
continue
to synch the other, queued but not-yet-synched folders.
* sending a SIGHUP tells every account to die as soon as it can (but
not
immediately: only after finishing any synch it's now engaged in)
* sending a SIGUSR2 tells every account to do a full sync asap (as
with
SIGUSR1), then die
It's tricky to mix signals with threads, but I think I've done this
correctly.
I've been using it now for a few weeks without any obvious
problems. But I'm passing it
on so that others can review the code and test it out on their
systems. I developed the
patch when I was running Python 2.5.2, but to my knowledge I don't use
any Python 2.5-specific
code. Now I'm using the patch with Python 2.6.
Although I said "without any obvious problems," let me confess that
I'm
seeing offlineimap regularly choke when I do things like this: start
up
my offlineimap-wrapped copy of mutt, wait a while, put the machine to
sleep (not sure if offlineimap is active in the background or idling),
move to a different spot, wake the machine up again and it acquires a
new network, sometimes a wired network instead of wifi. Offlineimap
doesn't like that so much. I don't yet have any reason to think the
problems here come from my patches. But I'm just acknowledging them,
so
that if others are able to use offlineimap without any difficulty in
situations like I described, then maybe the fault is with my patches.
2008-12-01 23:13:16 +01:00
|
|
|
# try:
|
|
|
|
# sleepresult = siglistener.get_nowait()
|
|
|
|
# # retrieved signal before sleep started
|
|
|
|
# if sleepresult == 1:
|
|
|
|
# # catching signal 1 here means folders were cleared before signal was posted
|
|
|
|
# pass
|
|
|
|
# except Empty:
|
2009-07-10 11:27:31 +02:00
|
|
|
# sleepresult = self.ui.sleep(sleeptime, siglistener)
|
|
|
|
sleepresult = self.ui.sleep(sleeptime, siglistener)
|
Patch for signal handling to start a sync by Jim Pryor
Here's the way I'd like to use offlineimap on my laptop:
1. Have a regular cron job running infrequently. The cron job
checks to see
if I'm online, plugged in, and that no other copy of offlineimap is
running. If
all of these conditions are satisfied, it runs offlineimap just once:
"offlineimap -o -u Noninteractive.Quiet"
2. When I start up mutt, I do it by calling a wrapper script that
delays
until cron-started copies of offlineimap have finished, then starts
offlineimap
on its regular, stay-alive and keep checking schedule. When I quit
mutt, the
wrapper script tells offlineimap to stop.
This way I get frequent regular checks while I have mutt running, but
I don't
waste my battery/cpu checking frequently for mail when I'm not
interested in
it.
To make this work, though, it'd be nicer if it were easier to tell
offlineimap,
from the outside, things like "terminate cleanly now" and "when you've
finished
synching, then terminate instead of sleeping and synching again."
OK, to put my money where my mouth is, I attach two patches against
offlineimap
6.0.3.
The first, "cleanup.patch", cleans up a few spots that tend to throw
exceptions
for me as offlineimap is exiting from a KeyboardInterrupt.
The second adds signaling capabilities to offlineimap.
* sending a SIGTERM tells offlineimap to terminate immediately but
cleanly,
just as if "q" had been pressed in the GUI interface
* sending a SIGUSR1 tells every account to do a full sync asap: if
it's
sleeping, then wake up and do the sync now. If it's mid-sync, then
re-synch
any folders whose syncing has already been started or completed, and
continue
to synch the other, queued but not-yet-synched folders.
* sending a SIGHUP tells every account to die as soon as it can (but
not
immediately: only after finishing any synch it's now engaged in)
* sending a SIGUSR2 tells every account to do a full sync asap (as
with
SIGUSR1), then die
It's tricky to mix signals with threads, but I think I've done this
correctly.
I've been using it now for a few weeks without any obvious
problems. But I'm passing it
on so that others can review the code and test it out on their
systems. I developed the
patch when I was running Python 2.5.2, but to my knowledge I don't use
any Python 2.5-specific
code. Now I'm using the patch with Python 2.6.
Although I said "without any obvious problems," let me confess that
I'm
seeing offlineimap regularly choke when I do things like this: start
up
my offlineimap-wrapped copy of mutt, wait a while, put the machine to
sleep (not sure if offlineimap is active in the background or idling),
move to a different spot, wake the machine up again and it acquires a
new network, sometimes a wired network instead of wifi. Offlineimap
doesn't like that so much. I don't yet have any reason to think the
problems here come from my patches. But I'm just acknowledging them,
so
that if others are able to use offlineimap without any difficulty in
situations like I described, then maybe the fault is with my patches.
2008-12-01 23:13:16 +01:00
|
|
|
if sleepresult == 1:
|
|
|
|
self.quicknum = 0
|
|
|
|
|
2008-08-03 00:04:32 +02:00
|
|
|
# Cancel keepalive
|
|
|
|
for item in kaobjs:
|
|
|
|
item.stopkeepalive()
|
|
|
|
return sleepresult
|
2003-01-04 05:57:46 +01:00
|
|
|
|
|
|
|
class AccountSynchronizationMixin:
|
Patch for signal handling to start a sync by Jim Pryor
Here's the way I'd like to use offlineimap on my laptop:
1. Have a regular cron job running infrequently. The cron job
checks to see
if I'm online, plugged in, and that no other copy of offlineimap is
running. If
all of these conditions are satisfied, it runs offlineimap just once:
"offlineimap -o -u Noninteractive.Quiet"
2. When I start up mutt, I do it by calling a wrapper script that
delays
until cron-started copies of offlineimap have finished, then starts
offlineimap
on its regular, stay-alive and keep checking schedule. When I quit
mutt, the
wrapper script tells offlineimap to stop.
This way I get frequent regular checks while I have mutt running, but
I don't
waste my battery/cpu checking frequently for mail when I'm not
interested in
it.
To make this work, though, it'd be nicer if it were easier to tell
offlineimap,
from the outside, things like "terminate cleanly now" and "when you've
finished
synching, then terminate instead of sleeping and synching again."
OK, to put my money where my mouth is, I attach two patches against
offlineimap
6.0.3.
The first, "cleanup.patch", cleans up a few spots that tend to throw
exceptions
for me as offlineimap is exiting from a KeyboardInterrupt.
The second adds signaling capabilities to offlineimap.
* sending a SIGTERM tells offlineimap to terminate immediately but
cleanly,
just as if "q" had been pressed in the GUI interface
* sending a SIGUSR1 tells every account to do a full sync asap: if
it's
sleeping, then wake up and do the sync now. If it's mid-sync, then
re-synch
any folders whose syncing has already been started or completed, and
continue
to synch the other, queued but not-yet-synched folders.
* sending a SIGHUP tells every account to die as soon as it can (but
not
immediately: only after finishing any synch it's now engaged in)
* sending a SIGUSR2 tells every account to do a full sync asap (as
with
SIGUSR1), then die
It's tricky to mix signals with threads, but I think I've done this
correctly.
I've been using it now for a few weeks without any obvious
problems. But I'm passing it
on so that others can review the code and test it out on their
systems. I developed the
patch when I was running Python 2.5.2, but to my knowledge I don't use
any Python 2.5-specific
code. Now I'm using the patch with Python 2.6.
Although I said "without any obvious problems," let me confess that
I'm
seeing offlineimap regularly choke when I do things like this: start
up
my offlineimap-wrapped copy of mutt, wait a while, put the machine to
sleep (not sure if offlineimap is active in the background or idling),
move to a different spot, wake the machine up again and it acquires a
new network, sometimes a wired network instead of wifi. Offlineimap
doesn't like that so much. I don't yet have any reason to think the
problems here come from my patches. But I'm just acknowledging them,
so
that if others are able to use offlineimap without any difficulty in
situations like I described, then maybe the fault is with my patches.
2008-12-01 23:13:16 +01:00
|
|
|
def syncrunner(self, siglistener):
|
2003-01-06 00:07:58 +01:00
|
|
|
self.ui.registerthread(self.name)
|
2003-01-04 05:57:46 +01:00
|
|
|
self.ui.acct(self.name)
|
2003-04-18 04:18:34 +02:00
|
|
|
accountmetadata = self.getaccountmeta()
|
|
|
|
if not os.path.exists(accountmetadata):
|
|
|
|
os.mkdir(accountmetadata, 0700)
|
|
|
|
|
2003-07-25 03:58:20 +02:00
|
|
|
self.remoterepos = offlineimap.repository.Base.LoadRepository(self.getconf('remoterepository'), self, 'remote')
|
2003-04-18 04:18:34 +02:00
|
|
|
|
|
|
|
# Connect to the local repository.
|
2003-07-25 03:58:20 +02:00
|
|
|
self.localrepos = offlineimap.repository.Base.LoadRepository(self.getconf('localrepository'), self, 'local')
|
2003-04-18 04:18:34 +02:00
|
|
|
|
|
|
|
# Connect to the local cache.
|
2003-07-25 03:58:20 +02:00
|
|
|
self.statusrepos = offlineimap.repository.LocalStatus.LocalStatusRepository(self.getconf('localrepository'), self)
|
2003-04-18 04:18:34 +02:00
|
|
|
|
2003-01-04 05:57:46 +01:00
|
|
|
if not self.refreshperiod:
|
Patch for signal handling to start a sync by Jim Pryor
Here's the way I'd like to use offlineimap on my laptop:
1. Have a regular cron job running infrequently. The cron job
checks to see
if I'm online, plugged in, and that no other copy of offlineimap is
running. If
all of these conditions are satisfied, it runs offlineimap just once:
"offlineimap -o -u Noninteractive.Quiet"
2. When I start up mutt, I do it by calling a wrapper script that
delays
until cron-started copies of offlineimap have finished, then starts
offlineimap
on its regular, stay-alive and keep checking schedule. When I quit
mutt, the
wrapper script tells offlineimap to stop.
This way I get frequent regular checks while I have mutt running, but
I don't
waste my battery/cpu checking frequently for mail when I'm not
interested in
it.
To make this work, though, it'd be nicer if it were easier to tell
offlineimap,
from the outside, things like "terminate cleanly now" and "when you've
finished
synching, then terminate instead of sleeping and synching again."
OK, to put my money where my mouth is, I attach two patches against
offlineimap
6.0.3.
The first, "cleanup.patch", cleans up a few spots that tend to throw
exceptions
for me as offlineimap is exiting from a KeyboardInterrupt.
The second adds signaling capabilities to offlineimap.
* sending a SIGTERM tells offlineimap to terminate immediately but
cleanly,
just as if "q" had been pressed in the GUI interface
* sending a SIGUSR1 tells every account to do a full sync asap: if
it's
sleeping, then wake up and do the sync now. If it's mid-sync, then
re-synch
any folders whose syncing has already been started or completed, and
continue
to synch the other, queued but not-yet-synched folders.
* sending a SIGHUP tells every account to die as soon as it can (but
not
immediately: only after finishing any synch it's now engaged in)
* sending a SIGUSR2 tells every account to do a full sync asap (as
with
SIGUSR1), then die
It's tricky to mix signals with threads, but I think I've done this
correctly.
I've been using it now for a few weeks without any obvious
problems. But I'm passing it
on so that others can review the code and test it out on their
systems. I developed the
patch when I was running Python 2.5.2, but to my knowledge I don't use
any Python 2.5-specific
code. Now I'm using the patch with Python 2.6.
Although I said "without any obvious problems," let me confess that
I'm
seeing offlineimap regularly choke when I do things like this: start
up
my offlineimap-wrapped copy of mutt, wait a while, put the machine to
sleep (not sure if offlineimap is active in the background or idling),
move to a different spot, wake the machine up again and it acquires a
new network, sometimes a wired network instead of wifi. Offlineimap
doesn't like that so much. I don't yet have any reason to think the
problems here come from my patches. But I'm just acknowledging them,
so
that if others are able to use offlineimap without any difficulty in
situations like I described, then maybe the fault is with my patches.
2008-12-01 23:13:16 +01:00
|
|
|
self.sync(siglistener)
|
2003-01-04 05:57:46 +01:00
|
|
|
self.ui.acctdone(self.name)
|
|
|
|
return
|
|
|
|
looping = 1
|
|
|
|
while looping:
|
Patch for signal handling to start a sync by Jim Pryor
Here's the way I'd like to use offlineimap on my laptop:
1. Have a regular cron job running infrequently. The cron job
checks to see
if I'm online, plugged in, and that no other copy of offlineimap is
running. If
all of these conditions are satisfied, it runs offlineimap just once:
"offlineimap -o -u Noninteractive.Quiet"
2. When I start up mutt, I do it by calling a wrapper script that
delays
until cron-started copies of offlineimap have finished, then starts
offlineimap
on its regular, stay-alive and keep checking schedule. When I quit
mutt, the
wrapper script tells offlineimap to stop.
This way I get frequent regular checks while I have mutt running, but
I don't
waste my battery/cpu checking frequently for mail when I'm not
interested in
it.
To make this work, though, it'd be nicer if it were easier to tell
offlineimap,
from the outside, things like "terminate cleanly now" and "when you've
finished
synching, then terminate instead of sleeping and synching again."
OK, to put my money where my mouth is, I attach two patches against
offlineimap
6.0.3.
The first, "cleanup.patch", cleans up a few spots that tend to throw
exceptions
for me as offlineimap is exiting from a KeyboardInterrupt.
The second adds signaling capabilities to offlineimap.
* sending a SIGTERM tells offlineimap to terminate immediately but
cleanly,
just as if "q" had been pressed in the GUI interface
* sending a SIGUSR1 tells every account to do a full sync asap: if
it's
sleeping, then wake up and do the sync now. If it's mid-sync, then
re-synch
any folders whose syncing has already been started or completed, and
continue
to synch the other, queued but not-yet-synched folders.
* sending a SIGHUP tells every account to die as soon as it can (but
not
immediately: only after finishing any synch it's now engaged in)
* sending a SIGUSR2 tells every account to do a full sync asap (as
with
SIGUSR1), then die
It's tricky to mix signals with threads, but I think I've done this
correctly.
I've been using it now for a few weeks without any obvious
problems. But I'm passing it
on so that others can review the code and test it out on their
systems. I developed the
patch when I was running Python 2.5.2, but to my knowledge I don't use
any Python 2.5-specific
code. Now I'm using the patch with Python 2.6.
Although I said "without any obvious problems," let me confess that
I'm
seeing offlineimap regularly choke when I do things like this: start
up
my offlineimap-wrapped copy of mutt, wait a while, put the machine to
sleep (not sure if offlineimap is active in the background or idling),
move to a different spot, wake the machine up again and it acquires a
new network, sometimes a wired network instead of wifi. Offlineimap
doesn't like that so much. I don't yet have any reason to think the
problems here come from my patches. But I'm just acknowledging them,
so
that if others are able to use offlineimap without any difficulty in
situations like I described, then maybe the fault is with my patches.
2008-12-01 23:13:16 +01:00
|
|
|
self.sync(siglistener)
|
|
|
|
looping = self.sleeper(siglistener) != 2
|
2003-01-04 05:57:46 +01:00
|
|
|
self.ui.acctdone(self.name)
|
|
|
|
|
2003-04-18 04:18:34 +02:00
|
|
|
def getaccountmeta(self):
|
|
|
|
return os.path.join(self.metadatadir, 'Account-' + self.name)
|
|
|
|
|
Patch for signal handling to start a sync by Jim Pryor
Here's the way I'd like to use offlineimap on my laptop:
1. Have a regular cron job running infrequently. The cron job
checks to see
if I'm online, plugged in, and that no other copy of offlineimap is
running. If
all of these conditions are satisfied, it runs offlineimap just once:
"offlineimap -o -u Noninteractive.Quiet"
2. When I start up mutt, I do it by calling a wrapper script that
delays
until cron-started copies of offlineimap have finished, then starts
offlineimap
on its regular, stay-alive and keep checking schedule. When I quit
mutt, the
wrapper script tells offlineimap to stop.
This way I get frequent regular checks while I have mutt running, but
I don't
waste my battery/cpu checking frequently for mail when I'm not
interested in
it.
To make this work, though, it'd be nicer if it were easier to tell
offlineimap,
from the outside, things like "terminate cleanly now" and "when you've
finished
synching, then terminate instead of sleeping and synching again."
OK, to put my money where my mouth is, I attach two patches against
offlineimap
6.0.3.
The first, "cleanup.patch", cleans up a few spots that tend to throw
exceptions
for me as offlineimap is exiting from a KeyboardInterrupt.
The second adds signaling capabilities to offlineimap.
* sending a SIGTERM tells offlineimap to terminate immediately but
cleanly,
just as if "q" had been pressed in the GUI interface
* sending a SIGUSR1 tells every account to do a full sync asap: if
it's
sleeping, then wake up and do the sync now. If it's mid-sync, then
re-synch
any folders whose syncing has already been started or completed, and
continue
to synch the other, queued but not-yet-synched folders.
* sending a SIGHUP tells every account to die as soon as it can (but
not
immediately: only after finishing any synch it's now engaged in)
* sending a SIGUSR2 tells every account to do a full sync asap (as
with
SIGUSR1), then die
It's tricky to mix signals with threads, but I think I've done this
correctly.
I've been using it now for a few weeks without any obvious
problems. But I'm passing it
on so that others can review the code and test it out on their
systems. I developed the
patch when I was running Python 2.5.2, but to my knowledge I don't use
any Python 2.5-specific
code. Now I'm using the patch with Python 2.6.
Although I said "without any obvious problems," let me confess that
I'm
seeing offlineimap regularly choke when I do things like this: start
up
my offlineimap-wrapped copy of mutt, wait a while, put the machine to
sleep (not sure if offlineimap is active in the background or idling),
move to a different spot, wake the machine up again and it acquires a
new network, sometimes a wired network instead of wifi. Offlineimap
doesn't like that so much. I don't yet have any reason to think the
problems here come from my patches. But I'm just acknowledging them,
so
that if others are able to use offlineimap without any difficulty in
situations like I described, then maybe the fault is with my patches.
2008-12-01 23:13:16 +01:00
|
|
|
def sync(self, siglistener):
|
2003-01-04 05:57:46 +01:00
|
|
|
# We don't need an account lock because syncitall() goes through
|
|
|
|
# each account once, then waits for all to finish.
|
Daniel Jacobowitz patches
fixes deb#433732
Date: Sun, 30 Sep 2007 13:54:56 -0400
From: Daniel Jacobowitz <drow@false.org>
To: offlineimap@complete.org
Subject: Assorted patches
Here's the result of a lazy Sunday hacking on offlineimap. Sorry for
not breaking this into multiple patches. They're mostly logically
independent so just ask if that would make a difference.
First, a new -q (quick) option. The quick option means to only update
folders that seem to have had significant changes. For Maildir, any
change to any message UID or flags is significant, because checking
the flags doesn't add a significant cost. For IMAP, only a change to
the total number of messages or a change in the UID of the most recent
message is significant. This should catch everything except for
flags changes.
The difference in bandwidth is astonishing: a quick sync takes 80K
instead of 5.3MB, and 28 seconds instead of 90.
There's a configuration variable that lets you say every tenth sync
should update flags, but let all the intervening ones be lighter.
Second, a fix to the UID validity problems many people have been
reporting with Courier. As discussed in Debian bug #433732, I changed
the UID validity check to use SELECT unless the server complains that
the folder is read-only. This avoids the Courier bug (see the Debian
log for more details). This won't fix existing validity errors, you
need to remove the local status and validity files by hand and resync.
Third, some speedups in Maildir checking. It's still pretty slow
due to a combination of poor performance in os.listdir (never reads
more than 4K of directory entries at a time) and some semaphore that
leads to lots of futex wake operations, but at least this saves
20% or so of the CPU time running offlineimap on a single folder:
Time with quick refresh and md5 in loop: 4.75s user 0.46s system 12%
cpu 41.751 total
Time with quick refresh and md5 out of loop: 4.38s user 0.50s system
14% cpu 34.799 total
Time using string compare to check folder: 4.11s user 0.47s system 13%
cpu 34.788 total
And fourth, some display fixes for Curses.Blinkenlights. I made
warnings more visible, made the new quick sync message cyan, and
made all not explicitly colored messages grey. That last one was
really bugging me. Any time OfflineIMAP printed a warning in
this UI, it had even odds of coming out black on black!
Anyway, I hope these are useful. I'm happy to revise them if you see
a problem.
--
Daniel Jacobowitz
CodeSourcery
2007-10-01 23:20:37 +02:00
|
|
|
|
2008-10-01 07:03:04 +02:00
|
|
|
hook = self.getconf('presynchook', '')
|
|
|
|
self.callhook(hook)
|
|
|
|
|
Daniel Jacobowitz patches
fixes deb#433732
Date: Sun, 30 Sep 2007 13:54:56 -0400
From: Daniel Jacobowitz <drow@false.org>
To: offlineimap@complete.org
Subject: Assorted patches
Here's the result of a lazy Sunday hacking on offlineimap. Sorry for
not breaking this into multiple patches. They're mostly logically
independent so just ask if that would make a difference.
First, a new -q (quick) option. The quick option means to only update
folders that seem to have had significant changes. For Maildir, any
change to any message UID or flags is significant, because checking
the flags doesn't add a significant cost. For IMAP, only a change to
the total number of messages or a change in the UID of the most recent
message is significant. This should catch everything except for
flags changes.
The difference in bandwidth is astonishing: a quick sync takes 80K
instead of 5.3MB, and 28 seconds instead of 90.
There's a configuration variable that lets you say every tenth sync
should update flags, but let all the intervening ones be lighter.
Second, a fix to the UID validity problems many people have been
reporting with Courier. As discussed in Debian bug #433732, I changed
the UID validity check to use SELECT unless the server complains that
the folder is read-only. This avoids the Courier bug (see the Debian
log for more details). This won't fix existing validity errors, you
need to remove the local status and validity files by hand and resync.
Third, some speedups in Maildir checking. It's still pretty slow
due to a combination of poor performance in os.listdir (never reads
more than 4K of directory entries at a time) and some semaphore that
leads to lots of futex wake operations, but at least this saves
20% or so of the CPU time running offlineimap on a single folder:
Time with quick refresh and md5 in loop: 4.75s user 0.46s system 12%
cpu 41.751 total
Time with quick refresh and md5 out of loop: 4.38s user 0.50s system
14% cpu 34.799 total
Time using string compare to check folder: 4.11s user 0.47s system 13%
cpu 34.788 total
And fourth, some display fixes for Curses.Blinkenlights. I made
warnings more visible, made the new quick sync message cyan, and
made all not explicitly colored messages grey. That last one was
really bugging me. Any time OfflineIMAP printed a warning in
this UI, it had even odds of coming out black on black!
Anyway, I hope these are useful. I'm happy to revise them if you see
a problem.
--
Daniel Jacobowitz
CodeSourcery
2007-10-01 23:20:37 +02:00
|
|
|
quickconfig = self.getconfint('quick', 0)
|
|
|
|
if quickconfig < 0:
|
|
|
|
quick = True
|
|
|
|
elif quickconfig > 0:
|
|
|
|
if self.quicknum == 0 or self.quicknum > quickconfig:
|
|
|
|
self.quicknum = 1
|
|
|
|
quick = False
|
|
|
|
else:
|
|
|
|
self.quicknum = self.quicknum + 1
|
|
|
|
quick = True
|
|
|
|
else:
|
|
|
|
quick = False
|
|
|
|
|
2003-01-04 05:57:46 +01:00
|
|
|
try:
|
2003-04-18 04:18:34 +02:00
|
|
|
remoterepos = self.remoterepos
|
|
|
|
localrepos = self.localrepos
|
|
|
|
statusrepos = self.statusrepos
|
2003-01-04 05:57:46 +01:00
|
|
|
self.ui.syncfolders(remoterepos, localrepos)
|
2008-03-03 05:17:45 +01:00
|
|
|
remoterepos.syncfoldersto(localrepos, [statusrepos])
|
2003-01-04 05:57:46 +01:00
|
|
|
|
Patch for signal handling to start a sync by Jim Pryor
Here's the way I'd like to use offlineimap on my laptop:
1. Have a regular cron job running infrequently. The cron job
checks to see
if I'm online, plugged in, and that no other copy of offlineimap is
running. If
all of these conditions are satisfied, it runs offlineimap just once:
"offlineimap -o -u Noninteractive.Quiet"
2. When I start up mutt, I do it by calling a wrapper script that
delays
until cron-started copies of offlineimap have finished, then starts
offlineimap
on its regular, stay-alive and keep checking schedule. When I quit
mutt, the
wrapper script tells offlineimap to stop.
This way I get frequent regular checks while I have mutt running, but
I don't
waste my battery/cpu checking frequently for mail when I'm not
interested in
it.
To make this work, though, it'd be nicer if it were easier to tell
offlineimap,
from the outside, things like "terminate cleanly now" and "when you've
finished
synching, then terminate instead of sleeping and synching again."
OK, to put my money where my mouth is, I attach two patches against
offlineimap
6.0.3.
The first, "cleanup.patch", cleans up a few spots that tend to throw
exceptions
for me as offlineimap is exiting from a KeyboardInterrupt.
The second adds signaling capabilities to offlineimap.
* sending a SIGTERM tells offlineimap to terminate immediately but
cleanly,
just as if "q" had been pressed in the GUI interface
* sending a SIGUSR1 tells every account to do a full sync asap: if
it's
sleeping, then wake up and do the sync now. If it's mid-sync, then
re-synch
any folders whose syncing has already been started or completed, and
continue
to synch the other, queued but not-yet-synched folders.
* sending a SIGHUP tells every account to die as soon as it can (but
not
immediately: only after finishing any synch it's now engaged in)
* sending a SIGUSR2 tells every account to do a full sync asap (as
with
SIGUSR1), then die
It's tricky to mix signals with threads, but I think I've done this
correctly.
I've been using it now for a few weeks without any obvious
problems. But I'm passing it
on so that others can review the code and test it out on their
systems. I developed the
patch when I was running Python 2.5.2, but to my knowledge I don't use
any Python 2.5-specific
code. Now I'm using the patch with Python 2.6.
Although I said "without any obvious problems," let me confess that
I'm
seeing offlineimap regularly choke when I do things like this: start
up
my offlineimap-wrapped copy of mutt, wait a while, put the machine to
sleep (not sure if offlineimap is active in the background or idling),
move to a different spot, wake the machine up again and it acquires a
new network, sometimes a wired network instead of wifi. Offlineimap
doesn't like that so much. I don't yet have any reason to think the
problems here come from my patches. But I'm just acknowledging them,
so
that if others are able to use offlineimap without any difficulty in
situations like I described, then maybe the fault is with my patches.
2008-12-01 23:13:16 +01:00
|
|
|
siglistener.addfolders(remoterepos.getfolders(), bool(self.refreshperiod), quick)
|
|
|
|
|
|
|
|
while True:
|
|
|
|
folderthreads = []
|
|
|
|
for remotefolder, quick in siglistener.queuedfolders():
|
|
|
|
thread = InstanceLimitedThread(\
|
|
|
|
instancename = 'FOLDER_' + self.remoterepos.getname(),
|
|
|
|
target = syncfolder,
|
|
|
|
name = "Folder sync %s[%s]" % \
|
|
|
|
(self.name, remotefolder.getvisiblename()),
|
|
|
|
args = (self.name, remoterepos, remotefolder, localrepos,
|
|
|
|
statusrepos, quick))
|
|
|
|
thread.setDaemon(1)
|
|
|
|
thread.start()
|
|
|
|
folderthreads.append(thread)
|
|
|
|
threadutil.threadsreset(folderthreads)
|
|
|
|
if siglistener.clearfolders():
|
|
|
|
break
|
2003-01-06 21:40:23 +01:00
|
|
|
mbnames.write()
|
2007-07-06 18:46:29 +02:00
|
|
|
localrepos.forgetfolders()
|
|
|
|
remoterepos.forgetfolders()
|
2003-04-18 04:18:34 +02:00
|
|
|
localrepos.holdordropconnections()
|
|
|
|
remoterepos.holdordropconnections()
|
2003-01-04 05:57:46 +01:00
|
|
|
finally:
|
|
|
|
pass
|
2008-10-01 07:03:04 +02:00
|
|
|
|
|
|
|
hook = self.getconf('postsynchook', '')
|
|
|
|
self.callhook(hook)
|
|
|
|
|
|
|
|
def callhook(self, cmd):
|
|
|
|
if not cmd:
|
|
|
|
return
|
|
|
|
try:
|
|
|
|
self.ui.callhook("Calling hook: " + cmd)
|
|
|
|
p = Popen(cmd, shell=True,
|
|
|
|
stdin=PIPE, stdout=PIPE, stderr=PIPE,
|
|
|
|
close_fds=True)
|
|
|
|
r = p.communicate()
|
|
|
|
self.ui.callhook("Hook stdout: %s\nHook stderr:%s\n" % r)
|
|
|
|
self.ui.callhook("Hook return code: %d" % p.returncode)
|
|
|
|
except:
|
|
|
|
self.ui.warn("Exception occured while calling hook")
|
2003-01-04 05:57:46 +01:00
|
|
|
|
|
|
|
class SyncableAccount(Account, AccountSynchronizationMixin):
|
|
|
|
pass
|
|
|
|
|
|
|
|
def syncfolder(accountname, remoterepos, remotefolder, localrepos,
|
Daniel Jacobowitz patches
fixes deb#433732
Date: Sun, 30 Sep 2007 13:54:56 -0400
From: Daniel Jacobowitz <drow@false.org>
To: offlineimap@complete.org
Subject: Assorted patches
Here's the result of a lazy Sunday hacking on offlineimap. Sorry for
not breaking this into multiple patches. They're mostly logically
independent so just ask if that would make a difference.
First, a new -q (quick) option. The quick option means to only update
folders that seem to have had significant changes. For Maildir, any
change to any message UID or flags is significant, because checking
the flags doesn't add a significant cost. For IMAP, only a change to
the total number of messages or a change in the UID of the most recent
message is significant. This should catch everything except for
flags changes.
The difference in bandwidth is astonishing: a quick sync takes 80K
instead of 5.3MB, and 28 seconds instead of 90.
There's a configuration variable that lets you say every tenth sync
should update flags, but let all the intervening ones be lighter.
Second, a fix to the UID validity problems many people have been
reporting with Courier. As discussed in Debian bug #433732, I changed
the UID validity check to use SELECT unless the server complains that
the folder is read-only. This avoids the Courier bug (see the Debian
log for more details). This won't fix existing validity errors, you
need to remove the local status and validity files by hand and resync.
Third, some speedups in Maildir checking. It's still pretty slow
due to a combination of poor performance in os.listdir (never reads
more than 4K of directory entries at a time) and some semaphore that
leads to lots of futex wake operations, but at least this saves
20% or so of the CPU time running offlineimap on a single folder:
Time with quick refresh and md5 in loop: 4.75s user 0.46s system 12%
cpu 41.751 total
Time with quick refresh and md5 out of loop: 4.38s user 0.50s system
14% cpu 34.799 total
Time using string compare to check folder: 4.11s user 0.47s system 13%
cpu 34.788 total
And fourth, some display fixes for Curses.Blinkenlights. I made
warnings more visible, made the new quick sync message cyan, and
made all not explicitly colored messages grey. That last one was
really bugging me. Any time OfflineIMAP printed a warning in
this UI, it had even odds of coming out black on black!
Anyway, I hope these are useful. I'm happy to revise them if you see
a problem.
--
Daniel Jacobowitz
CodeSourcery
2007-10-01 23:20:37 +02:00
|
|
|
statusrepos, quick):
|
2003-01-04 05:57:46 +01:00
|
|
|
global mailboxes
|
|
|
|
ui = UIBase.getglobalui()
|
2003-01-06 00:07:58 +01:00
|
|
|
ui.registerthread(accountname)
|
2003-01-04 05:57:46 +01:00
|
|
|
# Load local folder.
|
|
|
|
localfolder = localrepos.\
|
|
|
|
getfolder(remotefolder.getvisiblename().\
|
|
|
|
replace(remoterepos.getsep(), localrepos.getsep()))
|
|
|
|
# Write the mailboxes
|
2003-01-06 21:40:23 +01:00
|
|
|
mbnames.add(accountname, localfolder.getvisiblename())
|
2003-01-04 05:57:46 +01:00
|
|
|
|
|
|
|
# Load status folder.
|
|
|
|
statusfolder = statusrepos.getfolder(remotefolder.getvisiblename().\
|
|
|
|
replace(remoterepos.getsep(),
|
|
|
|
statusrepos.getsep()))
|
|
|
|
if localfolder.getuidvalidity() == None:
|
|
|
|
# This is a new folder, so delete the status cache to be sure
|
|
|
|
# we don't have a conflict.
|
|
|
|
statusfolder.deletemessagelist()
|
|
|
|
|
|
|
|
statusfolder.cachemessagelist()
|
|
|
|
|
Daniel Jacobowitz patches
fixes deb#433732
Date: Sun, 30 Sep 2007 13:54:56 -0400
From: Daniel Jacobowitz <drow@false.org>
To: offlineimap@complete.org
Subject: Assorted patches
Here's the result of a lazy Sunday hacking on offlineimap. Sorry for
not breaking this into multiple patches. They're mostly logically
independent so just ask if that would make a difference.
First, a new -q (quick) option. The quick option means to only update
folders that seem to have had significant changes. For Maildir, any
change to any message UID or flags is significant, because checking
the flags doesn't add a significant cost. For IMAP, only a change to
the total number of messages or a change in the UID of the most recent
message is significant. This should catch everything except for
flags changes.
The difference in bandwidth is astonishing: a quick sync takes 80K
instead of 5.3MB, and 28 seconds instead of 90.
There's a configuration variable that lets you say every tenth sync
should update flags, but let all the intervening ones be lighter.
Second, a fix to the UID validity problems many people have been
reporting with Courier. As discussed in Debian bug #433732, I changed
the UID validity check to use SELECT unless the server complains that
the folder is read-only. This avoids the Courier bug (see the Debian
log for more details). This won't fix existing validity errors, you
need to remove the local status and validity files by hand and resync.
Third, some speedups in Maildir checking. It's still pretty slow
due to a combination of poor performance in os.listdir (never reads
more than 4K of directory entries at a time) and some semaphore that
leads to lots of futex wake operations, but at least this saves
20% or so of the CPU time running offlineimap on a single folder:
Time with quick refresh and md5 in loop: 4.75s user 0.46s system 12%
cpu 41.751 total
Time with quick refresh and md5 out of loop: 4.38s user 0.50s system
14% cpu 34.799 total
Time using string compare to check folder: 4.11s user 0.47s system 13%
cpu 34.788 total
And fourth, some display fixes for Curses.Blinkenlights. I made
warnings more visible, made the new quick sync message cyan, and
made all not explicitly colored messages grey. That last one was
really bugging me. Any time OfflineIMAP printed a warning in
this UI, it had even odds of coming out black on black!
Anyway, I hope these are useful. I'm happy to revise them if you see
a problem.
--
Daniel Jacobowitz
CodeSourcery
2007-10-01 23:20:37 +02:00
|
|
|
if quick:
|
|
|
|
if not localfolder.quickchanged(statusfolder) \
|
|
|
|
and not remotefolder.quickchanged(statusfolder):
|
|
|
|
ui.skippingfolder(remotefolder)
|
|
|
|
localrepos.restore_atime()
|
|
|
|
return
|
|
|
|
|
|
|
|
# Load local folder
|
|
|
|
ui.syncingfolder(remoterepos, remotefolder, localrepos, localfolder)
|
|
|
|
ui.loadmessagelist(localrepos, localfolder)
|
|
|
|
localfolder.cachemessagelist()
|
|
|
|
ui.messagelistloaded(localrepos, localfolder, len(localfolder.getmessagelist().keys()))
|
|
|
|
|
2003-04-18 04:18:34 +02:00
|
|
|
# If either the local or the status folder has messages and there is a UID
|
|
|
|
# validity problem, warn and abort. If there are no messages, UW IMAPd
|
|
|
|
# loses UIDVALIDITY. But we don't really need it if both local folders are
|
|
|
|
# empty. So, in that case, just save it off.
|
|
|
|
if len(localfolder.getmessagelist()) or len(statusfolder.getmessagelist()):
|
|
|
|
if not localfolder.isuidvalidityok():
|
2007-03-15 05:39:15 +01:00
|
|
|
ui.validityproblem(localfolder)
|
2008-12-01 23:10:49 +01:00
|
|
|
localrepos.restore_atime()
|
2003-04-18 04:18:34 +02:00
|
|
|
return
|
|
|
|
if not remotefolder.isuidvalidityok():
|
2007-03-15 05:39:15 +01:00
|
|
|
ui.validityproblem(remotefolder)
|
2008-12-01 23:10:49 +01:00
|
|
|
localrepos.restore_atime()
|
2003-04-18 04:18:34 +02:00
|
|
|
return
|
2003-01-04 05:57:46 +01:00
|
|
|
else:
|
2003-04-18 04:18:34 +02:00
|
|
|
localfolder.saveuidvalidity()
|
|
|
|
remotefolder.saveuidvalidity()
|
2003-01-04 05:57:46 +01:00
|
|
|
|
|
|
|
# Load remote folder.
|
|
|
|
ui.loadmessagelist(remoterepos, remotefolder)
|
|
|
|
remotefolder.cachemessagelist()
|
|
|
|
ui.messagelistloaded(remoterepos, remotefolder,
|
|
|
|
len(remotefolder.getmessagelist().keys()))
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
|
|
|
if not statusfolder.isnewfolder():
|
|
|
|
# Delete local copies of remote messages. This way,
|
|
|
|
# if a message's flag is modified locally but it has been
|
|
|
|
# deleted remotely, we'll delete it locally. Otherwise, we
|
|
|
|
# try to modify a deleted message's flags! This step
|
|
|
|
# need only be taken if a statusfolder is present; otherwise,
|
|
|
|
# there is no action taken *to* the remote repository.
|
|
|
|
|
|
|
|
remotefolder.syncmessagesto_delete(localfolder, [localfolder,
|
|
|
|
statusfolder])
|
|
|
|
ui.syncingmessages(localrepos, localfolder, remoterepos, remotefolder)
|
|
|
|
localfolder.syncmessagesto(statusfolder, [remotefolder, statusfolder])
|
|
|
|
|
|
|
|
# Synchronize remote changes.
|
|
|
|
ui.syncingmessages(remoterepos, remotefolder, localrepos, localfolder)
|
2003-01-06 05:54:59 +01:00
|
|
|
remotefolder.syncmessagesto(localfolder, [localfolder, statusfolder])
|
2003-01-04 05:57:46 +01:00
|
|
|
|
|
|
|
# Make sure the status folder is up-to-date.
|
|
|
|
ui.syncingmessages(localrepos, localfolder, statusrepos, statusfolder)
|
|
|
|
localfolder.syncmessagesto(statusfolder)
|
|
|
|
statusfolder.save()
|
New restoreatime patch from Ben Kibbey
From: Ben Kibbey
Subject: Re: Removed restoratime from OfflineIMAP
On Wed, May 03, 2006 at 10:08:35PM -0500, John Goerzen wrote:
> Hi Ben,
>
> Thanks for your restoreatime patch.
>
> However, I have received this bug report:
>
> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=365933
>
> After looking at the problem, here's what's going on.
>
> The person is using IMAP as the local repository as well.
>
> You really need to move the atime save and restore code from accounts.py
> into the repository/Maildir.py. Then, for any new call you add to the
> Maildir repository (that will be called from outside Maildir.py), you
> need to add a corresponding default function to repository/Base.py, and
> also make sure that on folders (such as IMAP) where atime restoration
> makes no sense, no error is generated.
>
> Let me know if that doesn't make sense to you. If you get it fixed, I'd
> be happy to re-apply it to a future version of OfflineIMAP.
>
> -- John Goerzen
>
Attached is a new diff that should work though not really tested
(v4.0.14). In repository/Base.py restore_atime() will call
self.restore_folder_atimes() only if the folder type is Maildir. Let me
know if it has any more problems.
2006-09-06 03:33:07 +02:00
|
|
|
localrepos.restore_atime()
|
2003-01-04 05:57:46 +01:00
|
|
|
|