Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-01-30 12:02:41 +01:00
Code Issues Projects Releases Wiki Activity

template: fix ifdef bug #3852 involving non-string fields with missing values

Browse source
This commit is contained in:
Andrew Sultana 2021-06-16 16:30:42 +01:00
parent 5fad8ee0b2
commit 86e11fb582
2 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
beets/library.py
View file

@ -1753,7 +1753,7 @@ class DefaultTemplateFunctions(object):
:param falseval: The string if the condition is false
:return: The string, based on condition
"""
if self.item.formatted().get(field):
if field in self.item:
return trueval if trueval else self.item.formatted().get(field)
else:
return falseval

33
test/test_types_plugin.py
View file

@ -145,6 +145,39 @@ class TypesPluginTest(unittest.TestCase, TestHelper):
with self.assertRaises(ConfigValueError):
self.run_command(u'ls')
def test_template_if_def(self):
# Tests for a subtle bug when using %ifdef in templates along with
# types that have truthy default values (e.g. '0', '0.0', 'False')
# https://github.com/beetbox/beets/issues/3852
self.config['types'] = {'playcount': u'int', 'rating': u'float',
'starred': u'bool'}
with_fields = self.add_item(artist=u'prince')
self.modify(u'playcount=10', u'artist=prince')
self.modify(u'rating=5.0', u'artist=prince')
self.modify(u'starred=yes', u'artist=prince')
with_fields.load()
without_fields = self.add_item(artist=u'britney')
int_template = u'%ifdef{playcount,Play count: $playcount,Not played}'
self.assertEqual(with_fields.evaluate_template(int_template),
u'Play count: 10')
self.assertEqual(without_fields.evaluate_template(int_template),
u'Not played')
float_template = u'%ifdef{rating,Rating: $rating,Not rated}'
self.assertEqual(with_fields.evaluate_template(float_template),
u'Rating: 5.0')
self.assertEqual(without_fields.evaluate_template(float_template),
u'Not rated')
bool_template = u'%ifdef{starred,Starred: $starred,Not starred}'
self.assertIn(with_fields.evaluate_template(bool_template).lower(),
(u'starred: true', u'starred: yes', u'starred: y'))
self.assertEqual(without_fields.evaluate_template(bool_template),
u'Not starred')
def modify(self, *args):
return self.run_with_output(u'modify', u'--yes', u'--nowrite',
u'--nomove', *args)