Version v0.3.0-alpha.21-in-mem

Cargo.lock

@@ -995,7 +995,7 @@ dependencies = [
 
 [[package]]
 name = "pict-rs"
-version = "0.3.0-alpha.20"
+version = "0.3.0-alpha.21"
 dependencies = [
  "actix-form-data",
  "actix-fs",

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "pict-rs"
 description = "A simple image hosting service"
-version = "0.3.0-alpha.20"
+version = "0.3.0-alpha.21"
 authors = ["asonix <asonix@asonix.dog>"]
 license = "AGPL-3.0"
 readme = "README.md"

docker/prod/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.3'
 
 services:
   pictrs:
-    image: asonix/pictrs:v0.3.0-alpha.20-in-mem
+    image: asonix/pictrs:v0.3.0-alpha.21-in-mem
     ports:
       - "127.0.0.1:8080:8080"
     restart: always

src/exiftool.rs

@@ -0,0 +1,13 @@
+pub(crate) fn clear_metadata_stream<S, E>(
+    input: S,
+) -> std::io::Result<futures::stream::LocalBoxStream<'static, Result<actix_web::web::Bytes, E>>>
+where
+    S: futures::stream::Stream<Item = Result<actix_web::web::Bytes, E>> + Unpin + 'static,
+    E: From<std::io::Error> + 'static,
+{
+    let process = crate::stream::Process::spawn(
+        tokio::process::Command::new("exiftool").args(["-all=", "-", "-out", "-"]),
+    )?;
+
+    Ok(Box::pin(process.sink_stream(input).unwrap()))
+}

src/main.rs

@@ -15,6 +15,7 @@ use tracing_subscriber::EnvFilter;
 
 mod config;
 mod error;
+mod exiftool;
 mod ffmpeg;
 mod magick;
 mod middleware;

src/validate.rs

@@ -38,11 +38,11 @@ where
         )),
         (Some(Format::Jpeg) | None, ValidInputType::Jpeg) => Ok((
             mime::IMAGE_JPEG,
-            crate::magick::clear_metadata_stream(copied_stream)?,
+            crate::exiftool::clear_metadata_stream(copied_stream)?,
         )),
         (Some(Format::Png) | None, ValidInputType::Png) => Ok((
             mime::IMAGE_PNG,
-            crate::magick::clear_metadata_stream(copied_stream)?,
+            crate::exiftool::clear_metadata_stream(copied_stream)?,
         )),
         (Some(Format::Webp) | None, ValidInputType::Webp) => Ok((
             image_webp(),