From 88a3444db2b65ad3cc6f86a5a65c920a09a7ce2c Mon Sep 17 00:00:00 2001 From: nielsenj Date: Wed, 6 Aug 2014 21:45:38 -0700 Subject: [PATCH] Changes "no_season" regex to support XofX naming Previous version would allow for: Britannia The Great Elizabethan Journey - 1 of 3 (19th May 2012) [HDTV 720p (x264)] But disallow (because of no spaces around "of"): Britannia The Great Elizabethan Journey - 1of3 (19th May 2012) [HDTV 720p (x264)] Also previous extra_info changes from: of 3 (19th May 2012) [HDTV 720p (x264)] To: (19th May 2012) [HDTV 720p (x264)] --- sickbeard/name_parser/regexes.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sickbeard/name_parser/regexes.py b/sickbeard/name_parser/regexes.py index fdfae0a3..0efcc562 100644 --- a/sickbeard/name_parser/regexes.py +++ b/sickbeard/name_parser/regexes.py @@ -166,12 +166,13 @@ normal_regexes = [ # 01 - Ep Name # 01 - Ep Name ''' - ^((?P.+?)(?:[. _-]{2,}|[. _]))? # Show_Name and separator - (?P\d{1,2}) # 02 - (?:-(?P\d{1,2}))* # 02 - [. _-]+((?P.+?) # Source_Quality_Etc- - ((?[^- ]+([. _-]\[.*\])?))?)?$ # Group + ^((?P.+?)(?:[. _-]{2,}|[. _]))? # Show_Name and separator + (?P\d{1,3}) # 02 + (?:-(?P\d{1,3}))* # -03-04-05 etc + \s?of?\s?\d{1,3}? # of joiner (with or without spaces) and series total ep + [. _-]+((?P.+?) # Source_Quality_Etc- + ((?[^- ]+([. _-]\[.*\])?))?)?$ # Group ''' ), @@ -390,4 +391,4 @@ anime_regexes = [ (v(?P[0-9]))? # v2 .*? # Separator and EOL ''') -] \ No newline at end of file +]