diff --git a/test/test_utils.py b/test/test_utils.py index 9319e8695..e6e202b23 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1272,9 +1272,16 @@ class TestUtil(unittest.TestCase): self.assertEqual(parse_count('1000'), 1000) self.assertEqual(parse_count('1.000'), 1000) self.assertEqual(parse_count('1.1k'), 1100) + self.assertEqual(parse_count('1.1 k'), 1100) + self.assertEqual(parse_count('1,1 k'), 1100) + self.assertEqual(parse_count('1,1kk'), 1100000) + self.assertEqual(parse_count('100 views'), 100) + self.assertEqual(parse_count('1,100 views'), 1100) self.assertEqual(parse_count('1.1kk'), 1100000) self.assertEqual(parse_count('1.1kk '), 1100000) self.assertEqual(parse_count('1.1kk views'), 1100000) + self.assertEqual(parse_count('10M views'), 10000000) + self.assertEqual(parse_count('has 10M views'), 10000000) def test_parse_resolution(self): self.assertEqual(parse_resolution(None), {}) diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 90d380f25..952c636a8 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -3746,10 +3746,11 @@ def parse_count(s): if s is None: return None - s = s.strip() - - if re.match(r'^[\d,.]+$', s): - return str_to_int(s) + m = re.match(r'^(?:[^\d]+\s+)?(?P(?P[\d,.]+)(?P[\w\s]+?)?)(?:\s|\s*$)', s) + if m: + if not m.group('rest'): + return str_to_int(m.group('num')) + s = m.group('val') _UNIT_TABLE = { 'k': 1000, @@ -3758,9 +3759,17 @@ def parse_count(s): 'M': 1000 ** 2, 'kk': 1000 ** 2, 'KK': 1000 ** 2, + 'b': 1000 ** 3, + 'B': 1000 ** 3, } - return lookup_unit_table(_UNIT_TABLE, s) + ret = lookup_unit_table(_UNIT_TABLE, s) + if ret is not None: + return ret + + s = m and m.group('num') + if s is not None: + return str_to_int(s) def parse_resolution(s):