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

fix(wallpaper): load wallpapers in alphabetical order

Browse source
This commit is contained in:
Michael Aaron Murphy 2023-12-05 05:50:29 +01:00 • committed by Michael Murphy
parent 01328729d6
commit f3e929e769
1 changed files with 54 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

109
pages/desktop/src/wallpaper.rs
View file

@ -3,7 +3,7 @@ pub use cosmic_bg_config::{Color, Config, Entry, Gradient, ScalingMode, Source};
use image::{DynamicImage, RgbaImage}; use image::{DynamicImage, RgbaImage};
use std::{ use std::{
borrow::Cow, borrow::Cow,
collections::{hash_map::DefaultHasher, HashMap}, collections::{hash_map::DefaultHasher, BTreeSet, HashMap},
fs::DirEntry, fs::DirEntry,
hash::{Hash, Hasher}, hash::{Hash, Hasher},
io::Read, io::Read,
@ -104,6 +104,7 @@ pub fn load_each_from_path(path: PathBuf) -> Receiver<(PathBuf, RgbaImage, RgbaI
tokio::task::spawn_blocking(move || { tokio::task::spawn_blocking(move || {
let mut buffer = Vec::new(); let mut buffer = Vec::new();
let mut paths = vec![path]; let mut paths = vec![path];
let mut wallpapers = BTreeSet::new();
while let Some(path) = paths.pop() { while let Some(path) = paths.pop() {
if let Ok(dir) = path.read_dir() { if let Ok(dir) = path.read_dir() {
@ -117,62 +118,61 @@ pub fn load_each_from_path(path: PathBuf) -> Receiver<(PathBuf, RgbaImage, RgbaI
if file_type.is_dir() { if file_type.is_dir() {
paths.push(path); paths.push(path);
} else if file_type.is_file() { } else if file_type.is_file() {
let image_operation = wallpapers.insert(path);
load_thumbnail(&mut buffer, cache_dir.as_deref(), &path, &entry);
if let Some(image_operation) = image_operation {
let tokio_handle = tokio::runtime::Handle::current();
let tx = tx.clone();
rayon::spawn_fifo(move || {
let display_thumbnail = match image_operation {
ImageOperation::Cached(thumbnail) => thumbnail.to_rgba8(),
ImageOperation::GenerateThumbnail { path, image } => {
let image = image.thumbnail(300, 169).to_rgba8();
if let Some(path) = path {
// Save thumbnail to disk without blocking.
tokio_handle.spawn_blocking({
let image = image.clone();
move || {
if let Err(why) = image.save(&path) {
tracing::error!(
?path,
?why,
"failed to save image thumbnail"
);
let _res = std::fs::remove_file(&path);
}
}
});
}
image
}
};
let mut selection_thumbnail = image::imageops::resize(
&display_thumbnail,
158,
105,
image::imageops::FilterType::Lanczos3,
);
round(&mut selection_thumbnail, [8, 8, 8, 8]);
let _res = tx.blocking_send((
path,
display_thumbnail,
selection_thumbnail,
));
});
}
} }
} }
} }
} }
for path in wallpapers {
let image_operation = load_thumbnail(&mut buffer, cache_dir.as_deref(), &path);
if let Some(image_operation) = image_operation {
let tokio_handle = tokio::runtime::Handle::current();
let tx = tx.clone();
rayon::spawn_fifo(move || {
let display_thumbnail = match image_operation {
ImageOperation::Cached(thumbnail) => thumbnail.to_rgba8(),
ImageOperation::GenerateThumbnail { path, image } => {
let image = image.thumbnail(300, 169).to_rgba8();
if let Some(path) = path {
// Save thumbnail to disk without blocking.
tokio_handle.spawn_blocking({
let image = image.clone();
move || {
if let Err(why) = image.save(&path) {
tracing::error!(
?path,
?why,
"failed to save image thumbnail"
);
let _res = std::fs::remove_file(&path);
}
}
});
}
image
}
};
let mut selection_thumbnail = image::imageops::resize(
&display_thumbnail,
158,
105,
image::imageops::FilterType::Lanczos3,
);
round(&mut selection_thumbnail, [8, 8, 8, 8]);
let _res = tx.blocking_send((path, display_thumbnail, selection_thumbnail));
});
}
}
}); });
rx rx
@ -195,10 +195,9 @@ fn load_thumbnail(
input_buffer: &mut Vec<u8>, input_buffer: &mut Vec<u8>,
cache_dir: Option<&Path>, cache_dir: Option<&Path>,
path: &Path, path: &Path,
entry: &DirEntry,
) -> Option<ImageOperation> { ) -> Option<ImageOperation> {
if let Some(cache_dir) = cache_dir { if let Some(cache_dir) = cache_dir {
if let Ok(ctime) = entry.metadata().and_then(|meta| meta.created()) { if let Ok(ctime) = path.metadata().and_then(|meta| meta.created()) {
// Search for thumbnail by a unique hash string. // Search for thumbnail by a unique hash string.
let mut hasher = DefaultHasher::new(); let mut hasher = DefaultHasher::new();
path.hash(&mut hasher); path.hash(&mut hasher);