monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-11 05:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/dev'

Browse source
This commit is contained in:
echel0n 2014-06-25 22:06:46 -07:00
commit 29e9ffdcb7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sickbeard/name_parser/regexes.py
View file

@ -167,7 +167,7 @@ normal_regexes = {'normal':[
# 01 - Ep Name # 01 - Ep Name
''' '''
^((?P<series_name>.+?)(?:[. _-]{2,}|[. _]))? # Show_Name and separator ^((?P<series_name>.+?)(?:[. _-]{2,}|[. _]))? # Show_Name and separator
(e)?(?P<ep_num>\d{1,2}) # 02 (?P<ep_num>\d{1,2}) # 02
(?:-(?P<extra_ep_num>\d{1,2}))* # 02 (?:-(?P<extra_ep_num>\d{1,2}))* # 02
[. _-]+((?P<extra_info>.+?) # Source_Quality_Etc- [. _-]+((?P<extra_info>.+?) # Source_Quality_Etc-
((?<![. _-])(?<!WEB) # Make sure this is really the release group ((?<![. _-])(?<!WEB) # Make sure this is really the release group
@ -179,8 +179,8 @@ normal_regexes = {'normal':[
# Show.Name.102.Source.Quality.Etc-Group # Show.Name.102.Source.Quality.Etc-Group
''' '''
^(?P<series_name>.+?)[. _-]+ # Show_Name and separator ^(?P<series_name>.+?)[. _-]+ # Show_Name and separator
(s)?(?P<season_num>\d{1,2}) # 1 (?P<season_num>\d{1,2}) # 1
(e)?(?P<ep_num>\d{2}) # 02 and separator (?P<ep_num>\d{2}) # 02 and separator
([. _-]+(?P<extra_info>(?!\d{3}[. _-]+)[^-]+) # Source_Quality_Etc- ([. _-]+(?P<extra_info>(?!\d{3}[. _-]+)[^-]+) # Source_Quality_Etc-
(-(?P<release_group>[^- ]+([. _-]\[.*\])?))?)?$ # Group (-(?P<release_group>[^- ]+([. _-]\[.*\])?))?)?$ # Group
'''), '''),