From 968ffc20bd0f1b3e9bbc0a0df15eab6f2acf21f8 Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Tue, 24 Jun 2014 18:48:58 +0400 Subject: [PATCH] More clearly show results of folder name translation For cases like http://article.gmane.org/gmane.mail.imap.offlineimap.general/6468 it is beneficial to see that folder name was translated and the result of this translation on a single line: having log like {{{ Folder Boring/Wreck [acc: tmarble@info9.net]: Syncing Boring/Breck: Gmail -> Maildir }}} with translated name on the "Folder" line and original one on the "Syncing" line isn't very intuitive. Signed-off-by: Eygene Ryabinkin --- offlineimap/accounts.py | 2 +- offlineimap/folder/Base.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/offlineimap/accounts.py b/offlineimap/accounts.py index 2c9551d..f8a2281 100644 --- a/offlineimap/accounts.py +++ b/offlineimap/accounts.py @@ -326,7 +326,7 @@ class SyncableAccount(Account): thread = InstanceLimitedThread(\ instancename = 'FOLDER_' + self.remoterepos.getname(), target = syncfolder, - name = "Folder %s [acc: %s]" % (remotefolder, self), + name = "Folder %s [acc: %s]" % (remotefolder.getexplainedname(), self), args = (self, remotefolder, quick)) thread.start() folderthreads.append(thread) diff --git a/offlineimap/folder/Base.py b/offlineimap/folder/Base.py index bca52a2..a80a6e0 100644 --- a/offlineimap/folder/Base.py +++ b/offlineimap/folder/Base.py @@ -132,6 +132,13 @@ class BaseFolder(object): """The nametrans-transposed name of the folder's name""" return self.visiblename + def getexplainedname(self): + """ Name that shows both real and nametrans-mangled values""" + if self.name == self.visiblename: + return self.name + else: + return "%s [remote name %s]" % (self.visiblename, self.name) + def getrepository(self): """Returns the repository object that this folder is within.""" return self.repository