almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-29 10:12:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

make dz-cli exit(1) when it fails

Browse source 
Otherwise the failure cannot be detected easily by the calling
tests.
This commit is contained in:
deeplow 2022-08-23 17:28:16 +01:00
parent 84acf116c7
commit f10446c309
No known key found for this signature in database
GPG key ID: 577982871529A52A
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dangerzone/cli.py
View file

@ -40,7 +40,7 @@ def cli_main(
if not valid: if not valid:
click.echo("Invalid filename") click.echo("Invalid filename")
return exit(1)
common.input_filename = os.path.abspath(filename) common.input_filename = os.path.abspath(filename)
@ -49,7 +49,7 @@ def cli_main(
valid = True valid = True
if not output_filename.endswith(".pdf"): if not output_filename.endswith(".pdf"):
click.echo("Safe PDF filename must end in '.pdf'") click.echo("Safe PDF filename must end in '.pdf'")
return exit(1)
try: try:
with open(os.path.abspath(output_filename), "wb"): with open(os.path.abspath(output_filename), "wb"):
@ -59,7 +59,7 @@ def cli_main(
if not valid: if not valid:
click.echo("Safe PDF filename is not writable") click.echo("Safe PDF filename is not writable")
return exit(1)
common.output_filename = os.path.abspath(output_filename) common.output_filename = os.path.abspath(output_filename)
@ -74,7 +74,7 @@ def cli_main(
click.echo( click.echo(
f"Output filename {common.output_filename} is not writable, use --output-filename" f"Output filename {common.output_filename} is not writable, use --output-filename"
) )
return exit(1)
# Validate OCR language # Validate OCR language
if ocr_lang: if ocr_lang:
@ -87,7 +87,7 @@ def cli_main(
click.echo("Invalid OCR language code. Valid language codes:") click.echo("Invalid OCR language code. Valid language codes:")
for lang in global_common.ocr_languages: for lang in global_common.ocr_languages:
click.echo(f"{global_common.ocr_languages[lang]}: {lang}") click.echo(f"{global_common.ocr_languages[lang]}: {lang}")
return exit(1)
# Ensure container is installed # Ensure container is installed
global_common.install_container() global_common.install_container()
@ -115,10 +115,10 @@ def cli_main(
): ):
print_header("Safe PDF created successfully") print_header("Safe PDF created successfully")
click.echo(common.output_filename) click.echo(common.output_filename)
sys.exit(0) exit(0)
else: else:
print_header("Failed to convert document") print_header("Failed to convert document")
sys.exit(-1) exit(1)
def setup_logging() -> None: def setup_logging() -> None: