From 9ab143dde7aeaa45ba109ecfbb7b548cc495c939 Mon Sep 17 00:00:00 2001 From: echel0n Date: Mon, 21 Apr 2014 19:33:48 -0700 Subject: [PATCH] Testing fix for unique index error on xem_numbering table in cache database --- autoProcessTV/mediaToSickbeard.py | 2 ++ sickbeard/databases/cache_db.py | 7 ++++++- sickbeard/webserve.py | 3 +-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/autoProcessTV/mediaToSickbeard.py b/autoProcessTV/mediaToSickbeard.py index d57e5f1a..e1ef6979 100644 --- a/autoProcessTV/mediaToSickbeard.py +++ b/autoProcessTV/mediaToSickbeard.py @@ -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) diff --git a/sickbeard/databases/cache_db.py b/sickbeard/databases/cache_db.py index b0938d9b..a952d7fb 100644 --- a/sickbeard/databases/cache_db.py +++ b/sickbeard/databases/cache_db.py @@ -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): diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 06d24fb7..cb7d46b4 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -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