moparisthebest
/
SickRage
mirror of https://github.com/moparisthebest/SickRage
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'origin/dev'

This commit is contained in:
echel0n 2014-04-21 19:34:29 -07:00
parent 896805ecb2 9ab143dde7
commit c4b79bcd63
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoProcessTV/mediaToSickbeard.py
View File

@ -7,6 +7,8 @@ import ConfigParser
import logging
#Needed for importing logging & requests module
from sickbeard.exceptions import ex
sickbeardPath = os.path.split(os.path.split(sys.argv[0])[0])[0]
sys.path.append(os.path.join( sickbeardPath, 'lib'))
sys.path.append(sickbeardPath)

7
sickbeard/databases/cache_db.py
View File

@ -68,8 +68,10 @@ class AddXemNumbering(AddNetworkTimezones):
def execute(self):
self.connection.action(
"CREATE TABLE xem_numbering (indexer TEXT, indexer_id INTEGER, season INTEGER, episode INTEGER, scene_season INTEGER, scene_episode INTEGER, PRIMARY KEY (indexer, indexer_id, season, episode))")
"CREATE TABLE xem_numbering (indexer TEXT, indexer_id INTEGER PRIMARY KEY, season INTEGER, episode INTEGER, scene_season INTEGER, scene_episode INTEGER)")
self.connection.action(
"CREATE UNIQUE INDEX idx_xem_numbering_indexer_id ON xem_numbering (indexer_id);")
class AddXemRefresh(AddXemNumbering):
def test(self):
@ -79,6 +81,9 @@ class AddXemRefresh(AddXemNumbering):
self.connection.action(
"CREATE TABLE xem_refresh (indexer TEXT, indexer_id INTEGER PRIMARY KEY, last_refreshed INTEGER)")
self.connection.action(
"CREATE INDEX idx_xem_refresh_indexer_id ON xem_refresh (indexer_id);")
class ConvertSceneExceptionsToIndexerID(AddXemRefresh):
def test(self):

2
sickbeard/providers/dtt.py
View File

@ -69,7 +69,7 @@ class DTTProvider(generic.TorrentProvider):
def _get_episode_search_strings(self, episode):
return self._get_season_search_strings(episode.show, episode.season)
def _doSearch(self, search_params, show=None):
def _doSearch(self, search_params, show=None, age=None):
# show_id = self._dtt_show_id(show.name)

2
sickbeard/providers/ezrss.py
View File

@ -101,7 +101,7 @@ class EZRSSProvider(generic.TorrentProvider):
return [params]
def _doSearch(self, search_params, show=None):
def _doSearch(self, search_params, show=None, age=None):
params = {"mode": "rss"}

3
sickbeard/webserve.py
View File

@ -82,8 +82,7 @@ from sickbeard import browser
class PageTemplate(Template):
def __init__(self, *args, **KWs):
KWs['file'] = os.path.join(sickbeard.PROG_DIR, "gui/" + sickbeard.GUI_NAME + "/interfaces/default/",
KWs['file'])
KWs['file'] = os.path.join(sickbeard.PROG_DIR, "gui/" + sickbeard.GUI_NAME + "/interfaces/default/",KWs['file'])
super(PageTemplate, self).__init__(*args, **KWs)
self.sbRoot = sickbeard.WEB_ROOT
self.sbHttpPort = sickbeard.WEB_PORT