Merge pull request #691 from nielsenj/XofXEpNaming

Changes "no_season" regex to support XofX naming
This commit is contained in:
echel0n 2014-08-07 22:11:05 -07:00
commit 1710fe6362

View file

@ -166,12 +166,13 @@ normal_regexes = [
# 01 - Ep Name # 01 - Ep Name
# 01 - Ep Name # 01 - Ep Name
''' '''
^((?P<series_name>.+?)(?:[. _-]{2,}|[. _]))? # Show_Name and separator ^((?P<series_name>.+?)(?:[. _-]{2,}|[. _]))? # Show_Name and separator
(?P<ep_num>\d{1,2}) # 02 (?P<ep_num>\d{1,3}) # 02
(?:-(?P<extra_ep_num>\d{1,2}))* # 02 (?:-(?P<extra_ep_num>\d{1,3}))* # -03-04-05 etc
[. _-]+((?P<extra_info>.+?) # Source_Quality_Etc- \s?of?\s?\d{1,3}? # of joiner (with or without spaces) and series total ep
((?<![. _-])(?<!WEB) # Make sure this is really the release group [. _-]+((?P<extra_info>.+?) # Source_Quality_Etc-
-(?P<release_group>[^- ]+([. _-]\[.*\])?))?)?$ # Group ((?<![. _-])(?<!WEB) # Make sure this is really the release group
-(?P<release_group>[^- ]+([. _-]\[.*\])?))?)?$ # Group
''' '''
), ),
@ -390,4 +391,4 @@ anime_regexes = [
(v(?P<version>[0-9]))? # v2 (v(?P<version>[0-9]))? # v2
.*? # Separator and EOL .*? # Separator and EOL
''') ''')
] ]