From 484d248e26095667726dfa58d6bc2e6990253e0e Mon Sep 17 00:00:00 2001 From: itsjunetime Date: Wed, 18 Jun 2025 12:13:59 -0600 Subject: [PATCH] Add debug logging and fix cursor placement after image display --- Cargo.lock | 5 +++-- Cargo.toml | 4 ++-- src/converter.rs | 1 + src/kitty.rs | 8 +++++++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5abd66c..a94e954 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -997,9 +997,9 @@ dependencies = [ [[package]] name = "flexi_logger" -version = "0.31.0" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9765cc4ba26211f932a7a37649ec88752f7abcbd8822617572562ce31234df" +checksum = "759bfa52db036a2db54f0b5f0ff164efa249b3014720459c5ea4198380c529bc" dependencies = [ "chrono", "log", @@ -1591,6 +1591,7 @@ dependencies = [ "crossterm", "futures-core", "image", + "log", "memchr", "memmap2", "psx-shm", diff --git a/Cargo.toml b/Cargo.toml index eccc2a9..6c236b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,8 +40,8 @@ mimalloc = "0.1.43" nix = { version = "0.30.0", features = ["signal"] } mupdf = { version = "0.5.0", default-features = false, features = ["svg", "system-fonts", "img"] } rayon = { version = "*", default-features = false } -# kittage = { path = "../kittage/", features = ["crossterm-tokio", "image-crate"] } -kittage = { git = "https://github.com/itsjunetime/kittage.git", features = ["crossterm-tokio", "image-crate"] } +# kittage = { path = "../kittage/", features = ["crossterm-tokio", "image-crate", "log"] } +kittage = { git = "https://github.com/itsjunetime/kittage.git", features = ["crossterm-tokio", "image-crate", "log"] } memmap2 = "*" # logging diff --git a/src/converter.rs b/src/converter.rs index d7301fd..48ed919 100644 --- a/src/converter.rs +++ b/src/converter.rs @@ -20,6 +20,7 @@ use crate::{ skip::InterleavedAroundWithMax }; +#[derive(Debug)] pub enum MaybeTransferred { NotYet(kittage::image::Image<'static>), Transferred(kittage::ImageId) diff --git a/src/kitty.rs b/src/kitty.rs index 447e2ab..7cbde8a 100644 --- a/src/kitty.rs +++ b/src/kitty.rs @@ -11,7 +11,7 @@ use kittage::{ AsyncInputReader, ImageDimensions, ImageId, NumberOrId, PixelFormat, action::Action, delete::{ClearOrDelete, DeleteConfig, WhichToDelete}, - display::{DisplayConfig, DisplayLocation}, + display::{CursorMovementPolicy, DisplayConfig, DisplayLocation}, error::TransmitError, image::Image, medium::Medium @@ -137,11 +137,15 @@ pub async fn display_kitty_images<'es>( { let config = DisplayConfig { location: display_loc, + cursor_movement: CursorMovementPolicy::DontMove, ..DisplayConfig::default() }; execute!(std::io::stdout(), MoveTo(pos.x, pos.y)).unwrap(); + log::debug!("going to display img {img:#?}"); + log::debug!("displaying with config {config:#?}"); + let this_err = match img { MaybeTransferred::NotYet(image) => { let mut fake_image = Image { @@ -191,6 +195,8 @@ pub async fn display_kitty_images<'es>( .map_err(|e| (page_num, e)) }; + log::debug!("this_err is {this_err:#?}"); + if let Err((id, e)) = this_err { let e = err.get_or_insert_with(|| (vec![], e)); e.0.push(id);