mirror of
https://github.com/moparisthebest/SickRage
synced 2024-12-12 11:02:21 -05:00
Merge pull request #106 from joshjowen/indexerfix
Create an INDEXER_DEFAULT config variable and fix traktWatchListChecker.py
This commit is contained in:
echel0n
commit
f354839efd
@ -101,7 +101,20 @@
|
||||
<span class="component-desc">Include articles (The, A, An) when sorting show lists.</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="field-pair">
|
||||
<label class="nocheck clearfix" for="indexer_default">
|
||||
<span class="component-title">Default Indexer:</span>
|
||||
<span class="component-desc">
|
||||
<select id="indexer_default" name="indexer_default">
|
||||
#for $indexer in $sickbeard.indexerApi().indexers
|
||||
<option value="$indexer" #if $indexer == $sickbeard.INDEXER_DEFAULT then "selected=\"selected\"" else ""#>$sickbeard.indexerApi().indexers[$indexer]</option>
|
||||
#end for
|
||||
</select>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="field-pair">
|
||||
<label class="nocheck clearfix" for="log_dir">
|
||||
<span class="component-title">Logging Directory</span>
|
||||
|
||||
@ -146,6 +146,7 @@ QUALITY_DEFAULT = None
|
||||
STATUS_DEFAULT = None
|
||||
FLATTEN_FOLDERS_DEFAULT = None
|
||||
SUBTITLES_DEFAULT = None
|
||||
INDEXER_DEFAULT = None
|
||||
PROVIDER_ORDER = []
|
||||
|
||||
NAMING_MULTI_EP = None
|
||||
@ -472,7 +473,7 @@ def initialize(consoleLogging=True):
|
||||
NEWZNAB_DATA, NZBS, NZBS_UID, NZBS_HASH, EZRSS, TVTORRENTS, TVTORRENTS_DIGEST, TVTORRENTS_HASH, TVTORRENTS_OPTIONS, BTN, BTN_API_KEY, BTN_OPTIONS, \
|
||||
THEPIRATEBAY, THEPIRATEBAY_TRUSTED, THEPIRATEBAY_PROXY, THEPIRATEBAY_PROXY_URL, THEPIRATEBAY_BLACKLIST, THEPIRATEBAY_OPTIONS, TORRENTLEECH, TORRENTLEECH_USERNAME, TORRENTLEECH_PASSWORD, TORRENTLEECH_OPTIONS, \
|
||||
IPTORRENTS, IPTORRENTS_USERNAME, IPTORRENTS_PASSWORD, IPTORRENTS_FREELEECH, IPTORRENTS_OPTIONS, KAT, KAT_VERIFIED, KAT_OPTIONS, PUBLICHD, PUBLICHD_OPTIONS, SCC, SCC_USERNAME, SCC_PASSWORD, SCC_OPTIONS, HDTORRENTS, HDTORRENTS_USERNAME, HDTORRENTS_PASSWORD, HDTORRENTS_UID, HDTORRENTS_HASH, HDTORRENTS_OPTIONS, TORRENTDAY, TORRENTDAY_USERNAME, TORRENTDAY_PASSWORD, TORRENTDAY_UID, TORRENTDAY_HASH, TORRENTDAY_FREELEECH, TORRENTDAY_OPTIONS, \
|
||||
HDBITS, HDBITS_USERNAME, HDBITS_PASSKEY, HDBITS_OPTIONS, TORRENT_DIR, USENET_RETENTION, SOCKET_TIMEOUT, SEARCH_FREQUENCY, DEFAULT_SEARCH_FREQUENCY, BACKLOG_SEARCH_FREQUENCY, \
|
||||
HDBITS, HDBITS_USERNAME, HDBITS_PASSKEY, HDBITS_OPTIONS, TORRENT_DIR, USENET_RETENTION, SOCKET_TIMEOUT, SEARCH_FREQUENCY, DEFAULT_SEARCH_FREQUENCY, BACKLOG_SEARCH_FREQUENCY, INDEXER_DEFAULT, \
|
||||
NEXTGEN, NEXTGEN_USERNAME, NEXTGEN_PASSWORD, NEXTGEN_FREELEECH, NEXTGEN_OPTIONS, SPEEDCD, SPEEDCD_USERNAME, SPEEDCD_PASSWORD, SPEEDCD_FREELEECH,\
|
||||
QUALITY_DEFAULT, FLATTEN_FOLDERS_DEFAULT, SUBTITLES_DEFAULT, STATUS_DEFAULT, \
|
||||
GROWL_NOTIFY_ONSNATCH, GROWL_NOTIFY_ONDOWNLOAD, GROWL_NOTIFY_ONSUBTITLEDOWNLOAD, TWITTER_NOTIFY_ONSNATCH, TWITTER_NOTIFY_ONDOWNLOAD, TWITTER_NOTIFY_ONSUBTITLEDOWNLOAD, \
|
||||
@ -601,6 +602,7 @@ def initialize(consoleLogging=True):
|
||||
VERSION_NOTIFY = check_setting_int(CFG, 'General', 'version_notify', 1)
|
||||
AUTO_UPDATE = check_setting_int(CFG, 'General', 'auto_update', 1)
|
||||
FLATTEN_FOLDERS_DEFAULT = bool(check_setting_int(CFG, 'General', 'flatten_folders_default', 0))
|
||||
INDEXER_DEFAULT = check_setting_int(CFG, 'General', 'indexer_default', 1)
|
||||
|
||||
PROVIDER_ORDER = check_setting_str(CFG, 'General', 'provider_order', '').split()
|
||||
|
||||
@ -1317,6 +1319,7 @@ def save_config():
|
||||
new_config['General']['quality_default'] = int(QUALITY_DEFAULT)
|
||||
new_config['General']['status_default'] = int(STATUS_DEFAULT)
|
||||
new_config['General']['flatten_folders_default'] = int(FLATTEN_FOLDERS_DEFAULT)
|
||||
new_config['General']['indexer_default'] = int(INDEXER_DEFAULT)
|
||||
new_config['General']['provider_order'] = ' '.join(PROVIDER_ORDER)
|
||||
new_config['General']['version_notify'] = int(VERSION_NOTIFY)
|
||||
new_config['General']['auto_update'] = int(AUTO_UPDATE)
|
||||
|
||||
@ -51,18 +51,18 @@ class TraktChecker():
|
||||
return
|
||||
for show in watchlist:
|
||||
if int(sickbeard.TRAKT_METHOD_ADD) != 2:
|
||||
self.addDefaultShow(show["indexer_id"], show["title"], SKIPPED)
|
||||
self.addDefaultShow(show["tvdb_id"], show["title"], SKIPPED)
|
||||
else:
|
||||
self.addDefaultShow(show["indexer_id"], show["title"], WANTED)
|
||||
self.addDefaultShow(show["tvdb_id"], show["title"], WANTED)
|
||||
|
||||
if int(sickbeard.TRAKT_METHOD_ADD) == 1:
|
||||
newShow = helpers.findCertainShow(sickbeard.showList, int(show["indexer_id"]))
|
||||
newShow = helpers.findCertainShow(sickbeard.showList, int(show["tvdb_id"]))
|
||||
if newShow is not None:
|
||||
self.setEpisodeToWanted(newShow, 1, 1)
|
||||
self.startBacklog(newShow)
|
||||
else:
|
||||
self.todoWanted.append((int(show["indexer_id"]), 1, 1))
|
||||
self.todoWanted.append((int(show["indexer_id"]), -1, -1)) #used to pause new shows if the settings say to
|
||||
self.todoWanted.append((int(show["tvdb_id"]), 1, 1))
|
||||
self.todoWanted.append((int(show["tvdb_id"]), -1, -1)) #used to pause new shows if the settings say to
|
||||
|
||||
def updateEpisodes(self):
|
||||
"""
|
||||
@ -75,13 +75,13 @@ class TraktChecker():
|
||||
logger.log(u"Could not connect to trakt service, aborting watchlist update", logger.ERROR)
|
||||
return
|
||||
for show in watchlist:
|
||||
self.addDefaultShow(int(show["indexer_id"]), show["title"], SKIPPED)
|
||||
newShow = helpers.findCertainShow(sickbeard.showList, int(show["indexer_id"]))
|
||||
self.addDefaultShow(int(show["tvdb_id"]), show["title"], SKIPPED)
|
||||
newShow = helpers.findCertainShow(sickbeard.showList, int(show["tvdb_id"]))
|
||||
for episode in show["episodes"]:
|
||||
if newShow is not None:
|
||||
self.setEpisodeToWanted(newShow, episode["season"], episode["number"])
|
||||
else:
|
||||
self.todoWanted.append((int(show["indexer_id"]), episode["season"], episode["number"]))
|
||||
self.todoWanted.append((int(show["tvdb_id"]), episode["season"], episode["number"]))
|
||||
self.startBacklog(newShow)
|
||||
|
||||
def addDefaultShow(self, indexerid, name, status):
|
||||
@ -102,7 +102,7 @@ class TraktChecker():
|
||||
return
|
||||
else:
|
||||
helpers.chmodAsParent(showPath)
|
||||
sickbeard.showQueueScheduler.action.addShow(int(showObj.indexer), int(indexerid), showPath, status,
|
||||
sickbeard.showQueueScheduler.action.addShow(1, int(indexerid), showPath, status,
|
||||
int(sickbeard.QUALITY_DEFAULT),
|
||||
int(sickbeard.FLATTEN_FOLDERS_DEFAULT))
|
||||
|
||||
|
||||
@ -977,7 +977,7 @@ class ConfigGeneral:
|
||||
update_shows_on_start=None, update_frequency=None, launch_browser=None, web_username=None, use_api=None, api_key=None,
|
||||
web_password=None, version_notify=None, enable_https=None, https_cert=None, https_key=None,
|
||||
sort_article=None, auto_update=None, proxy_setting=None,
|
||||
anon_redirect=None, git_path=None, calendar_unprotected=None, date_preset=None, time_preset=None):
|
||||
anon_redirect=None, git_path=None, calendar_unprotected=None, date_preset=None, time_preset=None, indexer_default=None):
|
||||
|
||||
results = []
|
||||
|
||||
@ -1007,6 +1007,9 @@ class ConfigGeneral:
|
||||
if date_preset:
|
||||
sickbeard.DATE_PRESET = date_preset
|
||||
|
||||
if indexer_default:
|
||||
sickbeard.INDEXER_DEFAULT = indexer_default
|
||||
|
||||
if time_preset:
|
||||
sickbeard.TIME_PRESET_W_SECONDS = time_preset
|
||||
sickbeard.TIME_PRESET = sickbeard.TIME_PRESET_W_SECONDS.replace(u":%S", u"")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user