diff --git a/HISTORY.rst b/HISTORY.rst index acf2967..5bdb7cd 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -12,6 +12,11 @@ History - Improve detection when release name in between brackets - Improve language detection - Fix wrong 3D detection +- Fix to keep separators for single characters. E.g.: S.W.A.T. +- Fix `Show Name/Season SS/Ep. EE - Title` +- Added `This is Us` to default expected titles +- Added `suggested_expected` to the api to support apps that uses guessit as a library +- Added `Extras` detection as `other` property 3.0.3 (2018-10-23) diff --git a/docs/properties.rst b/docs/properties.rst index 663cc66..23e90b8 100644 --- a/docs/properties.rst +++ b/docs/properties.rst @@ -337,11 +337,11 @@ Other properties Other property will appear under this property. - ``3D``, ``Audio Fixed``, ``Bonus``, ``BT.2020``, ``Classic``, ``Colorized``, ``Complete``, ``Converted``, - ``Documentary``, ``Dolby Vision``, ``Dual Audio``, ``East Coast Feed``, ``Fan Subtitled``, ``Fast Subtitled``, - ``Full HD``, ``Hardcoded Subtitles``, ``HD``, ``HDR10``, ``High Frame Rate``, ``High Quality``, ``High Resolution``, - ``Internal``, ``Line Dubbed``, ``Line Audio``, ``Mic Dubbed``, ``Micro HD``, ``Mux``, ``NTSC``, ``Obfuscated``, - ``Open Matte``, ``Original Aspect Ratio``, ``Original Video``, ``PAL``, ``Preair``, ``Proof``, ``Proper``, - ``PS Vita``, ``Read NFO``, ``Region 5``, ``Region C``, ``Reencoded``, ``Remux``, ``Repost``, ``Retail``, ``Rip``, - ``Sample``, ``Screener``, ``SECAM``, ``Standard Dynamic Range``, ``Straight to Video``, ``Sync Fixed``, ``Trailer``, - ``Ultra HD``, ``Upscaled``, ``West Coast Feed``, ``Widescreen``, ``XXX`` + ``Documentary``, ``Dolby Vision``, ``Dual Audio``, ``East Coast Feed``, ``Extras``, ``Fan Subtitled``, + ``Fast Subtitled``, ``Full HD``, ``Hardcoded Subtitles``, ``HD``, ``HDR10``, ``High Frame Rate``, ``High Quality``, + ``High Resolution``, ``Internal``, ``Line Dubbed``, ``Line Audio``, ``Mic Dubbed``, ``Micro HD``, ``Mux``, ``NTSC``, + ``Obfuscated``, ``Open Matte``, ``Original Aspect Ratio``, ``Original Video``, ``PAL``, ``Preair``, ``Proof``, + ``Proper``, ``PS Vita``, ``Read NFO``, ``Region 5``, ``Region C``, ``Reencoded``, ``Remux``, ``Repost``, ``Retail``, + ``Rip``, ``Sample``, ``Screener``, ``SECAM``, ``Standard Dynamic Range``, ``Straight to Video``, ``Sync Fixed``, + ``Trailer``, ``Ultra HD``, ``Upscaled``, ``West Coast Feed``, ``Widescreen``, ``XXX`` diff --git a/guessit/rules/properties/other.py b/guessit/rules/properties/other.py index 2d9cd5b..34f4715 100644 --- a/guessit/rules/properties/other.py +++ b/guessit/rules/properties/other.py @@ -134,6 +134,8 @@ def other(config): # pylint:disable=unused-argument,too-many-statements rebulk.regex('BT-?2020', value='BT.2020', tags='uhdbluray-neighbor') rebulk.string('Sample', value='Sample', tags=['at-end', 'not-a-release-group']) + rebulk.string('Extras', value='Extras', tags='has-neighbor') + rebulk.regex('Digital-?Extras?', value='Extras') rebulk.string('Proof', value='Proof', tags=['at-end', 'not-a-release-group']) rebulk.string('Obfuscated', 'Scrambled', value='Obfuscated', tags=['at-end', 'not-a-release-group']) rebulk.string('xpost', 'postbot', 'asrequested', value='Repost', tags='not-a-release-group') diff --git a/guessit/test/episodes.yml b/guessit/test/episodes.yml index fb8c817..fcb9f6a 100644 --- a/guessit/test/episodes.yml +++ b/guessit/test/episodes.yml @@ -4635,3 +4635,22 @@ container: mkv type: episode +? Videos/Office1080/The Office (US) (2005) Season 2 S02 + Extras (1080p AMZN WEB-DL x265 HEVC 10bit AAC 2.0 LION)/The Office (US) (2005) - S02E12 - The Injury (1080p AMZN WEB-DL x265 LION).mkv +: title: The Office + country: US + year: 2005 + season: 2 + other: Extras + screen_size: 1080p + streaming_service: Amazon Prime + source: Web + video_codec: H.265 + video_profile: High Efficiency Video Coding + color_depth: 10-bit + audio_codec: AAC + audio_channels: '2.0' + release_group: LION + episode: 12 + episode_title: The Injury + container: mkv + type: episode diff --git a/guessit/test/movies.yml b/guessit/test/movies.yml index 0f20034..a534ca0 100644 --- a/guessit/test/movies.yml +++ b/guessit/test/movies.yml @@ -1725,7 +1725,7 @@ ? Ant-Man.and.the.Wasp.2018.Digital.Extras.1080p.AMZN.WEB-DL.DDP5.1.H.264-NTG.mkv : title: Ant-Man and the Wasp year: 2018 - alternative_title: Digital Extras + other: Extras screen_size: 1080p streaming_service: Amazon Prime source: Web