From 1a613e1e89ae16e858ad60b49a835ddef804456e Mon Sep 17 00:00:00 2001 From: Rato Date: Sat, 15 Jul 2017 23:44:20 +0200 Subject: [PATCH] #470: Added Upscaled as other property --- HISTORY.rst | 1 + docs/properties.rst | 4 ++-- guessit/rules/properties/other.py | 1 + guessit/test/movies.yml | 19 +++++++++++++++++++ guessit/test/rules/other.yml | 5 +++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index e50976e..cbd2845 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -85,6 +85,7 @@ History - Added `BT.2020` as new `other` possible value. - Added `12-bit` as new `color_depth` possible value. - Added `IMAX` as new `edition` possible value. +- Added `Upscaled` as new `other` possible value. 2.1.4 (2017-06-01) ------------------ diff --git a/docs/properties.rst b/docs/properties.rst index 57c1a91..06971ae 100644 --- a/docs/properties.rst +++ b/docs/properties.rst @@ -295,6 +295,6 @@ Other properties ``Line Dubbed``, ``Line Audio``, ``Mic Dubbed``, ``Micro HD``, ``Mux``, ``NTSC``, ``Open Matte``, ``Original Aspect Ratio``, ``Original Video``, ``PAL``, ``Preair``, ``Proper``, ``PS Vita``, ``Read NFO``, ``Region 5``, ``Region C``, ``Reencoded``, ``Remux``, ``Retail``, ``Rip``, ``Screener``, ``SECAM``, - ``Standard Dynamic Range``, ``Straight to Video``, ``Sync Fixed``, ``Trailer``, ``Ultra HD``, ``West Coast Feed``, - ``Widescreen``, ``XXX`` + ``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 71722b4..b2dd0c3 100644 --- a/guessit/rules/properties/other.py +++ b/guessit/rules/properties/other.py @@ -83,6 +83,7 @@ def other(): tags=['streaming_service.prefix', 'streaming_service.suffix']) rebulk.regex('Ultra-?(?:HD)?', 'UHD', value='Ultra HD', validator=None, tags=['streaming_service.prefix', 'streaming_service.suffix']) + rebulk.regex('Upscaled?', value='Upscaled') for value in ('Complete', 'Classic', 'Bonus', 'Trailer', 'Retail', 'Colorized', 'Internal'): diff --git a/guessit/test/movies.yml b/guessit/test/movies.yml index 43d7ab4..fe782bc 100644 --- a/guessit/test/movies.yml +++ b/guessit/test/movies.yml @@ -1304,3 +1304,22 @@ release_group: ETRG type: movie +? The.Martian.2015.4K.UHD.UPSCALED-ETRG +: title: The Martian + year: 2015 + screen_size: 2160p + other: [Ultra HD, Upscaled] + release_group: ETRG + type: movie + +? Delibal 2015 720p Upscale DVDRip x264 DD5.1 AC3 +: title: Delibal + year: 2015 + screen_size: 720p + other: [Upscaled, Rip] + source: DVD + video_codec: H.264 + audio_codec: Dolby Digital + audio_channels: '5.1' + type: movie + diff --git a/guessit/test/rules/other.yml b/guessit/test/rules/other.yml index 825100d..113b6d8 100644 --- a/guessit/test/rules/other.yml +++ b/guessit/test/rules/other.yml @@ -165,3 +165,8 @@ ? -BT.20200 ? -BT.2021 : other: BT.2020 + +? Upscaled +? Upscale +: other: Upscaled +