From f2a94af5227db133bd861823418a7456202e64d8 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 10 Jan 2012 07:19:22 +0100 Subject: [PATCH] Don't emit regular sleeping announcements in Basic UI They are too noisy in the Basic UI, but are still included in TTYUI. Reported by John Wiegley. Signed-off-by: Sebastian Spaeth --- Changelog.draft.rst | 1 + offlineimap/ui/TTY.py | 16 ++++++++++++++++ offlineimap/ui/UIBase.py | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Changelog.draft.rst b/Changelog.draft.rst index be30b27..2b278ca 100644 --- a/Changelog.draft.rst +++ b/Changelog.draft.rst @@ -31,5 +31,6 @@ Changes * Don't fail when ~/netrc is not readable by us. +* Don't emit noisy regular sleeping announcements in Basic UI. Bug Fixes --------- diff --git a/offlineimap/ui/TTY.py b/offlineimap/ui/TTY.py index cedd8a6..2b3e834 100644 --- a/offlineimap/ui/TTY.py +++ b/offlineimap/ui/TTY.py @@ -84,3 +84,19 @@ class TTYUI(UIBase): else: UIBase.mainException(self) + def sleeping(self, sleepsecs, remainingsecs): + """Sleep for sleepsecs, display remainingsecs to go. + + Does nothing if sleepsecs <= 0. + Display a message on the screen if we pass a full minute. + + This implementation in UIBase does not support this, but some + implementations return 0 for successful sleep and 1 for an + 'abort', ie a request to sync immediately. + """ + if sleepsecs > 0: + if remainingsecs//60 != (remainingsecs-sleepsecs)//60: + self.logger.info("Next refresh in %.1f minutes" % ( + remainingsecs/60.0)) + time.sleep(sleepsecs) + return 0 diff --git a/offlineimap/ui/UIBase.py b/offlineimap/ui/UIBase.py index dc9e935..66ecd4f 100644 --- a/offlineimap/ui/UIBase.py +++ b/offlineimap/ui/UIBase.py @@ -493,7 +493,7 @@ class UIBase(object): """ if sleepsecs > 0: if remainingsecs//60 != (remainingsecs-sleepsecs)//60: - self.logger.info("Next refresh in %.1f minutes" % ( + self.logger.debug("Next refresh in %.1f minutes" % ( remainingsecs/60.0)) time.sleep(sleepsecs) return 0