From 16fd9eee5605111f1217bd3402079b63f4c437cf Mon Sep 17 00:00:00 2001 From: Rato Date: Sat, 22 Jul 2017 09:14:43 +0200 Subject: [PATCH] Fix for #384: Detect Digital Master source --- HISTORY.rst | 1 + docs/properties.rst | 6 +-- guessit/rules/properties/source.py | 2 + guessit/test/episodes.yml | 60 ++++++++++++++++++++++++++++++ guessit/test/movies.yml | 11 ++++++ guessit/test/rules/source.yml | 8 ++++ 6 files changed, 85 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 3c7627f..d85017c 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -109,6 +109,7 @@ History - Added `Vorbis` as new `audio_codec` possible value. - Added `PCM` as new `audio_codec` possible value. - Added `LPCM` as new `audio_codec` possible value. +- Added `Digital Master` as new `source` possible value. 2.1.4 (2017-06-01) ------------------ diff --git a/docs/properties.rst b/docs/properties.rst index 0bc8c98..157623b 100644 --- a/docs/properties.rst +++ b/docs/properties.rst @@ -140,9 +140,9 @@ Video properties Source of the release - - ``Analogue HDTV``, ``Blu-ray``, ``Camera``, ``Digital TV``, ``DVD``, ``HD Camera``, ``HD Telecine``, - ``HD Telesync``, ``HD-DVD``, ``HDTV``, ``Pay-per-view``, ``Satellite``, ``Telecine``, ``Telesync``, ``TV``, - ``Ultra HD Blu-ray``, ``Ultra HDTV``, ``VHS``, ``Video on Demand``, ``Web``, ``Workprint`` + - ``Analogue HDTV``, ``Blu-ray``, ``Camera``, ``Digital Master``, ``Digital TV``, ``DVD``, ``HD Camera``, + ``HD Telecine``, ``HD Telesync``, ``HD-DVD``, ``HDTV``, ``Pay-per-view``, ``Satellite``, ``Telecine``, ``Telesync``, + ``TV``, ``Ultra HD Blu-ray``, ``Ultra HDTV``, ``VHS``, ``Video on Demand``, ``Web``, ``Workprint`` - **screen_size** diff --git a/guessit/rules/properties/source.py b/guessit/rules/properties/source.py index bafceec..15e6c39 100644 --- a/guessit/rules/properties/source.py +++ b/guessit/rules/properties/source.py @@ -67,6 +67,8 @@ def source(): value={'source': 'Digital TV', 'other': 'Rip'}) rebulk.regex(*build_source_pattern('DVD', suffix=rip_optional_suffix), value={'source': 'DVD', 'other': 'Rip'}) + rebulk.regex(*build_source_pattern('DM', suffix=rip_optional_suffix), + value={'source': 'Digital Master', 'other': 'Rip'}) rebulk.regex(*build_source_pattern('VIDEO-?TS', 'DVD-?R(?:$|(?!E))', # 'DVD-?R(?:$|^E)' => DVD-Real ... 'DVD-?9', 'DVD-?5'), value='DVD') diff --git a/guessit/test/episodes.yml b/guessit/test/episodes.yml index c041815..e1cd703 100644 --- a/guessit/test/episodes.yml +++ b/guessit/test/episodes.yml @@ -4420,3 +4420,63 @@ # release_group: OZM type: episode +? The.Prisoners.S01E03.1080p.DM.AAC2.0.x264-BTN +: title: The Prisoners + season: 1 + episode: 3 + screen_size: 1080p + source: Digital Master + audio_codec: AAC + audio_channels: '2.0' + video_codec: H.264 + release_group: BTN + type: episode + +? Panorama.S2013E25.Broken.by.Battle.1080p.DM.AAC2.0.x264-BTN +: title: Panorama + season: 2013 + episode: 25 + episode_title: Broken by Battle + screen_size: 1080p + source: Digital Master + audio_codec: AAC + audio_channels: '2.0' + video_codec: H.264 + release_group: BTN + type: episode + +? Our.World.S2014E11.Chinas.Model.Army.720p.DM.AAC2.0.x264-BTN +: title: Our World + season: 2014 + episode: 11 + episode_title: Chinas Model Army + screen_size: 720p + source: Digital Master + audio_codec: AAC + audio_channels: '2.0' + video_codec: H.264 + release_group: BTN + type: episode + +? Storyville.S2016E08.My.Nazi.Legacy.1080p.DM.x264-BTN +: title: Storyville + season: 2016 + episode: 8 + episode_title: My Nazi Legacy + screen_size: 1080p + source: Digital Master + video_codec: H.264 + release_group: BTN + type: episode + +? Comedians.in.Cars.Getting.Coffee.S07E01.1080p.DM.FLAC2.0.x264-NTb +: title: Comedians in Cars Getting Coffee + season: 7 + episode: 1 + screen_size: 1080p + source: Digital Master + audio_codec: FLAC + audio_channels: '2.0' + video_codec: H.264 + release_group: NTb + type: episode diff --git a/guessit/test/movies.yml b/guessit/test/movies.yml index 2b0f16e..dc27a71 100644 --- a/guessit/test/movies.yml +++ b/guessit/test/movies.yml @@ -1611,3 +1611,14 @@ release_group: Scarface45 container: avi type: movie + +? Tears.of.Steel.2012.2160p.DMRip.Eng.HDCLUB.mkv +: title: Tears of Steel + year: 2012 + screen_size: 2160p + source: Digital Master + other: Rip + language: english + release_group: HDCLUB + container: mkv + type: movie diff --git a/guessit/test/rules/source.yml b/guessit/test/rules/source.yml index 7ed7e3d..c0292eb 100644 --- a/guessit/test/rules/source.yml +++ b/guessit/test/rules/source.yml @@ -313,3 +313,11 @@ ? BDRip.[4K-2160p-UHD] : source: Ultra HD Blu-ray other: Rip + +? DM +: source: Digital Master + +? DMRIP +? DM-RIP +: source: Digital Master + other: Rip