Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add input file encoding and output file encoding in arguments #25

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

add input file encoding and output file encoding in arguments #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions pya2l/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
def parse_args(args):
parser = argparse.ArgumentParser(prog='pya2l', description='Command line utility for A2L-formatted files.')
parser.add_argument('input_file', type=argparse.FileType('rb'), help='full path to A2L/JSON input file')
parser.add_argument('-ie', dest='input_encoding', type=str, help='encoding of the input file', default='utf-8')
parser.add_argument('-v', dest='verbose', action='store_true', help='enable verbose')
parser.add_argument('-p', dest='port', type=int, default=3333, nargs='?',
help='TCP port used to connect to the backend')
Expand All @@ -44,12 +45,13 @@ def parse_args(args):
a2l_subparser = subparsers.add_parser(TO_A2L_CMD, help='converts an A2L/JSON file to A2L')
a2l_subparser.add_argument('-o', dest='output_file', type=argparse.FileType('wb'),
help='full path to A2L output file')
parser.add_argument('-oe', dest='output_encoding', type=str, help='encoding of the output file', default='utf-8')
a2l_subparser.add_argument('-s', dest='sorted', action='store_true', default=False,
help='sort elements based on their unique key within the document')
a2l_subparser.add_argument('-i', dest='indent', type=int, default=None, nargs='?',
help='indentation level (in number of leading spaces)')
a2l_subparser.add_argument('-p', dest='allow_partial', type=bool, default=False,
help='allow production of JSON output with missing required field(s)')
help='allow production of JSON output with missing required field(s)')

diff_subparser = subparsers.add_parser(DIFF_CMD, help='shows differences between two A2L/JSON files')
diff_subparser.add_argument('right_hand_side', type=argparse.FileType('rb'),
Expand Down Expand Up @@ -95,7 +97,7 @@ def main(args: typing.List[str] = tuple(sys.argv[1:])):

try:
with Parser(port=args.port, logger=log) as parser:
input_tree = process_input_file(args.input_file, parser, args.allow_partial)
input_tree = process_input_file(args.input_file, parser, args.allow_partial, args.input_encoding)
if args.sub_command == TO_JSON_CMD:
if args.output_file:
log.info(f'start writing to file {os.path.abspath(args.output_file.name)}')
Expand All @@ -112,7 +114,8 @@ def main(args: typing.List[str] = tuple(sys.argv[1:])):
elif args.sub_command == TO_A2L_CMD:
if args.output_file:
log.info(f'start writing to file {os.path.abspath(args.output_file.name)}')
args.output_file.write(parser.a2l_from_tree(input_tree, sorted=args.sorted, indent=args.indent))
args.output_file.write(parser.a2l_from_tree(input_tree, sorted=args.sorted, indent=args.indent)
.decode().encode(args.output_encoding))
log.info(f'finished writing to file {os.path.abspath(args.output_file.name)}')
else:
sys.stdout.write(parser.json_from_tree(input_tree,
Expand Down