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

Merge branch 'origin/dev'

Browse Source
This commit is contained in:
echel0n 2014-06-05 17:54:47 -07:00
commit e4a4d285e8
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sickbeard/scene_numbering.py
View File

@ -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])

2
sickbeard/show_queue.py
View File

@ -109,7 +109,7 @@ class ShowQueue(generic_queue.GenericQueue):
logger.DEBUG)
return
queueItemObj = QueueItemRefresh(show)
queueItemObj = QueueItemRefresh(show, force=force)
self.add_item(queueItemObj)

3
sickbeard/webserve.py
View File

@ -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(