From 4c9da4f44807b32ef059bef91c16e55c13bcbd1d Mon Sep 17 00:00:00 2001 From: echel0n Date: Thu, 5 Jun 2014 17:53:34 -0700 Subject: [PATCH] Fix for custom scene numbering, now able to correct numbering or remove it. Fixed show force-update and mass update to properly force updates on the show including xem numbering. --- sickbeard/scene_numbering.py | 4 ++-- sickbeard/show_queue.py | 2 +- sickbeard/webserve.py | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sickbeard/scene_numbering.py b/sickbeard/scene_numbering.py index 648adf9f..fe5303ef 100644 --- a/sickbeard/scene_numbering.py +++ b/sickbeard/scene_numbering.py @@ -206,7 +206,7 @@ def set_scene_numbering(indexer_id, indexer, season=None, episode=None, absolute myDB = db.DBConnection() - if season and episode and sceneSeason and sceneEpisode: + if season and episode: myDB.action( "INSERT OR IGNORE INTO scene_numbering (indexer, indexer_id, season, episode) VALUES (?,?,?,?)", [indexer, indexer_id, season, episode]) @@ -214,7 +214,7 @@ def set_scene_numbering(indexer_id, indexer, season=None, episode=None, absolute myDB.action( "UPDATE scene_numbering SET scene_season = ?, scene_episode = ? WHERE indexer = ? and indexer_id = ? and season = ? and episode = ?", [sceneSeason, sceneEpisode, indexer, indexer_id, season, episode]) - elif absolute_number and sceneAbsolute: + elif absolute_number: myDB.action( "INSERT OR IGNORE INTO scene_numbering (indexer, indexer_id, absolute_number) VALUES (?,?,?)", [indexer, indexer_id, absolute_number]) diff --git a/sickbeard/show_queue.py b/sickbeard/show_queue.py index 46d9d32f..acc45af1 100644 --- a/sickbeard/show_queue.py +++ b/sickbeard/show_queue.py @@ -109,7 +109,7 @@ class ShowQueue(generic_queue.GenericQueue): logger.DEBUG) return - queueItemObj = QueueItemRefresh(show) + queueItemObj = QueueItemRefresh(show, force=force) self.add_item(queueItemObj) diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index d0ce650b..2149027e 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -2976,9 +2976,6 @@ class Home: showObj.exceptions = scene_exceptions.get_scene_exceptions(showObj.indexerid) - # Update scene numbering in DB - sickbeard.scene_numbering.xem_refresh(showObj.indexerid, showObj.indexer) - myDB = db.DBConnection() seasonResults = myDB.select(