fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-28 18:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #301 from Sophist-UK/sophist_fix_tag_brackets

Browse Source 
Simplify display_tag_name
This commit is contained in:
Laurent Monin
2014-04-22 13:05:41 +02:00
parent daa6b39f44 ef9a3309d3
commit 32eb021e24
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
picard/util/tags.py
View File

@@ -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)

17
test/test_utils.py
View File

@@ -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(''), '')