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

Merge pull request #437 from guessit-io/feature/fix-disable-weak-episode-if-movie

Browse Source 
Disable weak episode if type is movie
This commit is contained in:
Rato
2017-04-24 07:31:32 +02:00
committed by GitHub
parent ad775aa93d ac0a66f37a
commit b4ed4b57e1
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
guessit/rules/properties/episodes.py
+8 -4
View File
@@ -231,14 +231,16 @@ def episodes():
formatter={'season': int, 'other': lambda match: 'Complete'})
# 12, 13
rebulk.chain(tags=['bonus-conflict', 'weak-movie', 'weak-episode'], formatter={'episode': int, 'version': int}) \
rebulk.chain(tags=['bonus-conflict', 'weak-movie', 'weak-episode'], formatter={'episode': int, 'version': int},
disabled=lambda context: context.get('type') == 'movie') \
.defaults(validator=None) \
.regex(r'(?P<episode>\d{2})') \
.regex(r'v(?P<version>\d+)').repeater('?') \
.regex(r'(?P<episodeSeparator>[x-])(?P<episode>\d{2})').repeater('*')
# 012, 013
rebulk.chain(tags=['bonus-conflict', 'weak-movie', 'weak-episode'], formatter={'episode': int, 'version': int}) \
rebulk.chain(tags=['bonus-conflict', 'weak-movie', 'weak-episode'], formatter={'episode': int, 'version': int},
disabled=lambda context: context.get('type') == 'movie') \
.defaults(validator=None) \
.regex(r'0(?P<episode>\d{1,2})') \
.regex(r'v(?P<version>\d+)').repeater('?') \
@@ -246,7 +248,8 @@ def episodes():
# 112, 113
rebulk.chain(tags=['bonus-conflict', 'weak-movie', 'weak-episode'], formatter={'episode': int, 'version': int},
disabled=lambda context: not context.get('episode_prefer_number', False)) \
disabled=lambda context: (not context.get('episode_prefer_number', False) or
context.get('type') == 'movie')) \
.defaults(validator=None) \
.regex(r'(?P<episode>\d{3,4})') \
.regex(r'v(?P<version>\d+)').repeater('?') \
@@ -287,7 +290,8 @@ def episodes():
rebulk.chain(tags=['bonus-conflict', 'weak-movie', 'weak-episode', 'weak-duplicate'],
formatter={'season': int, 'episode': int, 'version': int},
conflict_solver=lambda match, other: match if other.name == 'year' else '__default__',
disabled=lambda context: context.get('episode_prefer_number', False)) \
disabled=lambda context: (context.get('episode_prefer_number', False) or
context.get('type') == 'movie')) \
.defaults(validator=None) \
.regex(r'(?P<season>\d{1,2})(?P<episode>\d{2})') \
.regex(r'v(?P<version>\d+)').repeater('?') \
guessit/test/movies.yml
+15
View File
@@ -1082,3 +1082,18 @@
format: BluRay
screen_size: 1080p
type: movie
? 10 Cloverfield Lane.[Blu-Ray 1080p].[MULTI]
: options: --type movie
title: 10 Cloverfield Lane
format: BluRay
screen_size: 1080p
language: Multiple languages
type: movie
? 007.Spectre.[HDTC.MD].[TRUEFRENCH]
: options: --type movie
title: 007 Spectre
format: HDTC
language: French
type: movie