monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-11 05:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'origin/dev'

Browse source
This commit is contained in:
echel0n 2014-05-13 21:15:04 -07:00
commit 532644662c
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sickbeard/show_queue.py
View file

@ -144,9 +144,9 @@ class ShowQueue(generic_queue.GenericQueue):
return queueItemObj return queueItemObj
def addShow(self, indexer, indexer_id, showDir, default_status=None, quality=None, flatten_folders=None, def addShow(self, indexer, indexer_id, showDir, default_status=None, quality=None, flatten_folders=None,
subtitles=None, lang="en", refresh=False): subtitles=None, lang="en"):
queueItemObj = QueueItemAdd(indexer, indexer_id, showDir, default_status, quality, flatten_folders, lang, queueItemObj = QueueItemAdd(indexer, indexer_id, showDir, default_status, quality, flatten_folders, lang,
subtitles, refresh) subtitles)
self.add_item(queueItemObj) self.add_item(queueItemObj)
@ -203,8 +203,7 @@ class ShowQueueItem(generic_queue.QueueItem):
class QueueItemAdd(ShowQueueItem): class QueueItemAdd(ShowQueueItem):
def __init__(self, indexer, indexer_id, showDir, default_status, quality, flatten_folders, lang, subtitles, def __init__(self, indexer, indexer_id, showDir, default_status, quality, flatten_folders, lang, subtitles):
refresh):
self.indexer = indexer self.indexer = indexer
self.indexer_id = indexer_id self.indexer_id = indexer_id
@ -214,7 +213,6 @@ class QueueItemAdd(ShowQueueItem):
self.flatten_folders = flatten_folders self.flatten_folders = flatten_folders
self.lang = lang self.lang = lang
self.subtitles = subtitles self.subtitles = subtitles
self.refresh = refresh
self.show = None self.show = None
@ -380,7 +378,7 @@ class QueueItemAdd(ShowQueueItem):
logger.log(u"Launching backlog for this show since its episodes are WANTED") logger.log(u"Launching backlog for this show since its episodes are WANTED")
sickbeard.backlogSearchScheduler.action.searchBacklog([self.show]) #@UndefinedVariable sickbeard.backlogSearchScheduler.action.searchBacklog([self.show]) #@UndefinedVariable
self.show.writeMetadata(force=self.refresh) self.show.writeMetadata(force=True)
self.show.populateCache() self.show.populateCache()
self.show.flushEpisodes() self.show.flushEpisodes()
@ -410,7 +408,7 @@ class QueueItemRefresh(ShowQueueItem):
logger.log(u"Performing refresh on " + self.show.name) logger.log(u"Performing refresh on " + self.show.name)
self.show.refreshDir() self.show.refreshDir()
self.show.writeMetadata(force=True) self.show.writeMetadata()
self.show.populateCache() self.show.populateCache()
self.inProgress = False self.inProgress = False

2
sickbeard/webserve.py
View file

@ -2348,7 +2348,7 @@ class NewHomeAddShows:
sickbeard.STATUS_DEFAULT, sickbeard.STATUS_DEFAULT,
sickbeard.QUALITY_DEFAULT, sickbeard.QUALITY_DEFAULT,
sickbeard.FLATTEN_FOLDERS_DEFAULT, sickbeard.FLATTEN_FOLDERS_DEFAULT,
sickbeard.SUBTITLES_DEFAULT, refresh=True) sickbeard.SUBTITLES_DEFAULT)
num_added += 1 num_added += 1
if num_added: if num_added: