From c9ed512e4e0a9227746e80a5db9f6684a5def66a Mon Sep 17 00:00:00 2001 From: itsjunetime Date: Sun, 19 Apr 2026 11:26:44 -0500 Subject: [PATCH] fix: fmt --- src/converter.rs | 2 +- src/kitty.rs | 9 ++++++--- src/main.rs | 15 ++++++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/converter.rs b/src/converter.rs index ac5afaf..177aa36 100644 --- a/src/converter.rs +++ b/src/converter.rs @@ -1,6 +1,6 @@ use std::{ io::Cursor, - num::{NonZeroUsize, NonZeroU32}, + num::{NonZeroU32, NonZeroUsize}, time::{SystemTime, UNIX_EPOCH} }; diff --git a/src/kitty.rs b/src/kitty.rs index 2dbf0c8..3d8a636 100644 --- a/src/kitty.rs +++ b/src/kitty.rs @@ -128,8 +128,11 @@ pub enum DisplayErrSource<'es> { impl Display for DisplayErrSource<'_> { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { - Self::KittageReturnedNoId => write!(f, "Kittage returned no ID when we asked it to display an image. This is a bug in kittage, please report it."), - Self::Transmission(t) => write!(f, "Error with talking to the terminal: {t}"), + Self::KittageReturnedNoId => write!( + f, + "Kittage returned no ID when we asked it to display an image. This is a bug in kittage, please report it." + ), + Self::Transmission(t) => write!(f, "Error with talking to the terminal: {t}") } } } @@ -210,7 +213,7 @@ pub async fn display_kitty_images<'es>( Ok(Some(img_id)) => { *img = MaybeTransferred::Transferred(img_id); Ok(()) - }, + } Ok(None) => Err((page_num, DisplayErrSource::KittageReturnedNoId)), Err(e) => Err((page_num, DisplayErrSource::Transmission(e))) } diff --git a/src/main.rs b/src/main.rs index c9e4f88..5d7c806 100644 --- a/src/main.rs +++ b/src/main.rs @@ -38,7 +38,9 @@ use ratatui_image::{ use tdf::{ PrerenderLimit, converter::{ConvertedPage, ConverterMsg, run_conversion_loop}, - kitty::{DisplayErr, DisplayErrSource, KittyDisplay, display_kitty_images, do_shms_work, run_action}, + kitty::{ + DisplayErr, DisplayErrSource, KittyDisplay, display_kitty_images, do_shms_work, run_action + }, renderer::{self, MUPDF_BLACK, MUPDF_WHITE, RenderError, RenderInfo, RenderNotif}, tui::{BottomMessage, InputAction, MessageSetting, Tui} }; @@ -462,7 +464,12 @@ async fn enter_redraw_loop( let maybe_err = display_kitty_images(to_display, &mut ev_stream).await; - if let Err(DisplayErr { failed_pages, user_facing_err, source }) = maybe_err { + if let Err(DisplayErr { + failed_pages, + user_facing_err, + source + }) = maybe_err + { match source { // This is the error that kitty & ghostty provide us when they delete an // image due to memory constraints, so if we get it, we just fix it by @@ -471,7 +478,9 @@ async fn enter_redraw_loop( // [TODO] maybe when we detect that an image was deleted, we probe the // terminal for the pages around it to see if they were deleted too and if // they were, we re-render them? idk - DisplayErrSource::Transmission(TransmitError::Terminal(TerminalError::NoEntity(_))) => (), + DisplayErrSource::Transmission(TransmitError::Terminal( + TerminalError::NoEntity(_) + )) => (), _ => tui.set_msg(MessageSetting::Some(BottomMessage::Error(format!( "{user_facing_err}: {source}" ))))