From b2f894959063130b3f9fd846834fda4781b69b4f Mon Sep 17 00:00:00 2001 From: noxxusnx <167797213+noxxusnx@users.noreply.github.com> Date: Sun, 15 Sep 2024 22:02:10 -0400 Subject: [PATCH] ensure episode_title is still populated for repacks --- guessit/config/options.json | 2 +- guessit/rules/properties/episode_title.py | 2 +- guessit/test/rules/episodes.yml | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/guessit/config/options.json b/guessit/config/options.json index 1eeaff84..7a7e618c 100644 --- a/guessit/config/options.json +++ b/guessit/config/options.json @@ -447,7 +447,7 @@ "Dual Audio": {"string": ["Dual"], "regex": ["Dual-?Audio"]}, "Widescreen": {"string": ["ws"], "regex": ["wide-?screen"]}, "Reencoded": {"regex": ["Re-?Enc(?:oded)?"]}, - "_repack_with_count": {"regex": ["Repack(?P\\d*)", "Rerip(?P\\d*)"], "value": {"other": "Proper"}, "tags": ["streaming_service.prefix", "streaming_service.suffix"]}, + "_repack_with_count": {"regex": ["Repack(?P\\d*)", "Rerip(?P\\d*)"], "value": {"other": "Proper"}, "tags": ["streaming_service.prefix", "streaming_service.suffix", "repack"]}, "Proper": [ {"string": "Proper", "tags": ["has-neighbor", "streaming_service.prefix", "streaming_service.suffix"]}, {"regex": ["Real-Proper", "Real-Repack", "Real-Rerip"], "tags": ["streaming_service.prefix", "streaming_service.suffix", "real"]}, diff --git a/guessit/rules/properties/episode_title.py b/guessit/rules/properties/episode_title.py index 2c4fab66..0fc5c803 100644 --- a/guessit/rules/properties/episode_title.py +++ b/guessit/rules/properties/episode_title.py @@ -134,7 +134,7 @@ def __init__(self, previous_names): def hole_filter(self, hole, matches): episode = matches.previous(hole, - lambda previous: previous.named(*self.previous_names), + lambda previous: previous.named(*self.previous_names) or previous.tagged('repack'), 0) crc32 = matches.named('crc32') diff --git a/guessit/test/rules/episodes.yml b/guessit/test/rules/episodes.yml index 7eff1e72..e3ae4d90 100644 --- a/guessit/test/rules/episodes.yml +++ b/guessit/test/rules/episodes.yml @@ -341,3 +341,12 @@ season: 32 week: 45 episode: 6478 + +? Some.Series.S00E01.Some.Episode.Title.1080p.WEBRip.x265.AAC.2.0-SOMEGROUP.mkv +: title: Some Series + episode_title: Some Episode Title + +? Some.Series.S00E01.REPACK.Some.Episode.Title.1080p.WEBRip.x265.AAC.2.0-SOMEGROUP.mkv +: title: Some Series + episode_title: Some Episode Title + proper_count: 1