Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-07 00:53:08 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2741 from eigengrau/master

Browse source 
mediafile._safe_cast: be safer when converting to int
This commit is contained in:
Adrian Sampson 2017-11-19 10:50:51 -05:00
commit 60249fdcdb
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
beets/mediafile.py
View file

@ -159,11 +159,8 @@ def _safe_cast(out_type, val):
elif not isinstance(val, six.string_types): elif not isinstance(val, six.string_types):
val = six.text_type(val) val = six.text_type(val)
# Get a number from the front of the string. # Get a number from the front of the string.
val = re.match(r'[\+-]?[0-9]*', val.strip()).group(0) match = re.match(r'[\+-]?[0-9]+', val.strip())
if not val: return int(match.group(0)) if match else 0
return 0
else:
return int(val)
elif out_type == bool: elif out_type == bool:
try: try:

2
docs/changelog.rst
View file

@ -71,6 +71,8 @@ Fixes:
versions of Mutagen. :bug:`2716` versions of Mutagen. :bug:`2716`
* :doc:`/plugins/fetchart`: Fix: don't skip running the fetchart plugin during import, when the * :doc:`/plugins/fetchart`: Fix: don't skip running the fetchart plugin during import, when the
"Edit Candidates" option is used. :bug:`2734` "Edit Candidates" option is used. :bug:`2734`
* Fix a crash when numeric metadata fields contain just a minus or plus sign
with no following numbers.
For developers: For developers:

3
test/test_mediafile_edge.py
View file

@ -105,6 +105,9 @@ class InvalidValueToleranceTest(unittest.TestCase):
def test_safe_cast_string_to_int(self): def test_safe_cast_string_to_int(self):
self.assertEqual(_sc(int, u'something'), 0) self.assertEqual(_sc(int, u'something'), 0)
def test_safe_cast_string_to_int_with_no_numbers(self):
self.assertEqual(_sc(int, u'-'), 0)
def test_safe_cast_int_string_to_int(self): def test_safe_cast_int_string_to_int(self):
self.assertEqual(_sc(int, u'20'), 20) self.assertEqual(_sc(int, u'20'), 20)