diff --git a/Dockerfile b/Dockerfile index 8f85fc4..2525c49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,8 @@ RUN cat /etc/os-release # Install necessary packages RUN apk update && \ - apk add git pkgconf make g++ openssl libheif libheif-dev tiff tiff-dev && \ - rustup target add x86_64-unknown-linux-gnu + apk add git pkgconf make g++ openssl openssl-dev libheif libheif-dev tiff tiff-dev && \ + rustup target add x86_64-unknown-linux-musl # Create a new Rust binary project RUN USER=root cargo new --bin quoter diff --git a/src/handlers/proxy.rs b/src/handlers/proxy.rs index 9b75e7d..eca6024 100644 --- a/src/handlers/proxy.rs +++ b/src/handlers/proxy.rs @@ -35,14 +35,9 @@ pub async fn proxy_handler( "png" => "image/png", "webp" => "image/webp", "gif" => "image/gif", - "heic" | "heif" | "tiff" | "tif" => { - // Для HEIC и TIFF файлов мы всё равно будем отдавать оригинальный content-type, - // но при сохранении миниатюр они будут конвертированы в JPEG - match ext.as_str() { - "heic" | "heif" => "image/heic", - _ => "image/tiff" - } - }, + "jfif" => "image/jpeg", + "heic" | "heif" => "image/heic", + "tif" | "tiff" => "image/tiff", "mp3" => "audio/mpeg", "wav" => "audio/x-wav", "ogg" => "audio/ogg", diff --git a/src/thumbnail.rs b/src/thumbnail.rs index 291822c..87859e4 100644 --- a/src/thumbnail.rs +++ b/src/thumbnail.rs @@ -132,7 +132,7 @@ pub async fn thumbdata_save( // Определяем выходной формат let output_ext = match ext.as_str() { - "heic" | "heif" | "tiff" | "tif" => "jpg", // Конвертируем HEIC и TIFF в JPEG + "heic" | "heif" => "jpg", // Конвертируем HEIC в JPEG _ => &ext };