python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-08-06 22:32:54 +02:00
Code Issues Releases Activity

use all_parser_info() from lib in about function

Browse Source
This commit is contained in:
Kelly Brazil
2022-01-27 07:45:20 -08:00
parent ac0840cc0a
commit b426369815
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jc/cli.py
View File

@ -10,7 +10,7 @@ import signal
import shlex import shlex
import subprocess import subprocess
import json import json
from .lib import (__version__, parser_info, parsers, local_parsers, from .lib import (__version__, all_parser_info, parsers,
_parser_argument, _get_parser) _parser_argument, _get_parser)
from . import utils from . import utils
from . import tracebackplus from . import tracebackplus
@ -168,8 +168,6 @@ def parsers_text(indent=0, pad=0):
def about_jc(): def about_jc():
"""Return jc info and the contents of each parser.info as a dictionary""" """Return jc info and the contents of each parser.info as a dictionary"""
parser_list = [parser_info(p) for p in parsers]
return { return {
'name': 'jc', 'name': 'jc',
'version': info.version, 'version': info.version,
@ -179,8 +177,8 @@ def about_jc():
'website': info.website, 'website': info.website,
'copyright': info.copyright, 'copyright': info.copyright,
'license': info.license, 'license': info.license,
'parser_count': len(parser_list), 'parser_count': len(all_parser_info()),
'parsers': parser_list 'parsers': all_parser_info()
} }
@ -521,7 +519,7 @@ def main():
utils.error_message([f'Parser issue with {parser_name}:', utils.error_message([f'Parser issue with {parser_name}:',
f'{e.__class__.__name__}: {e}', f'{e.__class__.__name__}: {e}',
'Please ensure the locale is set to C (LANG=C) and you used the correct parser.', 'If this is the correct parser, try setting the locale to C (LANG=C).',
'For details use the -d or -dd option. Use "jc -h" for help.']) 'For details use the -d or -dd option. Use "jc -h" for help.'])
sys.exit(combined_exit_code(magic_exit_code, JC_ERROR_EXIT)) sys.exit(combined_exit_code(magic_exit_code, JC_ERROR_EXIT))
@ -544,7 +542,7 @@ def main():
utils.error_message([ utils.error_message([
f'{parser_name} parser could not parse the input data.', f'{parser_name} parser could not parse the input data.',
f'{streaming_msg}', f'{streaming_msg}',
'Please ensure the locale is set to C (LANG=C) and you used the correct parser.', 'If this is the correct parser, try setting the locale to C (LANG=C).',
'For details use the -d or -dd option. Use "jc -h" for help.' 'For details use the -d or -dd option. Use "jc -h" for help.'
]) ])
sys.exit(combined_exit_code(magic_exit_code, JC_ERROR_EXIT)) sys.exit(combined_exit_code(magic_exit_code, JC_ERROR_EXIT))