Claytonia/TeamspeakStats
Claytonia
/
TeamspeakStats
mirror of https://github.com/Thor77/TeamspeakStats.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove debug and debugfile from config; add them as cmdline-args

This commit is contained in:
Thor77 2015-08-26 19:58:17 +02:00
parent 2699d72b52
commit db82869c1b
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test_config.py
View File

@ -36,8 +36,6 @@ def test_config():
'outputfile': 'output.html', 'outputfile': 'output.html',
'debug': 'true' 'debug': 'true'
}) })
log_path, output_path, debug, debug_file = parse_config(configpath) log_path, output_path = parse_config(configpath)
assert log_path == gen_abspath('tests/res/test.log') assert log_path == gen_abspath('tests/res/test.log')
assert output_path == gen_abspath('output.html') assert output_path == gen_abspath('output.html')
assert debug
assert not debug_file

20
tsstats.py
View File

@ -250,13 +250,11 @@ def parse_config(config_path):
general = config['General'] general = config['General']
log_path = gen_abspath(general['logfile']) log_path = gen_abspath(general['logfile'])
output_path = gen_abspath(general['outputfile']) output_path = gen_abspath(general['outputfile'])
debug = general.get('debug', 'false') in ['true', 'True'] return log_path, output_path
debug_file = general.get('debugfile', 'false') in ['true', 'True']
debug_file = debug_file and debug
return log_path, output_path, debug, debug_file
def main(config_path='config.ini', id_map_path='id_map.json'): def main(config_path='config.ini', id_map_path='id_map.json',
debug=False, debugfile=False):
# check cmdline-args # check cmdline-args
config_path = gen_abspath(config_path) config_path = gen_abspath(config_path)
id_map_path = gen_abspath(id_map_path) id_map_path = gen_abspath(id_map_path)
@ -270,8 +268,8 @@ def main(config_path='config.ini', id_map_path='id_map.json'):
else: else:
id_map = {} id_map = {}
log_path, output_path, debug, debug_file = parse_config(config_path) log_path, output_path = parse_config(config_path)
clients = parse_logs(log_path, ident_map=id_map, file_log=debug_file) clients = parse_logs(log_path, ident_map=id_map, file_log=debugfile)
render_template(clients, output=output_path, debug=debug) render_template(clients, output=output_path, debug=debug)
if __name__ == '__main__': if __name__ == '__main__':
@ -284,5 +282,11 @@ if __name__ == '__main__':
parser.add_argument( parser.add_argument(
'--idmap', type=str, help='path to id_map', default='id_map.json' '--idmap', type=str, help='path to id_map', default='id_map.json'
) )
parser.add_argument(
'--debug', help='debug mode', action='store_true'
)
parser.add_argument(
'--debugfile', help='write debug-log to file', action='store_true'
)
args = parser.parse_args() args = parser.parse_args()
main(args.config, args.idmap) main(args.config, args.idmap, args.debug, args.debugfile)