From 0ed56d6a1a74d45917133e700a240097c99a51cd Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Sat, 11 Nov 2023 22:25:26 +1100 Subject: [PATCH] added a debug for rotate code, and put quotes in the right spots so paths with spaces are covered - D'oh! --- pa_job_manager.py | 3 ++- utils/pa_rotate | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pa_job_manager.py b/pa_job_manager.py index 82c21a1..a27d895 100644 --- a/pa_job_manager.py +++ b/pa_job_manager.py @@ -1915,7 +1915,8 @@ def JobTransformImage(job): out.save( e.FullPathOnFS() ) else: AddLogForJob(job, f"INFO: Rotating {e.FullPathOnFS()} by {amt} degrees" ) - p = subprocess.run([PA_EXIF_ROTATER, e.FullPathOnFS(), amt ] ) + p = subprocess.run([PA_EXIF_ROTATER, e.FullPathOnFS(), amt ], capture_output=True ) + print(p) settings = session.query(Settings).first() e.file_details.thumbnail, _ , _ = GenThumb( e.FullPathOnFS(), settings.auto_rotate ) e.file_details.hash = md5( job, e ) diff --git a/utils/pa_rotate b/utils/pa_rotate index 71bbf8f..68be208 100755 --- a/utils/pa_rotate +++ b/utils/pa_rotate @@ -1,9 +1,9 @@ #!/bin/sh echo "start" -b=`basename $1` +b=`basename "$1"` echo "b=$b" -mv $1 /tmp/$b -echo "mv $1 to /tmp/$b" -jpegtran -outfile $1 -rotate $2 /tmp/$b +mv "$1" "/tmp/$b" +echo "mv '$1' to /tmp/$b" +jpegtran -outfile "$1" -rotate "$2" "/tmp/$b" echo "done jpegtran"