From 2c37523ab7a88d719fba0a4c0ad4b7630f0f401e Mon Sep 17 00:00:00 2001 From: echel0n Date: Fri, 30 May 2014 07:36:06 -0700 Subject: [PATCH] Fix for manual anime searches --- sickbeard/webserve.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 8508a6a6..839f6f5f 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -168,17 +168,14 @@ def _getEpisode(show, season=None, episode=None, absolute=None): showObj = sickbeard.helpers.findCertainShow(sickbeard.showList, int(show)) if showObj is None: - return "Show not in show list" + return "Invalid show paramaters" - if showObj.is_anime and not absolute is None: - return "Invalid absolute number parameters" - elif season is None or episode is None: - return "Invalid season or episode number parameters" - - if showObj.is_anime: - epObj = showObj.getEpisode(absolute_number=int(absolute)) - else: + if absolute: + epObj = showObj.getEpisode(absolute=int(absolute)) + elif season and episode: epObj = showObj.getEpisode(int(season), int(episode)) + else: + return "Invalid paramaters" if epObj is None: return "Episode couldn't be retrieved"