add imagemagick

Author: nbittich

Dockerfile

@@ -9,7 +9,8 @@ RUN apk add --no-cache \
     --repository http://dl-cdn.alpinelinux.org/alpine/edge/main \
     gperftools-dev
 RUN apk add --no-cache nss freetype harfbuzz ttf-freefont
-RUN apk add openjdk8-jre
+RUN apk add openjdk8-jre imagemagick ghostscript
+RUN sed -i 's/rights="none" pattern="PDF"/rights="read|write" pattern="PDF"/' /etc/ImageMagick-6/policy.xml
 
 ## INITIAL BUILDER
 FROM rust:1.91-alpine3.22 AS builder

src/upload/imagemagick.rs

@@ -0,0 +1,48 @@
+use std::{error::Error, path::PathBuf, process::Stdio};
+
+use tokio::process::Command;
+
+use crate::{
+    common::{constant::TMP_FS_PATH, util::IdGenerator},
+    upload::ConvertType,
+};
+
+pub async fn convert_to(
+    input_path: impl Into<PathBuf>,
+    ct: ConvertType,
+) -> Result<Vec<u8>, Box<dyn Error>> {
+    let extension = ct.to_str();
+    let input_path: PathBuf = input_path.into();
+    tracing::debug!("convert file {input_path:?}");
+    let input_path_str = &input_path.display().to_string();
+    let temp_dir = TMP_FS_PATH.join(IdGenerator.get());
+    tokio::fs::create_dir_all(&temp_dir).await?;
+    let output = Command::new("convert")
+        .args([input_path_str, &format!("{extension}:-")])
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .output()
+        .await?;
+    if output.status.success() {
+        let input_path = input_path.with_extension(extension);
+        let input_path = input_path
+            .file_name()
+            .ok_or("no file name")?
+            .to_string_lossy();
+        let path = format!("{}/{input_path}", temp_dir.display());
+        let bytes = tokio::fs::read(&path).await?;
+        tokio::spawn(async move {
+            if let Err(e) = tokio::fs::remove_dir_all(&temp_dir).await {
+                tracing::error!("could not remove temp thumb {e}");
+            }
+        });
+        Ok(bytes)
+    } else {
+        Err(format!(
+            "error! stdout: {}\nstderr: {}",
+            String::from_utf8_lossy(&output.stdout),
+            String::from_utf8_lossy(&output.stderr),
+        )
+        .into())
+    }
+}

src/upload/mod.rs

@@ -1,4 +1,18 @@
 pub mod domain;
+pub mod imagemagick;
 pub mod routes;
 pub mod service;
 pub mod soffice;
+
+pub enum ConvertType {
+    Png,
+    // Pdf,
+}
+impl ConvertType {
+    fn to_str(&self) -> &str {
+        match self {
+            ConvertType::Png => "png",
+            //  ConvertType::Pdf => "pdf",
+        }
+    }
+}

src/upload/service.rs

@@ -17,14 +17,14 @@ use tokio::{
 use tokio_util::io::StreamReader;
 use tracing::debug;
 
+use crate::upload::ConvertType;
 use crate::{
     common::{
         constant::{SHARE_DRIVE_PATH_BUF, THUMB_H, THUMB_W, TMP_FS_PATH},
         domain::ServiceError,
         util::{IdGenerator, StoreCollection},
     },
     store::{Repository, StoreClient, StoreRepository, get_document_filter_by_maybe_object_id},
-    upload::soffice::{ConvertType, convert_to},
 };
 
 use super::domain::FileUploadV2;
@@ -88,7 +88,7 @@ impl FileService {
                     .map_err(ServiceError::new)
                     .map(|im| (upl.content_type.clone(), im))
             } else {
-                match convert_to(temp_file_path, ConvertType::Png)
+                match super::imagemagick::convert_to(temp_file_path, ConvertType::Png)
                     .await
                     .map_err(ServiceError::new)
                     .map(|bytes| {
@@ -99,11 +99,28 @@ impl FileService {
                     Ok(img) => img,
                     Err(e) => {
                         tracing::error!(
-                            "error converting file {}: {}, giving up...",
+                            "error converting file {}: {}, trying with soffice...",
                             internal_name,
                             e
                         );
-                        return Ok(None);
+                        match super::soffice::convert_to(temp_file_path, ConvertType::Png)
+                            .await
+                            .map_err(ServiceError::new)
+                            .map(|bytes| {
+                                image::load_from_memory(&bytes)
+                                    .map_err(ServiceError::new)
+                                    .map(|im| (Some(IMAGE_PNG.to_string()), im))
+                            }) {
+                            Ok(img) => img,
+                            Err(e) => {
+                                tracing::error!(
+                                    "error converting file {}: {}, giving up...",
+                                    internal_name,
+                                    e
+                                );
+                                return Ok(None);
+                            }
+                        }
                     }
                 }
             }?;

src/upload/soffice.rs

@@ -2,7 +2,10 @@ use std::{error::Error, path::PathBuf, process::Stdio};
 
 use tokio::process::Command;
 
-use crate::common::{constant::TMP_FS_PATH, util::IdGenerator};
+use crate::{
+    common::{constant::TMP_FS_PATH, util::IdGenerator},
+    upload::ConvertType,
+};
 
 pub async fn convert_to(
     input_path: impl Into<PathBuf>,
@@ -49,16 +52,3 @@ pub async fn convert_to(
         .into())
     }
 }
-
-pub enum ConvertType {
-    Png,
-    // Pdf,
-}
-impl ConvertType {
-    fn to_str(&self) -> &str {
-        match self {
-            ConvertType::Png => "png",
-            //  ConvertType::Pdf => "pdf",
-        }
-    }
-}