monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-11 21:53: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-24 17:42:44 -07:00
commit 32e90d70d2
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sickbeard/helpers.py
View file

@ -702,7 +702,7 @@ def get_absolute_number_from_season_and_episode(show, season, episode):
def get_all_episodes_from_absolute_number(show, indexer_id, absolute_numbers): def get_all_episodes_from_absolute_number(show, indexer_id, absolute_numbers):
if len(absolute_numbers) == 0: if len(absolute_numbers) == 0:
raise EpisodeNotFoundByAbsoluteNumberException() raise EpisodeNotFoundByAbsoluteNumberException
episodes = [] episodes = []
season = None season = None
@ -718,7 +718,7 @@ def get_all_episodes_from_absolute_number(show, indexer_id, absolute_numbers):
if ep: if ep:
episodes.append(ep.episode) episodes.append(ep.episode)
else: else:
raise EpisodeNotFoundByAbsoluteNumberException() raise EpisodeNotFoundByAbsoluteNumberException
season = ep.season # this will always take the last found seson so eps that cross the season border are not handeled well season = ep.season # this will always take the last found seson so eps that cross the season border are not handeled well
return (season, episodes) return (season, episodes)

5
sickbeard/name_parser/parser.py
View file

@ -15,10 +15,8 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SickRage. If not, see <http://www.gnu.org/licenses/>. # along with SickRage. If not, see <http://www.gnu.org/licenses/>.
from collections import OrderedDict
import re import re
import time
import datetime import datetime
import os.path import os.path
import threading import threading
@ -27,7 +25,6 @@ import sickbeard
from sickbeard import logger, helpers, scene_numbering, common from sickbeard import logger, helpers, scene_numbering, common
from dateutil import parser from dateutil import parser
from sickbeard.common import cpu_presets
nameparser_lock = threading.Lock() nameparser_lock = threading.Lock()
@ -140,7 +137,7 @@ class NameParser(object):
elif self.showObj and not self.showObj.is_anime and not self.showObj.is_sports: elif self.showObj and not self.showObj.is_anime and not self.showObj.is_sports:
regexMode = self.NORMAL_REGEX regexMode = self.NORMAL_REGEX
self.compiled_regexes = OrderedDict() self.compiled_regexes = {}
self._compile_regexes(regexMode) self._compile_regexes(regexMode)
matches = [] matches = []