Skip to content

Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.

feat: implement image caching with disk persistence to optimize poster loading

Samir Hossains6a1bbaae8f44
diff --git a/src/cache.rs b/src/cache.rs
index 9af03ac..4bceadc 100644
--- a/src/cache.rs
+++ b/src/cache.rs
@@ -311,3 +311,54 @@ pub fn set_homepage_cache(tab_id: &str, page: usize, data: &serde_json::Value) {
let path = get_homepage_path(tab_id, page);
write_json_cache(&path, data);
}
+
+pub fn get_image_path(id: &str) -> PathBuf {
+ let mut path = get_cache_dir("images");
+ use md5::{Digest, Md5};
+ let mut hasher = Md5::new();
+ hasher.update(id.as_bytes());
+ let result = hasher.finalize();
+ let mut safe_name = String::with_capacity(32);
+ for b in result {
+ use std::fmt::Write;
+ let _ = write!(&mut safe_name, "{:02x}", b);
+ }
+ path.push(format!("{safe_name}.img"));
+ path
+}
+
+pub fn get_image_cache(id: &str) -> Option<Vec<u8>> {
+ let path = get_image_path(id);
+ if path.exists() {
+ if let Ok(metadata) = std::fs::metadata(&path) {
+ if let Ok(modified) = metadata.modified() {
+ if let Ok(elapsed) = modified.elapsed() {
+ if elapsed.as_secs() > CACHE_EXPIRY_SECS {
+ let _ = std::fs::remove_file(&path);
+ return None;
+ }
+ }
+ }
+ }
+ return std::fs::read(&path).ok();
+ }
+ None
+}
+
+pub fn set_image_cache(id: &str, bytes: &[u8]) {
+ let path = get_image_path(id);
+ let stamp = std::time::SystemTime::now()
+ .duration_since(std::time::UNIX_EPOCH)
+ .unwrap_or_default()
+ .as_nanos();
+ let temporary = path.with_extension(format!("tmp-{}-{stamp}", std::process::id()));
+ if std::fs::write(&temporary, bytes).is_err() {
+ return;
+ }
+ if std::fs::rename(&temporary, &path).is_err() {
+ let _ = std::fs::remove_file(&path);
+ if std::fs::rename(&temporary, &path).is_err() {
+ let _ = std::fs::remove_file(temporary);
+ }
+ }
+}
diff --git a/src/tui/app.rs b/src/tui/app.rs
index e52d4a0..9d660e4 100644
--- a/src/tui/app.rs
+++ b/src/tui/app.rs
@@ -2699,24 +2699,22 @@ impl App {
let client = self.client.http_client().clone();
let id2 = id.clone();
tokio::spawn(async move {
- if let Ok(resp) = client
- .get(&cover_url)
- .header("User-Agent", "MovieBox-Tui/1.0")
- .send()
- .await
- {
+ if let Ok(Some(bytes)) = tokio::task::spawn_blocking({
+ let id_clone = id2.clone();
+ move || crate::cache::get_image_cache(&id_clone)
+ }).await {
+ if let Ok(Ok(img)) = tokio::task::spawn_blocking(move || image::load_from_memory(&bytes)).await {
+ tx.send(Action::SearchPosterLoaded(id2, Some(std::sync::Arc::new(img)))).ok();
+ return;
+ }
+ }
+ if let Ok(resp) = client.get(&cover_url).header("User-Agent", "MovieBox-Tui/1.0").send().await {
if let Ok(bytes) = resp.bytes().await {
- if let Ok(Ok(img)) =
- tokio::task::spawn_blocking(move || {
- image::load_from_memory(&bytes)
- })
- .await
- {
- tx.send(Action::SearchPosterLoaded(
- id2,
- Some(std::sync::Arc::new(img)),
- ))
- .ok();
+ let bytes_clone = bytes.clone();
+ let id_clone = id2.clone();
+ let _ = tokio::task::spawn_blocking(move || crate::cache::set_image_cache(&id_clone, &bytes_clone)).await;
+ if let Ok(Ok(img)) = tokio::task::spawn_blocking(move || image::load_from_memory(&bytes)).await {
+ tx.send(Action::SearchPosterLoaded(id2, Some(std::sync::Arc::new(img)))).ok();
}
}
}
@@ -2748,23 +2746,22 @@ impl App {
let id2 = id.clone();
let client = self.client.http_client().clone();
tokio::spawn(async move {
- if let Ok(resp) = client
- .get(&url)
- .header("User-Agent", "MovieBox-Tui/1.0")
- .send()
- .await
- {
+ if let Ok(Some(bytes)) = tokio::task::spawn_blocking({
+ let id_clone = id2.clone();
+ move || crate::cache::get_image_cache(&id_clone)
+ }).await {
+ if let Ok(Ok(img)) = tokio::task::spawn_blocking(move || image::load_from_memory(&bytes)).await {
+ tx.send(Action::PosterSuccess(id2, std::sync::Arc::new(img))).ok();
+ return;
+ }
+ }
+ if let Ok(resp) = client.get(&url).header("User-Agent", "MovieBox-Tui/1.0").send().await {
if let Ok(bytes) = resp.bytes().await {
- if let Ok(Ok(img)) = tokio::task::spawn_blocking(move || {
- image::load_from_memory(&bytes)
- })
- .await
- {
- tx.send(Action::PosterSuccess(
- id2,
- std::sync::Arc::new(img),
- ))
- .ok();
+ let bytes_clone = bytes.clone();
+ let id_clone = id2.clone();
+ let _ = tokio::task::spawn_blocking(move || crate::cache::set_image_cache(&id_clone, &bytes_clone)).await;
+ if let Ok(Ok(img)) = tokio::task::spawn_blocking(move || image::load_from_memory(&bytes)).await {
+ tx.send(Action::PosterSuccess(id2, std::sync::Arc::new(img))).ok();
}
}
}
@@ -2840,26 +2837,23 @@ impl App {
let action_tx = self.action_sender.clone();
let id_clone = id.clone();
tokio::spawn(async move {
- let client = reqwest::Client::builder()
- .timeout(std::time::Duration::from_secs(5))
- .build()
- .unwrap_or_default();
- if let Ok(resp) = client
- .get(&url_clone)
- .header("User-Agent", "MovieBox-Tui/1.0")
- .send()
- .await
- {
+ if let Ok(Some(bytes)) = tokio::task::spawn_blocking({
+ let id_clone = id_clone.clone();
+ move || crate::cache::get_image_cache(&id_clone)
+ }).await {
+ if let Ok(Ok(img)) = tokio::task::spawn_blocking(move || image::load_from_memory(&bytes)).await {
+ let _ = action_tx.send(Action::PosterSuccess(id_clone, std::sync::Arc::new(img)));
+ return;
+ }
+ }
+ let client = reqwest::Client::builder().timeout(std::time::Duration::from_secs(5)).build().unwrap_or_default();
+ if let Ok(resp) = client.get(&url_clone).header("User-Agent", "MovieBox-Tui/1.0").send().await {
if let Ok(bytes) = resp.bytes().await {
- if let Ok(Ok(img)) = tokio::task::spawn_blocking(move || {
- image::load_from_memory(&bytes)
- })
- .await
- {
- let _ = action_tx.send(Action::PosterSuccess(
- id_clone,
- std::sync::Arc::new(img),
- ));
+ let bytes_clone = bytes.clone();
+ let id_clone2 = id_clone.clone();
+ let _ = tokio::task::spawn_blocking(move || crate::cache::set_image_cache(&id_clone2, &bytes_clone)).await;
+ if let Ok(Ok(img)) = tokio::task::spawn_blocking(move || image::load_from_memory(&bytes)).await {
+ let _ = action_tx.send(Action::PosterSuccess(id_clone, std::sync::Arc::new(img)));
}
}
}
@@ -3273,23 +3267,23 @@ impl App {
let action_tx = self.action_sender.clone();
let id_clone = id.clone();
tokio::spawn(async move {
+ if let Ok(Some(bytes)) = tokio::task::spawn_blocking({
+ let id_clone = id_clone.clone();
+ move || crate::cache::get_image_cache(&id_clone)
+ }).await {
+ if let Ok(Ok(img)) = tokio::task::spawn_blocking(move || image::load_from_memory(&bytes)).await {
+ let _ = action_tx.send(Action::PosterSuccess(id_clone, std::sync::Arc::new(img)));
+ return;
+ }
+ }
let client = reqwest::Client::new();
- if let Ok(resp) = client
- .get(&url_clone)
- .header("User-Agent", "MovieBox-Tui/1.0")
- .send()
- .await
- {
+ if let Ok(resp) = client.get(&url_clone).header("User-Agent", "MovieBox-Tui/1.0").send().await {
if let Ok(bytes) = resp.bytes().await {
- if let Ok(Ok(img)) = tokio::task::spawn_blocking(move || {
- image::load_from_memory(&bytes)
- })
- .await
- {
- let _ = action_tx.send(Action::PosterSuccess(
- id_clone,
- std::sync::Arc::new(img),
- ));
+ let bytes_clone = bytes.clone();
+ let id_clone2 = id_clone.clone();
+ let _ = tokio::task::spawn_blocking(move || crate::cache::set_image_cache(&id_clone2, &bytes_clone)).await;
+ if let Ok(Ok(img)) = tokio::task::spawn_blocking(move || image::load_from_memory(&bytes)).await {
+ let _ = action_tx.send(Action::PosterSuccess(id_clone, std::sync::Arc::new(img)));
}
}
}