From efcce01d640ade3b03596fe991d466e4f5bbf4fe Mon Sep 17 00:00:00 2001
From: Sebastian Spaeth <Sebastian@SSpaeth.de>
Date: Wed, 9 Mar 2011 08:44:41 +0100
Subject: [PATCH] Declutter TTY output

Previously we would output:

Folder sync sspaeth.de[INBOX.INBOX201004]:
 Syncing INBOX.INBOX201004: IMAP -> Maildir
Folder sync sspaeth.de[INBOX.INBOX201006]:
 Syncing INBOX.INBOX201006: IMAP -> Maildir
Folder sync sspaeth.de[INBOX.INBOX201009]:
 Syncing INBOX.INBOX201009: IMAP -> Maildir

which is very repetitive and cluttered. By naming the folder sync
threads just according to the account and not the folder, the output
looks much nicer:

Folder sync [sspaeth.de]:
 Syncing INBOX.INBOX201004: IMAP -> Maildir
 Syncing INBOX.INBOX201006: IMAP -> Maildir
 Syncing INBOX.INBOX201009: IMAP -> Maildir

If syncing multiple accounts in parallel, we will still get headers
indicating the account:

Folder sync [sspaeth.de]:
 Syncing INBOX: IMAP -> Maildir
 Syncing INBOX.INBOX201006: IMAP -> Maildir
Folder sync [gmail]:
 Syncing INBOX: IMAP -> Maildir

This is a small fix that makes the output much nicer in my opinion.

Also don't output the thread name if we are in the MainThread, e.g. when
we output the initial offlineimap banner.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
---
 Changelog.draft.rst     | 2 ++
 offlineimap/accounts.py | 3 +--
 offlineimap/ui/TTY.py   | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Changelog.draft.rst b/Changelog.draft.rst
index b8c82f8..888f328 100644
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@@ -16,6 +16,8 @@ New Features
 Changes
 -------
 
+* TTYUI ouput improved.
+
 Bug Fixes
 ---------
 
diff --git a/offlineimap/accounts.py b/offlineimap/accounts.py
index 8c03e69..7e87909 100644
--- a/offlineimap/accounts.py
+++ b/offlineimap/accounts.py
@@ -252,8 +252,7 @@ class AccountSynchronizationMixin:
                     thread = InstanceLimitedThread(\
                         instancename = 'FOLDER_' + self.remoterepos.getname(),
                         target = syncfolder,
-                        name = "Folder sync %s[%s]" % \
-                        (self.name, remotefolder.getvisiblename()),
+                        name = "Folder sync [%s]" % self.name,
                         args = (self.name, remoterepos, remotefolder, localrepos,
                                 statusrepos, quick))
                     thread.setDaemon(1)
diff --git a/offlineimap/ui/TTY.py b/offlineimap/ui/TTY.py
index ee18dfa..d88de1b 100644
--- a/offlineimap/ui/TTY.py
+++ b/offlineimap/ui/TTY.py
@@ -41,7 +41,8 @@ class TTYUI(UIBase):
                 threadname = currentThread().name
             except AttributeError:
                 threadname = currentThread().getName()
-            if (threadname == s._lastThreaddisplay):
+            if (threadname == s._lastThreaddisplay \
+                    or threadname == 'MainThread'):
                 print " %s" % msg
             else:
                 print "%s:\n %s" % (threadname, msg)