diff --git a/HISTORY.rst b/HISTORY.rst index 78bbb95..dec6dc0 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -12,7 +12,7 @@ History - `source` property `VOD` is now `Video on Demand` - `source` property `WEBRip` is now `Web` with additional property `other`: `Rip` - `source` property `WEB-DL` is now `Web` -- `source` property `AHDTV` is now `Analogue HDTV` +- `source` property `AHDTV` is now `Analog HDTV` - `source` property `UHDTV` is now `Ultra HDTV` - `source` property `HDTC` is now `HD Telecine` - `screen_size` property `360i` was added. diff --git a/README.rst b/README.rst index a265979..049f007 100644 --- a/README.rst +++ b/README.rst @@ -51,9 +51,11 @@ Migration note GuessIt 2 has been rewriten from scratch. GuessIt is now a release name parser only, and support for additional features like hashes computations has been dropped. -To migrate from guessit ``0.x`` or ``1.x``, please read +To migrate from guessit ``0.x`` or ``1.x`` to ``guessit 2.x``, please read `migration.rst `_. +To migrate from guessit ``2.x`` to ``3.x``, please read `migration2to3.rst `_. + Install ------- diff --git a/docs/migration2to3.rst b/docs/migration2to3.rst index d372356..8c8d8f9 100644 --- a/docs/migration2to3.rst +++ b/docs/migration2to3.rst @@ -33,7 +33,7 @@ The following values were changed: - ``VOD`` is now ``Video on Demand`` - ``WEBRip`` is now ``Web`` with additional property ``other: Rip`` - ``WEB-DL`` is now ``Web`` -- ``AHDTV`` is now ``Analogue HDTV`` +- ``AHDTV`` is now ``Analog HDTV`` - ``UHDTV`` is now ``Ultra HDTV`` - ``HDTC`` is now ``HD Telecine`` diff --git a/docs/properties.rst b/docs/properties.rst index 0907372..69f0f1f 100644 --- a/docs/properties.rst +++ b/docs/properties.rst @@ -151,7 +151,7 @@ Video properties Source of the release - - ``Analogue HDTV``, ``Blu-ray``, ``Camera``, ``Digital Master``, ``Digital TV``, ``DVD``, ``HD Camera``, + - ``Analog 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`` diff --git a/guessit/rules/properties/source.py b/guessit/rules/properties/source.py index 2c295dc..ae9a7b0 100644 --- a/guessit/rules/properties/source.py +++ b/guessit/rules/properties/source.py @@ -107,7 +107,7 @@ def source(config): # pylint:disable=unused-argument rebulk.regex(*build_source_pattern('Ultra-?Blu-?ray', 'Blu-?ray-?Ultra'), value='Ultra HD Blu-ray') - rebulk.regex(*build_source_pattern('AHDTV'), value='Analogue HDTV') + rebulk.regex(*build_source_pattern('AHDTV'), value='Analog HDTV') rebulk.regex(*build_source_pattern('UHD-?TV', suffix=rip_optional_suffix), conflict_solver=demote_other, value={'source': 'Ultra HDTV', 'other': 'Rip'}) rebulk.regex(*build_source_pattern('UHD', suffix=rip_suffix), conflict_solver=demote_other, diff --git a/guessit/test/episodes.yml b/guessit/test/episodes.yml index de0d67a..97320c8 100644 --- a/guessit/test/episodes.yml +++ b/guessit/test/episodes.yml @@ -2057,7 +2057,7 @@ season: 4 episode: 6 language: fr - source: Analogue HDTV + source: Analog HDTV video_codec: Xvid type: episode diff --git a/guessit/test/rules/source.yml b/guessit/test/rules/source.yml index c0292eb..cda8f1a 100644 --- a/guessit/test/rules/source.yml +++ b/guessit/test/rules/source.yml @@ -251,7 +251,7 @@ -other: Rip ? +AHDTV -: source: Analogue HDTV +: source: Analog HDTV -other: Rip ? +dsr