diff --git a/guessit/rules/properties/release_group.py b/guessit/rules/properties/release_group.py index 68ed69a..b5ffa61 100644 --- a/guessit/rules/properties/release_group.py +++ b/guessit/rules/properties/release_group.py @@ -49,7 +49,7 @@ def clean_groupname(string): _scene_previous_names = ['video_codec', 'format', 'video_api', 'audio_codec', 'audio_profile', 'video_profile', - 'audio_channels', 'screen_size'] + 'audio_channels', 'screen_size', 'other', 'container', 'language'] _scene_previous_tags = ['release-group-prefix'] @@ -114,7 +114,7 @@ class SceneReleaseGroup(Rule): last_hole.name = 'release_group' last_hole.tags = ['scene'] - # if hole is insed a group marker with same value, remove [](){} ... + # if hole is inside a group marker with same value, remove [](){} ... group = matches.markers.at_match(last_hole, lambda marker: marker.name == 'group', 0) if group: group.formatter = clean_groupname diff --git a/guessit/test/episodes.yml b/guessit/test/episodes.yml index 47497be..d7735bf 100644 --- a/guessit/test/episodes.yml +++ b/guessit/test/episodes.yml @@ -992,7 +992,7 @@ : other: Complete season: 1 title: Something - episode_title: FlexGet # 1.x guess this as release_group, but it's better to guess it as episode_title + release_group: FlexGet ? FlexGet.US.S2013E14.Title.Here.720p.HDTV.AAC5.1.x264-NOGRP : audio_channels: '5.1' @@ -1776,4 +1776,71 @@ subtitle_language: de title: Homeland type: episode - video_codec: h264 \ No newline at end of file + video_codec: h264 + +? Breaking.Bad.S01E01.2008.BluRay.VC1.1080P.5.1.WMV-NOVO +: title: Breaking Bad + season: 1 + episode: 1 + year: 2008 + format: BluRay + screen_size: 1080p + audio_channels: '5.1' + container: WMV + release_group: NOVO + type: episode + +? Cosmos.A.Space.Time.Odyssey.S01E02.HDTV.x264.PROPER-LOL +: title: Cosmos A Space Time Odyssey + season: 1 + episode: 2 + format: HDTV + video_codec: h264 + other: Proper + proper_count: 1 + release_group: LOL + type: episode + +? Fear.The.Walking.Dead.S02E01.HDTV.x264.AAC.MP4-k3n +: title: Fear The Walking Dead + season: 2 + episode: 1 + format: HDTV + video_codec: h264 + audio_codec: AAC + container: MP4 + release_group: k3n + type: episode + +? Elementary.S01E01.Pilot.DVDSCR.x264.PREAiR-NoGRP +: title: Elementary + season: 1 + episode: 1 + episode_details: Pilot + episode_title: Pilot + format: DVD + video_codec: h264 + other: [Screener, Preair] + release_group: NoGRP + type: episode + +? Once.Upon.a.Time.S05E19.HDTV.x264.REPACK-LOL[ettv] +: title: Once Upon a Time + season: 5 + episode: 19 + format: HDTV + video_codec: h264 + other: Proper + proper_count: 1 + release_group: LOL[ettv] + type: episode + +? Show.Name.S01E03.WEB-DL.x264.HUN-nIk +: title: Show Name + season: 1 + episode: 3 + format: WEB-DL + video_codec: h264 + language: hu + release_group: nIk + type: episode \ No newline at end of file