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

Fixed issues for unicode problems for encrypted passwords.

Browse Source
This commit is contained in:
echel0n 2014-05-17 07:57:47 -07:00
parent 12b8fc9990
commit be001c47ae
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sickbeard/__init__.py
View File

@ -1009,12 +1009,8 @@ def initialize(consoleLogging=True):
curTorrentProvider.username = check_setting_str(CFG, curTorrentProvider.getID().upper(),
curTorrentProvider.getID() + '_username', '')
if hasattr(curTorrentProvider, 'password'):
try:
curTorrentProvider.password = check_setting_str(CFG, curTorrentProvider.getID().upper(),
curTorrentProvider.getID() + '_password', '')
except:
curTorrentProvider.password = ''
curTorrentProvider.password = check_setting_str(CFG, curTorrentProvider.getID().upper(),
curTorrentProvider.getID() + '_password', '')
if hasattr(curTorrentProvider, 'proxy'):
curTorrentProvider.proxy.enabled = bool(check_setting_int(CFG, curTorrentProvider.getID().upper(),
curTorrentProvider.getID() + '_proxy', 0))

3
sickbeard/config.py
View File

@ -360,6 +360,7 @@ def check_setting_float(config, cfg_name, item_name, def_val):
def check_setting_str(config, cfg_name, item_name, def_val, log=True):
# For passwords you must include the word `password` in the item_name and add `helpers.encrypt(ITEM_NAME, ENCRYPTION_VERSION)` in save_config()
if bool(item_name.find('password') + 1):
log = False
encryption_version = sickbeard.ENCRYPTION_VERSION
else:
encryption_version = 0
@ -378,8 +379,8 @@ def check_setting_str(config, cfg_name, item_name, def_val, log=True):
logger.log(item_name + " -> " + my_val, logger.DEBUG)
else:
logger.log(item_name + " -> ******", logger.DEBUG)
return my_val
return my_val
class ConfigMigrator():
def __init__(self, config_obj):