diff options
| author | Sergey M․ <dstftw@gmail.com> | 2018-04-24 23:49:30 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2018-04-24 23:54:49 +0700 |
| commit | 1cc47c667419e0eadc0a6989256ab7b276852adf (patch) | |
| tree | 7aae871998b25632bd5dcd1bb03d4f1511e995a1 | |
| parent | 99036a1298089068dcf80c0985bfcc3f8c24f281 (diff) | |
| download | youtube-dl-1cc47c667419e0eadc0a6989256ab7b276852adf.tar.xz | |
[utils] Fix match_str for boolean meta fields
| -rw-r--r-- | test/test_utils.py | 12 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/test/test_utils.py b/test/test_utils.py index a1fe6fdb2..253a7fe17 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1072,6 +1072,18 @@ ffmpeg version 2.4.4 Copyright (c) 2000-2014 the FFmpeg ...'''), '2.4.4') self.assertFalse(match_str( 'like_count > 100 & dislike_count <? 50 & description', {'like_count': 190, 'dislike_count': 10})) + self.assertTrue(match_str('is_live', {'is_live': True})) + self.assertFalse(match_str('is_live', {'is_live': False})) + self.assertFalse(match_str('is_live', {'is_live': None})) + self.assertFalse(match_str('is_live', {})) + self.assertFalse(match_str('!is_live', {'is_live': True})) + self.assertTrue(match_str('!is_live', {'is_live': False})) + self.assertTrue(match_str('!is_live', {'is_live': None})) + self.assertTrue(match_str('!is_live', {})) + self.assertTrue(match_str('title', {'title': 'abc'})) + self.assertTrue(match_str('title', {'title': ''})) + self.assertFalse(match_str('!title', {'title': 'abc'})) + self.assertFalse(match_str('!title', {'title': ''})) def test_parse_dfxp_time_expr(self): self.assertEqual(parse_dfxp_time_expr(None), None) diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 027d12785..574284e94 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -2574,8 +2574,8 @@ def _match_one(filter_part, dct): return op(actual_value, comparison_value) UNARY_OPERATORS = { - '': lambda v: v is not None, - '!': lambda v: v is None, + '': lambda v: (v is True) if isinstance(v, bool) else (v is not None), + '!': lambda v: (v is False) if isinstance(v, bool) else (v is None), } operator_rex = re.compile(r'''(?x)\s* (?P<op>%s)\s*(?P<key>[a-z_]+) |