From a683c7461dcbcf16d055b40ba00ab9a487b6025f Mon Sep 17 00:00:00 2001 From: sagilo <sagilo@gmail.com> Date: Mon, 29 May 2017 23:43:38 +0300 Subject: [PATCH] Add username & pass to subscenter (#3813) --- gui/slick/views/config_subtitles.mako | 3 ++- sickbeard/__init__.py | 9 ++++++++- sickbeard/subtitles.py | 4 ++++ sickbeard/webserve.py | 4 +++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/gui/slick/views/config_subtitles.mako b/gui/slick/views/config_subtitles.mako index 948283bab..81d43eb1d 100644 --- a/gui/slick/views/config_subtitles.mako +++ b/gui/slick/views/config_subtitles.mako @@ -328,7 +328,8 @@ 'legendastv': {'user': sickbeard.LEGENDASTV_USER, 'pass': sickbeard.LEGENDASTV_PASS}, 'addic7ed': {'user': sickbeard.ADDIC7ED_USER, 'pass': sickbeard.ADDIC7ED_PASS}, 'itasa': {'user': sickbeard.ITASA_USER, 'pass': sickbeard.ITASA_PASS}, - 'opensubtitles': {'user': sickbeard.OPENSUBTITLES_USER, 'pass': sickbeard.OPENSUBTITLES_PASS} + 'opensubtitles': {'user': sickbeard.OPENSUBTITLES_USER, 'pass': sickbeard.OPENSUBTITLES_PASS}, + 'subscenter': {'user': sickbeard.SUBSCENTER_USER, 'pass': sickbeard.SUBSCENTER_PASS} } %> % for curService in sickbeard.subtitles.sorted_service_list(): diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index 4eb549caf..171f68f8e 100644 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -622,6 +622,7 @@ ADDIC7ED_USER = ADDIC7ED_PASS = None OPENSUBTITLES_USER = OPENSUBTITLES_PASS = None LEGENDASTV_USER = LEGENDASTV_PASS = None ITASA_USER = ITASA_PASS = None +SUBSCENTER_USER = SUBSCENTER_PASS = None USE_FAILED_DOWNLOADS = False DELETE_FAILED = False @@ -710,7 +711,7 @@ def initialize(consoleLogging=True): # pylint: disable=too-many-locals, too-man POSTER_SORTBY, POSTER_SORTDIR, HISTORY_LIMIT, CREATE_MISSING_SHOW_DIRS, ADD_SHOWS_WO_DIR, USE_FREE_SPACE_CHECK, \ METADATA_WDTV, METADATA_TIVO, METADATA_MEDE8ER, IGNORE_WORDS, TRACKERS_LIST, IGNORED_SUBS_LIST, REQUIRE_WORDS, CALENDAR_UNPROTECTED, CALENDAR_ICONS, NO_RESTART, \ USE_SUBTITLES, SUBTITLES_INCLUDE_SPECIALS, SUBTITLES_LANGUAGES, SUBTITLES_DIR, SUBTITLES_SERVICES_LIST, SUBTITLES_SERVICES_ENABLED, SUBTITLES_HISTORY, SUBTITLES_FINDER_FREQUENCY, SUBTITLES_MULTI, SUBTITLES_KEEP_ONLY_WANTED, EMBEDDED_SUBTITLES_ALL, SUBTITLES_EXTRA_SCRIPTS, SUBTITLES_PERFECT_MATCH, subtitlesFinderScheduler, \ - SUBTITLES_HEARING_IMPAIRED, ADDIC7ED_USER, ADDIC7ED_PASS, ITASA_USER, ITASA_PASS, LEGENDASTV_USER, LEGENDASTV_PASS, OPENSUBTITLES_USER, OPENSUBTITLES_PASS, \ + SUBTITLES_HEARING_IMPAIRED, ADDIC7ED_USER, ADDIC7ED_PASS, ITASA_USER, ITASA_PASS, LEGENDASTV_USER, LEGENDASTV_PASS, OPENSUBTITLES_USER, OPENSUBTITLES_PASS, SUBSCENTER_USER, SUBSCENTER_PASS, \ USE_FAILED_DOWNLOADS, DELETE_FAILED, ANON_REDIRECT, LOCALHOST_IP, DEBUG, DBDEBUG, DEFAULT_PAGE, PROXY_SETTING, PROXY_INDEXERS, \ AUTOPOSTPROCESSOR_FREQUENCY, SHOWUPDATE_HOUR, \ ANIME_DEFAULT, NAMING_ANIME, ANIMESUPPORT, USE_ANIDB, ANIDB_USERNAME, ANIDB_PASSWORD, ANIDB_USE_MYLIST, \ @@ -1329,6 +1330,9 @@ def initialize(consoleLogging=True): # pylint: disable=too-many-locals, too-man OPENSUBTITLES_USER = check_setting_str(CFG, 'Subtitles', 'opensubtitles_username', censor_log=True) OPENSUBTITLES_PASS = check_setting_str(CFG, 'Subtitles', 'opensubtitles_password', censor_log=True) + SUBSCENTER_USER = check_setting_str(CFG, 'Subtitles', 'subscenter_username', censor_log=True) + SUBSCENTER_PASS = check_setting_str(CFG, 'Subtitles', 'subscenter_password', censor_log=True) + USE_FAILED_DOWNLOADS = check_setting_bool(CFG, 'FailedDownloads', 'use_failed_downloads') DELETE_FAILED = check_setting_bool(CFG, 'FailedDownloads', 'delete_failed') @@ -2378,6 +2382,9 @@ def save_config(): # pylint: disable=too-many-statements, too-many-branches 'opensubtitles_username': OPENSUBTITLES_USER, 'opensubtitles_password': helpers.encrypt(OPENSUBTITLES_PASS, ENCRYPTION_VERSION), + + 'subscenter_username': SUBSCENTER_USER, + 'subscenter_password': helpers.encrypt(SUBSCENTER_PASS, ENCRYPTION_VERSION), }, 'FailedDownloads': { diff --git a/sickbeard/subtitles.py b/sickbeard/subtitles.py index d0a5cfac7..45d5a0bc2 100644 --- a/sickbeard/subtitles.py +++ b/sickbeard/subtitles.py @@ -89,6 +89,10 @@ class SubtitleProviderPool(object): # pylint: disable=too-few-public-methods 'opensubtitles': { 'username': sickbeard.OPENSUBTITLES_USER, 'password': sickbeard.OPENSUBTITLES_PASS + }, + 'subscenter': { + 'username': sickbeard.SUBSCENTER_USER, + 'password': sickbeard.SUBSCENTER_PASS } } diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 78ce939e1..a986b64a7 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -5195,7 +5195,7 @@ class ConfigSubtitles(Config): service_order=None, subtitles_history=None, subtitles_finder_frequency=None, subtitles_multi=None, embedded_subtitles_all=None, subtitles_extra_scripts=None, subtitles_hearing_impaired=None, addic7ed_user=None, addic7ed_pass=None, itasa_user=None, itasa_pass=None, legendastv_user=None, legendastv_pass=None, - opensubtitles_user=None, opensubtitles_pass=None, subtitles_download_in_pp=None, subtitles_keep_only_wanted=None): + opensubtitles_user=None, opensubtitles_pass=None, subscenter_user=None, subscenter_pass=None, subtitles_download_in_pp=None, subtitles_keep_only_wanted=None): config.change_subtitle_finder_frequency(subtitles_finder_frequency) config.change_use_subtitles(use_subtitles) @@ -5232,6 +5232,8 @@ class ConfigSubtitles(Config): sickbeard.LEGENDASTV_PASS = legendastv_pass or '' sickbeard.OPENSUBTITLES_USER = opensubtitles_user or '' sickbeard.OPENSUBTITLES_PASS = opensubtitles_pass or '' + sickbeard.SUBSCENTER_USER = subscenter_user or '' + sickbeard.SUBSCENTER_PASS = subscenter_pass or '' sickbeard.save_config() # Reset provider pool so next time we use the newest settings -- GitLab