monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-07 10:33:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix release group not recognised from manually downloaded filename.

Browse source
This commit is contained in:
vergessen 2015-03-18 14:21:44 -05:00 committed by JackDandy
parent ad5721e12a
commit d0ccf9f27a
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -58,6 +58,7 @@
* Change the episodes downloaded stat to display e.g. 2843 / 2844 as 99.9% instead of rounding to 100% * Change the episodes downloaded stat to display e.g. 2843 / 2844 as 99.9% instead of rounding to 100%
* Change 'never' episode row color away from blue on Display Show page when indexer airdate is not defined * Change 'never' episode row color away from blue on Display Show page when indexer airdate is not defined
* Add tint to archived episode row colour to differentiate it from downloaded episodes on the Display Show page * Add tint to archived episode row colour to differentiate it from downloaded episodes on the Display Show page
* Fix release group not recognised from manually downloaded filename
[develop changelog] [develop changelog]
* Fix traceback error when using the menu item Manage/Update Kodi * Fix traceback error when using the menu item Manage/Update Kodi

5
sickbeard/name_parser/regexes.py
View file

@ -270,7 +270,8 @@ anime_regexes = [
# Bleach.s16e03-04.313-314 # Bleach.s16e03-04.313-314
# Bleach s16e03e04 313-314 # Bleach s16e03e04 313-314
''' '''
^(?P<series_name>.+?)[ ._-]+ # start of string and series name and non optinal separator ^(\[(?P<release_group>.+?)\][ ._-]*)?
(?P<series_name>.+?)[ ._-]+ # start of string and series name and non optinal separator
[sS](?P<season_num>\d+)[. _-]* # S01 and optional separator [sS](?P<season_num>\d+)[. _-]* # S01 and optional separator
[eE](?P<ep_num>\d+) # epipisode E02 [eE](?P<ep_num>\d+) # epipisode E02
(([. _-]*e|-) # linking e/- char (([. _-]*e|-) # linking e/- char
@ -374,4 +375,4 @@ anime_regexes = [
-(?P<release_group>[^- ]+))?)?$ # Group -(?P<release_group>[^- ]+))?)?$ # Group
''' '''
), ),
] ]

2
sickbeard/tv.py
View file

@ -436,7 +436,7 @@ class TVShow(object):
except (InvalidNameException, InvalidShowException): except (InvalidNameException, InvalidShowException):
pass pass
if not ' ' in ep_file_name and parse_result and parse_result.release_group: if ep_file_name and parse_result and None is not parse_result.release_group:
logger.log( logger.log(
u"Name " + ep_file_name + u" gave release group of " + parse_result.release_group + ", seems valid", u"Name " + ep_file_name + u" gave release group of " + parse_result.release_group + ", seems valid",
logger.DEBUG) logger.DEBUG)