From 9cbe03f6c0cf401bc63115261f3b956f0ac29778 Mon Sep 17 00:00:00 2001 From: Sophist Date: Mon, 21 Apr 2014 16:54:07 +0100 Subject: [PATCH 1/2] Simplify display_tag_name --- picard/util/tags.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/picard/util/tags.py b/picard/util/tags.py index ca4bbc360..acc4ac78a 100644 --- a/picard/util/tags.py +++ b/picard/util/tags.py @@ -96,17 +96,11 @@ PRESERVED_TAGS = [ def display_tag_name(name): + desc = '' if ':' in name: name, desc = name.split(':', 1) - name = _(TAG_NAMES.get(name + ':', name)) + name = TAG_NAMES.get(name + ':', TAG_NAMES.get(name, name)) + if desc: return '%s [%s]' % (_(name), desc) else: - new_name = TAG_NAMES.get(name) - if new_name is None: - new_name = TAG_NAMES.get(name + ':') - if new_name is None: - return _(name) - else: - return '%s []' % (_(new_name),) - else: - return _(new_name) + return _(name) From 14c09a8d1e20c5c205e9a575152710aea300ab1a Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Tue, 22 Apr 2014 10:31:19 +0200 Subject: [PATCH 2/2] Add a test for util.tags.display_tag_name() --- test/test_utils.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/test_utils.py b/test/test_utils.py index c8e7965a0..5dbab82a3 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -77,3 +77,20 @@ class HiddenPathTest(unittest.TestCase): self.assertEqual(util.is_hidden_path('/a/./.c.mp3'), True) self.assertEqual(util.is_hidden_path('/a/../c.mp3'), False) self.assertEqual(util.is_hidden_path('/a/../.c.mp3'), True) + + +class TagsTest(unittest.TestCase): + + def test_display_tag_name(self): + def _(s): + return s + + dtn = util.tags.display_tag_name + self.assertEqual(dtn('tag'), 'tag') + self.assertEqual(dtn('tag:desc'), 'tag [desc]') + self.assertEqual(dtn('tag:'), 'tag') + self.assertEqual(dtn('originalyear'), 'Original Year') + self.assertEqual(dtn('originalyear:desc'), 'Original Year [desc]') + self.assertEqual(dtn('~length'), 'Length') + self.assertEqual(dtn('~lengthx'), '~lengthx') + self.assertEqual(dtn(''), '')