mirror/spacedrive
1
0
Fork 0
mirror of https://github.com/spacedriveapp/spacedrive.git synced 2026-04-23 16:07:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

[ENG-1095] HEIF* and PDF thumbnail orientation (#1815)

Browse Source 
* fix horizontal pdf rendering

* don't rotate certain formats (heif*)

* return `u32` from scaling function

* add `avifs` as a valid extension

* add avifs as a valid MIME type

* re-categorize `avifs` as a video (sequence)

* Fix mime-types

* Add Hif extension
 - Cannon uses a special extension for heif in its cameras: https://github.com/digipres/digipres.github.io/blob/master/_sources/registries/fdd/fddXML/fdd000525.xml#L213-L221

* hif is actually a heic

---------

Co-authored-by: Vítor Vasconcellos <vasconcellos.dev@gmail.com>
This commit is contained in:
jake
2023-11-24 22:07:25 +00:00
committed by GitHub
parent 3b12e4ea19
commit 59ef3b94de
8 changed files with 96 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/custom_uri/mod.rs
View File

@@ -423,11 +423,22 @@ async fn infer_the_mime_type(
"webp" => "image/webp",
// PDF document
"pdf" => "application/pdf",
// HEIF/HEIC images
"heif" | "heifs" => "image/heif,image/heif-sequence",
"heic" | "heics" => "image/heic,image/heic-sequence",
// AVIF images
"avif" | "avci" | "avcs" => "image/avif",
// HEIF images
"heif" => "image/heif",
// HEIF images sequence (animated)
"heifs" => "image/heif-sequence",
// HEIC images
"heic" | "hif" => "image/heic",
// HEIC images sequence (animated)
"heics" => "image/heic-sequence",
// AV1 in HEIF images
"avif" => "image/avif",
// AV1 in HEIF images sequence (DEPRECATED: https://github.com/AOMediaCodec/av1-avif/pull/86/files)
"avifs" => "image/avif-sequence",
// AVC in HEIF images
"avci" => "image/avci",
// AVC in HEIF images sequence (animated)
"avcs" => "image/avcs",
_ => "text/plain",
};

27
core/src/object/media/thumbnail/process.rs
View File

@@ -1,7 +1,7 @@
use crate::{api::CoreEvent, util::error::FileIOError};
use sd_file_ext::extensions::{DocumentExtension, ImageExtension};
use sd_images::{format_image, scale_dimensions};
use sd_images::{format_image, scale_dimensions, ConvertableExtension};
use sd_media_metadata::image::Orientation;
use sd_prisma::prisma::location;
@@ -397,7 +397,7 @@ async fn generate_image_thumbnail(
let file_path = file_path.as_ref().to_path_buf();
let webp = spawn_blocking(move || -> Result<_, ThumbnailerError> {
let img = format_image(&file_path).map_err(|e| ThumbnailerError::SdImages {
let mut img = format_image(&file_path).map_err(|e| ThumbnailerError::SdImages {
path: file_path.clone().into_boxed_path(),
error: e,
})?;
@@ -406,17 +406,24 @@ async fn generate_image_thumbnail(
let (w_scaled, h_scaled) = scale_dimensions(w as f32, h as f32, TARGET_PX);
// Optionally, resize the existing photo and convert back into DynamicImage
let mut img = DynamicImage::ImageRgba8(imageops::resize(
&img,
w_scaled as u32,
h_scaled as u32,
imageops::FilterType::Triangle,
));
if w != w_scaled && h != h_scaled {
img = DynamicImage::ImageRgba8(imageops::resize(
&img,
w_scaled,
h_scaled,
imageops::FilterType::Triangle,
));
}
// this corrects the rotation/flip of the image based on the *available* exif data
// not all images have exif data, so we don't error
// not all images have exif data, so we don't error. we also don't rotate HEIF as that's against the spec
if let Some(orientation) = Orientation::from_path(&file_path) {
img = orientation.correct_thumbnail(img);
if ConvertableExtension::try_from(file_path.as_ref())
.expect("we already checked if the image was convertable")
.should_rotate()
{
img = orientation.correct_thumbnail(img);
}
}
// Create the WebP encoder for the above image