leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(wallpapers): filter images by extension

Browse source
This commit is contained in:
Michael Aaron Murphy 2025-03-04 16:58:16 +01:00
parent 3ee46f3d58
commit 92085b60ab
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
pages/wallpapers/src/lib.rs
View file

@ -5,6 +5,7 @@ use futures_lite::Stream;
use image::imageops::FilterType; use image::imageops::FilterType;
use image::{DynamicImage, ImageBuffer, Rgba, RgbaImage}; use image::{DynamicImage, ImageBuffer, Rgba, RgbaImage};
use jxl_oxide::{EnumColourEncoding, JxlImage, PixelFormat}; use jxl_oxide::{EnumColourEncoding, JxlImage, PixelFormat};
use std::os::unix::ffi::OsStrExt;
use std::{ use std::{
borrow::Cow, borrow::Cow,
collections::{hash_map::DefaultHasher, BTreeSet, HashMap}, collections::{hash_map::DefaultHasher, BTreeSet, HashMap},
@ -111,7 +112,7 @@ pub async fn load_each_from_path(
let path = entry.path(); let path = entry.path();
if file_type.is_file() { if file_type.is_file() {
let path = if path.extension().map_or(false, |ext| ext == "jxl") { let path = if path.extension().map(|ext| ext == "jxl").unwrap_or_default() {
path path
} else if let Ok(Some(kind)) = infer::get_from_path(&path) { } else if let Ok(Some(kind)) = infer::get_from_path(&path) {
if infer::MatcherType::Image == kind.matcher_type() { if infer::MatcherType::Image == kind.matcher_type() {
@ -252,7 +253,7 @@ fn load_thumbnail(
} }
fn open_image(input_buffer: &mut Vec<u8>, path: &Path) -> Option<DynamicImage> { fn open_image(input_buffer: &mut Vec<u8>, path: &Path) -> Option<DynamicImage> {
if path.extension().map_or(false, |ext| ext == "jxl") { if path.extension().map(|ext| ext == "jxl").unwrap_or_default() {
return match decode_jpegxl(path) { return match decode_jpegxl(path) {
Ok(image) => Some(image), Ok(image) => Some(image),
Err(why) => { Err(why) => {
@ -262,6 +263,24 @@ fn open_image(input_buffer: &mut Vec<u8>, path: &Path) -> Option<DynamicImage> {
}; };
} }
const SUPPORTED_FORMATS: &[&[u8]] = &[
"jpg".as_bytes(),
"jpeg".as_bytes(),
"png".as_bytes(),
"avif".as_bytes(),
"webp".as_bytes(),
"heif".as_bytes(),
];
let format_is_supported = path
.extension()
.map(|ext| SUPPORTED_FORMATS.contains(&ext.to_ascii_lowercase().as_bytes()))
.unwrap_or_default();
if !format_is_supported {
return None;
}
let capacity = match path.metadata() { let capacity = match path.metadata() {
Ok(metadata) => metadata.len() as usize, Ok(metadata) => metadata.len() as usize,
Err(why) => { Err(why) => {