This commit is contained in:
sxyazi 2023-08-04 22:42:47 +08:00
parent 36bad9c4ed
commit dc371b782c
No known key found for this signature in database
2 changed files with 34 additions and 38 deletions

View file

@ -15,7 +15,7 @@ image = "^0"
md-5 = "^0"
once_cell = "^1"
ratatui = "^0"
tokio = { version = "^1", features = ["parking_lot"] }
tokio = { version = "^1", features = [ "parking_lot" ] }
# Logging
tracing = "^0"

View file

@ -10,47 +10,43 @@ use tokio::fs;
pub struct Image;
impl Image {
pub(super) async fn crop(path: &Path, size: (u16, u16)) -> Result<DynamicImage> {
let (w, h) = {
let r = tty_ratio();
let (w, h) = ((size.0 as f64 * r.0) as u32, (size.1 as f64 * r.1) as u32);
(w.min(PREVIEW.max_width), h.min(PREVIEW.max_height))
};
pub(super) async fn crop(path: &Path, size: (u16, u16)) -> Result<DynamicImage> {
let (w, h) = {
let r = tty_ratio();
let (w, h) = ((size.0 as f64 * r.0) as u32, (size.1 as f64 * r.1) as u32);
(w.min(PREVIEW.max_width), h.min(PREVIEW.max_height))
};
let img = fs::read(path).await?;
let img = tokio::task::spawn_blocking(move || -> Result<DynamicImage> {
let img = image::load_from_memory(&img)?;
Ok(if img.width() > w || img.height() > h {
img.resize(w, h, FilterType::Triangle)
} else {
img
})
});
let img = fs::read(path).await?;
let img = tokio::task::spawn_blocking(move || -> Result<DynamicImage> {
let img = image::load_from_memory(&img)?;
Ok(if img.width() > w || img.height() > h {
img.resize(w, h, FilterType::Triangle)
} else {
img
})
});
img.await?
}
img.await?
}
pub async fn precache(img: Vec<u8>, cache: PathBuf) -> Result<()> {
let result = tokio::task::spawn_blocking(move || {
let img = image::load_from_memory(&img)?;
let (w, h) = (PREVIEW.max_width, PREVIEW.max_height);
pub async fn precache(img: Vec<u8>, cache: PathBuf) -> Result<()> {
let result = tokio::task::spawn_blocking(move || {
let img = image::load_from_memory(&img)?;
let (w, h) = (PREVIEW.max_width, PREVIEW.max_height);
if img.width() > w || img.height() > h {
img.resize(w, h, FilterType::Triangle)
.save_with_format(cache, ImageFormat::Jpeg)?;
}
Ok::<(), Error>(())
});
if img.width() > w || img.height() > h {
img.resize(w, h, FilterType::Triangle).save_with_format(cache, ImageFormat::Jpeg)?;
}
Ok::<(), Error>(())
});
result.await?
}
result.await?
}
#[inline]
pub fn cache(path: &Path) -> PathBuf {
format!(
"/tmp/yazi/{:x}",
Md5::new_with_prefix(path.to_string_lossy().as_bytes()).finalize()
)
.into()
}
#[inline]
pub fn cache(path: &Path) -> PathBuf {
format!("/tmp/yazi/{:x}", Md5::new_with_prefix(path.to_string_lossy().as_bytes()).finalize())
.into()
}
}