From 4c10925e97046b8801f4d07800fae5cd6500dc37 Mon Sep 17 00:00:00 2001 From: Rato Date: Sat, 16 Feb 2019 14:31:19 +0100 Subject: [PATCH] #551: Fixes wrong bonus detection --- guessit/rules/properties/bonus.py | 3 ++- guessit/test/various.yml | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/guessit/rules/properties/bonus.py b/guessit/rules/properties/bonus.py index c4554cd..54087aa 100644 --- a/guessit/rules/properties/bonus.py +++ b/guessit/rules/properties/bonus.py @@ -26,7 +26,8 @@ def bonus(config): # pylint:disable=unused-argument rebulk = rebulk.regex_defaults(flags=re.IGNORECASE) rebulk.regex(r'x(\d+)', name='bonus', private_parent=True, children=True, formatter=int, - validator={'__parent__': lambda match: seps_surround}, + validator={'__parent__': seps_surround}, + validate_all=True, conflict_solver=lambda match, conflicting: match if conflicting.name in ('video_codec', 'episode') and 'weak-episode' not in conflicting.tags else '__default__') diff --git a/guessit/test/various.yml b/guessit/test/various.yml index a06625a..f6f31cd 100644 --- a/guessit/test/various.yml +++ b/guessit/test/various.yml @@ -974,3 +974,13 @@ subtitle_language: und container: mp4 type: episode + +? Shaolin 2011.720p.BluRay.x264-x0r.mkv +: title: Shaolin + year: 2011 + screen_size: 720p + source: Blu-ray + video_codec: H.264 + release_group: x0r + container: mkv + type: movie