zoriya/guessit
1
0
Fork 0
mirror of https://github.com/zoriya/guessit.git synced 2026-06-06 20:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(other): add restored support and match 4k-* patterns

Browse Source
This commit is contained in:
Rémi Alvergnat
2021-11-04 22:29:27 +01:00
parent 0cf07f4755
commit 99c30eb387
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
guessit/config/options.json
+8 -1
View File
@@ -240,7 +240,14 @@
"Director's Cut": {"string": ["DC"], "regex": ["director'?s?-cut", "director'?s?-cut-edition", "edition-director'?s?-cut"]},
"Extended": {"string": ["extended"], "regex": ["extended-?cut", "extended-?version"], "tags": ["has-neighbor", "release-group-prefix"]},
"Alternative Cut": {"regex": ["alternat(e|ive)(?:-?Cut)?"], "tags": ["has-neighbor", "release-group-prefix"]},
"Remastered": {"string": "Remastered", "tags": ["has-neighbor", "release-group-prefix"]},
"Remastered": [
{"string": "Remastered", "tags": ["has-neighbor", "release-group-prefix"]},
{"regex": "4k-remaster(?:ed)?", "tags": ["release-group-prefix"]}
],
"Restored": [
{"string": "Restored", "tags": ["has-neighbor", "release-group-prefix"]},
{"regex": "4k-restore(?:d)?", "tags": ["release-group-prefix"]}
],
"Uncensored": {"string": "Uncensored", "tags": ["has-neighbor", "release-group-prefix"]},
"Uncut": {"string": "Uncut", "tags": ["has-neighbor", "release-group-prefix"]},
"Unrated": {"string": "Unrated", "tags": ["has-neighbor", "release-group-prefix"]},
guessit/rules/properties/screen_size.py
+2 -1
View File
@@ -45,7 +45,8 @@ def screen_size(config):
rebulk.regex(res_pattern + progressive_pattern + r'(?P<scan_type>p)' + frame_rate_pattern + '?')
rebulk.regex(res_pattern + progressive_pattern + r'(?P<scan_type>p)?(?:hd)')
rebulk.regex(res_pattern + progressive_pattern + r'(?P<scan_type>p)?x?')
rebulk.string('4k', value='2160p')
rebulk.string('4k', value='2160p',
conflict_solver=lambda match, other: '__default__' if other.name == 'screen_size' else match)
rebulk.regex(r'(?P<width>\d{3,4})-?(?:x|\*)-?(?P<height>\d{3,4})',
conflict_solver=lambda match, other: '__default__' if other.name == 'screen_size' else other)
guessit/test/movies.yml
+16
View File
@@ -1348,6 +1348,22 @@
release_group: ETRG
type: movie
? Heathers.1988.1080p.BluRay.ARROW.4K.RESTORED.Plus.Comm.DTS.x264-MaG
: title: Heathers
edition: Restored
year: 1988
screen_size: 1080p
release_group: MaG
type: movie
? The.Woman.2011.1080p.BluRay.4K.REMASTERED.Remux.AVC.DTS-HD.MA.5.1-PTP.mkv
: title: The Woman
edition: Remastered
year: 2011
screen_size: 1080p
release_group: PTP
type: movie
? Delibal 2015 720p Upscale DVDRip x264 DD5.1 AC3
: title: Delibal
year: 2015