Implement json output for create_archive and pretty print json output. #97
|
@ -157,4 +157,5 @@ def create_archive(
|
||||||
)
|
)
|
||||||
|
|
||||||
logger.debug(' '.join(full_command))
|
logger.debug(' '.join(full_command))
|
||||||
subprocess.check_call(full_command)
|
output = subprocess.check_output(full_command)
|
||||||
|
|||||||
|
return output.decode() if output is not None else None
|
||||||
witten
commented
Instead of conditionally decoding after the fact, I think you should be able to pass the desired encoding directly to
Instead of conditionally decoding after the fact, I think you should be able to pass the desired encoding directly to `check_output()`. Example:
```
output = subprocess.check_output(full_command, encoding=sys.stdout.encoding)
```
|
|||||||
|
|
|
@ -155,7 +155,7 @@ def _run_commands(args, consistency, local_path, location, remote_path, retentio
|
||||||
unexpanded_repository,
|
unexpanded_repository,
|
||||||
)
|
)
|
||||||
if args.json:
|
if args.json:
|
||||||
sys.stdout.write(json.dumps(json_results))
|
sys.stdout.write(json.dumps(json_results, indent=2))
|
||||||
|
|
||||||
|
|
||||||
def _run_commands_on_repository(
|
def _run_commands_on_repository(
|
||||||
|
@ -176,14 +176,19 @@ def _run_commands_on_repository(
|
||||||
)
|
)
|
||||||
if args.create:
|
if args.create:
|
||||||
logger.info('{}: Creating archive{}'.format(repository, dry_run_label))
|
logger.info('{}: Creating archive{}'.format(repository, dry_run_label))
|
||||||
borg_create.create_archive(
|
output = borg_create.create_archive(
|
||||||
args.dry_run,
|
args.dry_run,
|
||||||
repository,
|
repository,
|
||||||
location,
|
location,
|
||||||
storage,
|
storage,
|
||||||
local_path=local_path,
|
local_path=local_path,
|
||||||
remote_path=remote_path,
|
remote_path=remote_path,
|
||||||
|
json=args.json,
|
||||||
)
|
)
|
||||||
|
if args.json:
|
||||||
|
json_results.append(json.loads(output))
|
||||||
|
else:
|
||||||
|
sys.stdout.write(output)
|
||||||
witten
commented
Given the repetition of this pattern a few times in this function, you could DRY this up by factoring it out into a common function. Example imagined invocation:
Given the repetition of this pattern a few times in this function, you could DRY this up by factoring it out into a common function. Example imagined invocation:
```
display_output(output, args.json)
````
|
|||||||
if args.check:
|
if args.check:
|
||||||
logger.info('{}: Running consistency checks'.format(repository))
|
logger.info('{}: Running consistency checks'.format(repository))
|
||||||
borg_check.check_archives(
|
borg_check.check_archives(
|
||||||
|
|
Loading…
Reference in New Issue
Does this approach (
check_output()
instead ofcheck_call()
) have the side effect of delaying anyborg create
output until the command fully runs and exits? Do you see that as a usability problem, or not something to worry about? If you want to address this, one idea is to conditionally runcheck_call()
orcheck_output()
based on whetherargs.json
isTrue
.Note that I don't feel strongly about this either way.. Just wanted to bring it up and get your take.