From 7c2b4775f165415f7a734c6fed0ac84ccc14342e Mon Sep 17 00:00:00 2001 From: kernelkind Date: Wed, 19 Feb 2025 17:54:55 -0500 Subject: [PATCH] move MediaCache rendering to render_media_cache call Signed-off-by: kernelkind --- crates/notedeck/src/imgcache.rs | 7 ++ crates/notedeck/src/lib.rs | 2 +- .../notedeck_columns/src/ui/note/contents.rs | 75 ++++++------------ crates/notedeck_columns/src/ui/note/post.rs | 76 ++++++++----------- .../src/ui/profile/picture.rs | 56 ++++---------- 5 files changed, 81 insertions(+), 135 deletions(-) diff --git a/crates/notedeck/src/imgcache.rs b/crates/notedeck/src/imgcache.rs index d54adee3..509cff3b 100644 --- a/crates/notedeck/src/imgcache.rs +++ b/crates/notedeck/src/imgcache.rs @@ -130,3 +130,10 @@ impl MediaCache { &mut self.url_imgs } } + +// TODO: temporary... +pub fn get_texture(textured_image: &TexturedImage) -> &TextureHandle { + match textured_image { + TexturedImage::Static(texture_handle) => texture_handle, + } +} diff --git a/crates/notedeck/src/lib.rs b/crates/notedeck/src/lib.rs index 3b0a6003..49e70d8e 100644 --- a/crates/notedeck/src/lib.rs +++ b/crates/notedeck/src/lib.rs @@ -31,7 +31,7 @@ pub use context::AppContext; pub use error::{Error, FilterError}; pub use filter::{FilterState, FilterStates, UnifiedSubscription}; pub use fonts::NamedFontFamily; -pub use imgcache::{MediaCache, TexturedImage}; +pub use imgcache::{get_texture, MediaCache, TexturedImage}; pub use muted::{MuteFun, Muted}; pub use note::{NoteRef, RootIdError, RootNoteId, RootNoteIdBuf}; pub use notecache::{CachedNote, NoteCache}; diff --git a/crates/notedeck_columns/src/ui/note/contents.rs b/crates/notedeck_columns/src/ui/note/contents.rs index 3010df85..7361c2b8 100644 --- a/crates/notedeck_columns/src/ui/note/contents.rs +++ b/crates/notedeck_columns/src/ui/note/contents.rs @@ -1,7 +1,7 @@ use crate::ui::{ self, + images::render_media_cache, note::{NoteOptions, NoteResponse}, - ProfilePic, }; use crate::{actionbar::NoteAction, images::ImageType, timeline::TimelineKind}; use egui::{Color32, Hyperlink, Image, RichText}; @@ -295,57 +295,32 @@ fn image_carousel( .show(ui, |ui| { ui.horizontal(|ui| { for image in images { - // If the cache is empty, initiate the fetch - let m_cached_promise = img_cache.map().get(&image); - if m_cached_promise.is_none() { - let res = crate::images::fetch_img( - img_cache, - ui.ctx(), - &image, - ImageType::Content(width.round() as u32, height.round() as u32), - ); - img_cache.map_mut().insert(image.to_owned(), res); - } - - // What is the state of the fetch? - match img_cache.map()[&image].ready() { - // Still waiting - None => { + render_media_cache( + ui, + img_cache, + &image, + ImageType::Content(width.round() as u32, height.round() as u32), + |ui| { ui.allocate_space(egui::vec2(spinsz, spinsz)); - //ui.add(egui::Spinner::new().size(spinsz)); - } - // Failed to fetch image! - Some(Err(_err)) => { - // FIXME - use content-specific error instead - let no_pfp = crate::images::fetch_img( - img_cache, - ui.ctx(), - ProfilePic::no_pfp_url(), - ImageType::Profile(128), - ); - img_cache.map_mut().insert(image.to_owned(), no_pfp); - // spin until next pass - ui.allocate_space(egui::vec2(spinsz, spinsz)); - //ui.add(egui::Spinner::new().size(spinsz)); - } - // Use the previously resolved image - Some(Ok(img)) => match img { - notedeck::TexturedImage::Static(texture_handle) => { - let img_resp = ui.add( - Image::new(texture_handle) - .max_height(height) - .rounding(5.0) - .fit_to_original_size(1.0), - ); - img_resp.context_menu(|ui| { - if ui.button("Copy Link").clicked() { - ui.ctx().copy_text(image); - ui.close_menu(); - } - }); - } }, - } + |ui, _| { + ui.allocate_space(egui::vec2(spinsz, spinsz)); + }, + |ui, url, renderable_media| { + let img_resp = ui.add( + Image::new(notedeck::get_texture(renderable_media)) + .max_height(height) + .rounding(5.0) + .fit_to_original_size(1.0), + ); + img_resp.context_menu(|ui| { + if ui.button("Copy Link").clicked() { + ui.ctx().copy_text(url.to_owned()); + ui.close_menu(); + } + }); + }, + ); } }) .response diff --git a/crates/notedeck_columns/src/ui/note/post.rs b/crates/notedeck_columns/src/ui/note/post.rs index 0dd47ac0..ca84dc55 100644 --- a/crates/notedeck_columns/src/ui/note/post.rs +++ b/crates/notedeck_columns/src/ui/note/post.rs @@ -1,8 +1,8 @@ use crate::draft::{Draft, Drafts, MentionHint}; -use crate::images::fetch_img; use crate::media_upload::{nostrbuild_nip96_upload, MediaPath}; use crate::post::{downcast_post_buffer, MentionType, NewPost}; use crate::profile::get_display_name; +use crate::ui::images::render_media_cache; use crate::ui::search_results::SearchResultsView; use crate::ui::{self, note::NoteOptions, Preview, PreviewConfig}; use crate::Result; @@ -13,7 +13,7 @@ use egui::{vec2, Frame, Layout, Margin, Pos2, ScrollArea, Sense, TextBuffer}; use enostr::{FilledKeypair, FullKeypair, NoteId, Pubkey, RelayPool}; use nostrdb::{Ndb, Transaction}; -use notedeck::{MediaCache, NoteCache}; +use notedeck::{get_texture, MediaCache, NoteCache}; use tracing::error; use super::contents::render_note_preview; @@ -384,21 +384,19 @@ impl<'a> PostView<'a> { } else { (300, 300) }; - let m_cached_promise = self.img_cache.map().get(&media.url); - if m_cached_promise.is_none() { - let promise = fetch_img( - self.img_cache, - ui.ctx(), - &media.url, - crate::images::ImageType::Content(width, height), - ); - self.img_cache - .map_mut() - .insert(media.url.to_owned(), promise); - } - - match self.img_cache.map()[&media.url].ready() { - Some(Ok(texture)) => { + render_media_cache( + ui, + self.img_cache, + &media.url, + crate::images::ImageType::Content(width, height), + |ui| { + ui.spinner(); + }, + |_, e| { + self.draft.upload_errors.push(e.clone()); + error!("{e}"); + }, + |ui, _, renderable_media| { let media_size = vec2(width as f32, height as f32); let max_size = vec2(300.0, 300.0); let size = if media_size.x > max_size.x || media_size.y > max_size.y { @@ -407,35 +405,25 @@ impl<'a> PostView<'a> { media_size }; - match texture { - notedeck::TexturedImage::Static(texture_handle) => { - let img_resp = ui.add( - egui::Image::new(texture_handle) - .max_size(size) - .rounding(12.0), - ); + let texture_handle = get_texture(renderable_media); + let img_resp = ui.add( + egui::Image::new(texture_handle) + .max_size(size) + .rounding(12.0), + ); - let remove_button_rect = { - let top_left = img_resp.rect.left_top(); - let spacing = 13.0; - let center = Pos2::new(top_left.x + spacing, top_left.y + spacing); - egui::Rect::from_center_size(center, egui::vec2(26.0, 26.0)) - }; - if show_remove_upload_button(ui, remove_button_rect).clicked() { - to_remove.push(i); - } - ui.advance_cursor_after_rect(img_resp.rect); - } + let remove_button_rect = { + let top_left = img_resp.rect.left_top(); + let spacing = 13.0; + let center = Pos2::new(top_left.x + spacing, top_left.y + spacing); + egui::Rect::from_center_size(center, egui::vec2(26.0, 26.0)) + }; + if show_remove_upload_button(ui, remove_button_rect).clicked() { + to_remove.push(i); } - } - Some(Err(e)) => { - self.draft.upload_errors.push(e.to_string()); - error!("{e}"); - } - None => { - ui.spinner(); - } - } + ui.advance_cursor_after_rect(img_resp.rect); + }, + ); } to_remove.reverse(); for i in to_remove { diff --git a/crates/notedeck_columns/src/ui/profile/picture.rs b/crates/notedeck_columns/src/ui/profile/picture.rs index 74fc889d..b6abbbaf 100644 --- a/crates/notedeck_columns/src/ui/profile/picture.rs +++ b/crates/notedeck_columns/src/ui/profile/picture.rs @@ -1,4 +1,5 @@ use crate::images::ImageType; +use crate::ui::images::render_media_cache; use crate::ui::{Preview, PreviewConfig}; use egui::{vec2, Sense, Stroke, TextureHandle}; use nostrdb::{Ndb, Transaction}; @@ -91,47 +92,22 @@ fn render_pfp( // We will want to downsample these so it's not blurry on hi res displays let img_size = 128u32; - let m_cached_promise = img_cache.map().get(url); - if m_cached_promise.is_none() { - let res = crate::images::fetch_img(img_cache, ui.ctx(), url, ImageType::Profile(img_size)); - img_cache.map_mut().insert(url.to_owned(), res); - } - - match img_cache.map()[url].ready() { - None => paint_circle(ui, ui_size, border), - - // Failed to fetch profile! - Some(Err(_err)) => { - let m_failed_promise = img_cache.map().get(url); - if m_failed_promise.is_none() { - let no_pfp = crate::images::fetch_img( - img_cache, - ui.ctx(), - ProfilePic::no_pfp_url(), - ImageType::Profile(img_size), - ); - img_cache.map_mut().insert(url.to_owned(), no_pfp); - } - - match img_cache.map().get(url).unwrap().ready() { - None => paint_circle(ui, ui_size, border), - Some(Err(_e)) => { - //error!("Image load error: {:?}", e); - paint_circle(ui, ui_size, border) - } - Some(Ok(img)) => match img { - notedeck::TexturedImage::Static(texture_handle) => { - pfp_image(ui, texture_handle, ui_size, border) - } - }, - } - } - Some(Ok(img)) => match img { - notedeck::TexturedImage::Static(texture_handle) => { - pfp_image(ui, texture_handle, ui_size, border) - } + render_media_cache( + ui, + img_cache, + url, + ImageType::Profile(img_size), + |ui| { + paint_circle(ui, ui_size, border); }, - } + |ui, _| { + paint_circle(ui, ui_size, border); + }, + |ui, _, renderable_media| { + let texture_handle = notedeck::get_texture(renderable_media); + pfp_image(ui, texture_handle, ui_size, border); + }, + ) } fn pfp_image(