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

Merge branch 'feature/FixEncryptedPws' into develop

Browse source
This commit is contained in:
JackDandy 2018-06-15 22:37:28 +01:00
commit dc90f815dc
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -24,6 +24,7 @@
[develop changelog]
* Fix issue when deleting files and "Send to trash for actions" is enabled
* Fix submitting a bulk change
* Fix issue with enabled encrpyted passwords and migrating the NZBGet default password fails

12
sickbeard/__init__.py
View file

@ -921,17 +921,17 @@ def initialize(console_logging=True):
# first check using official name case, then with case of legacy
# todo: migrate config, (just not atm due to testing map feature)
NZBGET_USERNAME = (check_setting_str(CFG, 'NZBGet', 'nzbget_username', None)
NZBGET_USERNAME = (check_setting_str(CFG, 'NZBGet', 'nzbget_username', '')
or check_setting_str(CFG, 'NZBget', 'nzbget_username', 'nzbget'))
NZBGET_PASSWORD = (check_setting_str(CFG, 'NZBGet', 'nzbget_password', None)
NZBGET_PASSWORD = (check_setting_str(CFG, 'NZBGet', 'nzbget_password', '')
or check_setting_str(CFG, 'NZBget', 'nzbget_password', 'tegbzn6789'))
NZBGET_CATEGORY = (check_setting_str(CFG, 'NZBGet', 'nzbget_category', None)
NZBGET_CATEGORY = (check_setting_str(CFG, 'NZBGet', 'nzbget_category', '')
or check_setting_str(CFG, 'NZBget', 'nzbget_category', 'tv'))
NZBGET_HOST = (check_setting_str(CFG, 'NZBGet', 'nzbget_host', None)
NZBGET_HOST = (check_setting_str(CFG, 'NZBGet', 'nzbget_host', '')
or check_setting_str(CFG, 'NZBget', 'nzbget_host', ''))
NZBGET_USE_HTTPS = (bool(check_setting_int(CFG, 'NZBGet', 'nzbget_use_https', None))
NZBGET_USE_HTTPS = (bool(check_setting_int(CFG, 'NZBGet', 'nzbget_use_https', 0))
or bool(check_setting_int(CFG, 'NZBget', 'nzbget_use_https', 0)))
NZBGET_PRIORITY = (check_setting_int(CFG, 'NZBGet', 'nzbget_priority', None)
NZBGET_PRIORITY = (check_setting_int(CFG, 'NZBGet', 'nzbget_priority', 0)
or check_setting_int(CFG, 'NZBget', 'nzbget_priority', 100))
NZBGET_MAP = check_setting_str(CFG, 'NZBGet', 'nzbget_map', '')