moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-13 11:32:20 -05:00
Code Issues Releases Wiki Activity

Fixed nextaired not found issues and fixed kat provider issues.

Browse Source
This commit is contained in:
echel0n 2014-07-09 09:01:12 -07:00
parent f925488373
commit e891e9d637
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SickBeard.py
View File

@ -66,6 +66,7 @@ from sickbeard.webserveInit import SRWebServer
from sickbeard.version import SICKBEARD_VERSION from sickbeard.version import SICKBEARD_VERSION
from sickbeard.databases.mainDB import MIN_DB_VERSION from sickbeard.databases.mainDB import MIN_DB_VERSION
from sickbeard.databases.mainDB import MAX_DB_VERSION from sickbeard.databases.mainDB import MAX_DB_VERSION
from sickbeard import exceptions
from lib.configobj import ConfigObj from lib.configobj import ConfigObj
@ -259,6 +260,9 @@ class SickRage(object):
# Get PID # Get PID
sickbeard.PID = os.getpid() sickbeard.PID = os.getpid()
# Build from the DB to start with
self.loadShowsFromDB()
if self.forcedPort: if self.forcedPort:
logger.log(u"Forcing web server to port " + str(self.forcedPort)) logger.log(u"Forcing web server to port " + str(self.forcedPort))
self.startPort = self.forcedPort self.startPort = self.forcedPort
@ -310,9 +314,6 @@ class SickRage(object):
if self.consoleLogging: if self.consoleLogging:
print "Starting up SickRage " + SICKBEARD_VERSION + " from " + sickbeard.CONFIG_FILE print "Starting up SickRage " + SICKBEARD_VERSION + " from " + sickbeard.CONFIG_FILE
# Build from the DB to start with
self.loadShowsFromDB()
# Fire up all our threads # Fire up all our threads
sickbeard.start() sickbeard.start()
@ -420,7 +421,6 @@ class SickRage(object):
logger.log( logger.log(
u"There was an error creating the show in " + sqlShow["location"] + ": " + str(e).decode('utf-8'), u"There was an error creating the show in " + sqlShow["location"] + ": " + str(e).decode('utf-8'),
logger.ERROR) logger.ERROR)
logger.log(traceback.format_exc(), logger.DEBUG)
def restore(self, srcDir, dstDir): def restore(self, srcDir, dstDir):
try: try:

2
sickbeard/providers/kat.py
View File

@ -64,7 +64,7 @@ class KATProvider(generic.TorrentProvider):
self.cache = KATCache(self) self.cache = KATCache(self)
self.urls = ['http://kickass.to/', 'http://katproxy.com'] self.urls = ['http://kickass.to/', 'http://katproxy.com/']
def isEnabled(self): def isEnabled(self):
return self.enabled return self.enabled

4
sickbeard/tv.py
View File

@ -96,7 +96,7 @@ class TVShow(object):
self.lock = threading.Lock() self.lock = threading.Lock()
self.isDirGood = False self.isDirGood = False
self.episodes = {} self.episodes = {}
self.nextaired = None self.nextaired = ""
otherShow = helpers.findCertainShow(sickbeard.showList, self.indexerid) otherShow = helpers.findCertainShow(sickbeard.showList, self.indexerid)
if otherShow != None: if otherShow != None:
@ -988,7 +988,7 @@ class TVShow(object):
if sqlResults == None or len(sqlResults) == 0: if sqlResults == None or len(sqlResults) == 0:
logger.log(str(self.indexerid) + u": No episode found... need to implement a show status", logger.log(str(self.indexerid) + u": No episode found... need to implement a show status",
logger.DEBUG) logger.DEBUG)
self.nextaired = None self.nextaired = ""
else: else:
logger.log(str(self.indexerid) + u": Found episode " + str(sqlResults[0]["season"]) + "x" + str( logger.log(str(self.indexerid) + u": Found episode " + str(sqlResults[0]["season"]) + "x" + str(
sqlResults[0]["episode"]), logger.DEBUG) sqlResults[0]["episode"]), logger.DEBUG)