gryf/tuir
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for parsing [rtv] config sections, bug #13

Browse Source
This commit is contained in:
John Helmert
2019-09-02 16:52:40 -05:00
parent 55dd37a532
commit 0238501e2b
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tuir/config.py
View File

@@ -135,32 +135,42 @@ class Config(object):
@staticmethod @staticmethod
def _parse_tuir_file(config): def _parse_tuir_file(config):
tuir = {} tuir = {}
section = ''
if config.has_section('tuir'): if config.has_section('tuir'):
tuir = dict(config.items('tuir')) tuir = dict(config.items('tuir'))
section = 'tuir'
elif config.has_section('rtv'):
# Backwards compatibility for rtv configs, bug #13
tuir = dict(config.items('rtv'))
section = 'rtv'
# convert non-string params to their typed representation # convert non-string params to their typed representation
params = { params = {
'ascii': partial(config.getboolean, 'tuir'), 'ascii': partial(config.getboolean, section),
'monochrome': partial(config.getboolean, 'tuir'), 'monochrome': partial(config.getboolean, section),
'persistent': partial(config.getboolean, 'tuir'), 'persistent': partial(config.getboolean, section),
'autologin': partial(config.getboolean, 'tuir'), 'autologin': partial(config.getboolean, section),
'clear_auth': partial(config.getboolean, 'tuir'), 'clear_auth': partial(config.getboolean, section),
'enable_media': partial(config.getboolean, 'tuir'), 'enable_media': partial(config.getboolean, section),
'history_size': partial(config.getint, 'tuir'), 'history_size': partial(config.getint, section),
'oauth_redirect_port': partial(config.getint, 'tuir'), 'oauth_redirect_port': partial(config.getint, section),
'oauth_scope': lambda x: tuir[x].split(','), 'oauth_scope': lambda x: tuir[x].split(','),
'max_comment_cols': partial(config.getint, 'tuir'), 'max_comment_cols': partial(config.getint, section),
'max_pager_cols': partial(config.getint, 'tuir'), 'max_pager_cols': partial(config.getint, section),
'hide_username': partial(config.getboolean, 'tuir'), 'hide_username': partial(config.getboolean, section),
'flash': partial(config.getboolean, 'tuir'), 'flash': partial(config.getboolean, section),
'force_new_browser_window': partial(config.getboolean, 'tuir') 'force_new_browser_window': partial(config.getboolean, section)
} }
for key, func in params.items(): for key, func in params.items():
if key in tuir: if key in tuir:
tuir[key] = func(key) try:
tuir[key] = func(key)
except:
import pdb; pdb.set_trace()
raise
bindings = {} bindings = {}
if config.has_section('bindings'): if config.has_section('bindings'):