unstablevortex/caff-previewer-wrapper
3
0
Fork 0
Code Pull Requests Releases Activity

Fixed image flipping error

Browse Source
This commit is contained in:
Pünkösd Marcell 2020-11-27 18:07:47 +01:00
parent 1c1d6bd29b
commit c1fc2cc7d8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
caff_previewer_wrapper/converter.py
View File

@ -4,7 +4,7 @@ from flask import current_app
import werkzeug.exceptions import werkzeug.exceptions
def run_abstract_converter(converter: str, source: str, destination: str) -> int: def run_abstract_converter(converter: str, source: str, destination: str, extra_args: list = None) -> int:
""" """
Just runs a binary and gives it two arguments Just runs a binary and gives it two arguments
:param converter: the converter binary to run :param converter: the converter binary to run
@ -15,7 +15,10 @@ def run_abstract_converter(converter: str, source: str, destination: str) -> int
if not (os.path.isfile(source) and os.path.isfile(converter)): if not (os.path.isfile(source) and os.path.isfile(converter)):
raise FileNotFoundError("Source or converter binary does not exists") raise FileNotFoundError("Source or converter binary does not exists")
completed_process = subprocess.run([converter, source, destination], # nosec: Concerning arguments checked above if not extra_args:
extra_args = []
completed_process = subprocess.run([converter, *extra_args, source, destination], # nosec: Concerning arguments checked above
timeout=current_app.config['CONVERSION_TIMEOUT'], env={}) timeout=current_app.config['CONVERSION_TIMEOUT'], env={})
return completed_process.returncode return completed_process.returncode
@ -41,6 +44,6 @@ def convert_tga_to_png(source: str, destination: str):
:param source: path of the source TGA file (must exists) :param source: path of the source TGA file (must exists)
:param destination: path of the destination TGA file (will be created) :param destination: path of the destination TGA file (will be created)
""" """
ret = run_abstract_converter(current_app.config['IMAGEMAGICK_CONVERT_BINARY'], source, destination) ret = run_abstract_converter(current_app.config['IMAGEMAGICK_CONVERT_BINARY'], source, destination, ['-auto-orient'])
if ret != 0: if ret != 0:
raise RuntimeError(f"Image magick convert returned an unexpected error code: {ret}") raise RuntimeError(f"Image magick convert returned an unexpected error code: {ret}")