Require CI to run with locked flag so lockfile is always in sync

Cargo.toml

@@ -38,7 +38,7 @@ flume = { version = "0.11.0", default-features = false, features = ["async"] }
 xflags = "0.4.0-pre.2"
 mimalloc = "0.1.43"
 nix = { version = "0.30.0", features = ["signal"] }
-mupdf = { git = "https://github.com/messense/mupdf-rs.git", rev = "2e0fae910fac8048c7008211fc4d3b9f5d227a07", default-features = false, features = ["svg", "system-fonts", "img"] }
+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", "log"] }
 kittage = { git = "https://github.com/itsjunetime/kittage.git", features = ["crossterm-tokio", "image-crate", "log"] }

src/converter.rs

@@ -26,7 +26,6 @@ pub enum MaybeTransferred {
 	Transferred(kittage::ImageId)
 }
 
-#[derive(Debug)]
 pub enum ConvertedImage {
 	Generic(Protocol),
 	Kitty {
@@ -169,12 +168,6 @@ pub async fn run_conversion_loop(
 			)
 		};
 
-		log::debug!(
-			"got converted page for num {} with results {:?}",
-			page_info.page_num,
-			page_info.result_rects
-		);
-
 		// update the iteration to the iteration that we stole this image from
 		*iteration = new_iter;
 

src/main.rs

@@ -1,11 +1,9 @@
-use core::{
+use core::error::Error;
-	error::Error,
-	num::{NonZeroU32, NonZeroUsize}
-};
 use std::{
 	borrow::Cow,
 	ffi::OsString,
-	io::{BufReader, Read, Stdout, Write, stdout},
+	io::{BufReader, Read, Stdout, stdout},
+	num::{NonZeroU32, NonZeroUsize},
 	path::PathBuf
 };
 
@@ -56,27 +54,8 @@ impl std::fmt::Debug for WrappedErr {
 
 impl std::error::Error for WrappedErr {}
 
-fn reset_term() {
-	_ = execute!(
-		std::io::stdout(),
-		LeaveAlternateScreen,
-		crossterm::cursor::Show,
-		crossterm::event::DisableMouseCapture
-	)
-}
-
 #[tokio::main]
 async fn main() -> Result<(), WrappedErr> {
-	inner_main().await.inspect_err(|_| reset_term())
-}
-
-async fn inner_main() -> Result<(), WrappedErr> {
-	let hook = std::panic::take_hook();
-	std::panic::set_hook(Box::new(move |info| {
-		reset_term();
-		hook(info);
-	}));
-
 	#[cfg(feature = "tracing")]
 	console_subscriber::init();
 
@@ -193,39 +172,14 @@ async fn inner_main() -> Result<(), WrappedErr> {
 		window_size.height = h;
 	}
 
-	let cell_height_px = window_size.height / window_size.rows;
-	let cell_width_px = window_size.width / window_size.columns;
-
-	execute!(
-		std::io::stdout(),
-		EnterAlternateScreen,
-		crossterm::cursor::Hide,
-		crossterm::event::EnableMouseCapture
-	)
-	.map_err(|e| {
-		WrappedErr(
-			format!(
-				"Couldn't enter the alternate screen and hide the cursor for proper presentation: {e}"
-			)
-			.into()
-		)
-	})?;
-
 	// We need to create `picker` on this thread because if we create it on the `renderer` thread,
 	// it messes up something with user input. Input never makes it to the crossterm thing
 	let picker = Picker::from_query_stdio()
-		.or_else(|e| match e {
+		.map_err(|e| WrappedErr(match e {
-			ratatui_image::errors::Errors::NoFontSize if
+			ratatui_image::errors::Errors::NoFontSize =>
-				window_size.width != 0
+				"Unable to detect your terminal's font size; this is an issue with your terminal emulator.\nPlease use a different terminal emulator or report this bug to tdf.".into(),
-				&& window_size.height != 0
+			e => format!("Couldn't get the necessary information to set up images: {e}").into()
-				&& window_size.columns != 0
+		}))?;
-				&& window_size.rows != 0
-					=> Ok(Picker::from_fontsize((cell_width_px, cell_height_px))),
-			ratatui_image::errors::Errors::NoFontSize => Err(WrappedErr(
-				"Unable to detect your terminal's font size; this is an issue with your terminal emulator.\nPlease use a different terminal emulator or report this bug to tdf.".into()
-			)),
-			e => Err(WrappedErr(format!("Couldn't get the necessary information to set up images: {e}").into()))
-		})?;
 
 	// then we want to spawn off the rendering task
 	// We need to use the thread::spawn API so that this exists in a thread not owned by tokio,
@@ -235,6 +189,8 @@ async fn inner_main() -> Result<(), WrappedErr> {
 		.and_then(NonZeroUsize::new)
 		.map_or(PrerenderLimit::All, PrerenderLimit::Limited);
 
+	let cell_height_px = window_size.height / window_size.rows;
+	let cell_width_px = window_size.width / window_size.columns;
 	std::thread::spawn(move || {
 		renderer::start_rendering(
 			&file_path,
@@ -280,6 +236,20 @@ async fn inner_main() -> Result<(), WrappedErr> {
 	})?;
 	term.skip_diff(true);
 
+	execute!(
+		term.backend_mut(),
+		EnterAlternateScreen,
+		crossterm::cursor::Hide,
+		crossterm::event::EnableMouseCapture
+	)
+	.map_err(|e| {
+		WrappedErr(
+			format!(
+				"Couldn't enter the alternate screen and hide the cursor for proper presentation: {e}"
+			)
+			.into()
+		)
+	})?;
 	enable_raw_mode().map_err(|e| {
 		WrappedErr(
 			format!("Can't enable raw mode, which is necessary to receive input: {e}").into()
@@ -508,10 +478,6 @@ fn parse_color_to_i32(cs: &str) -> Result<i32, csscolorparser::ParseColorError>
 }
 
 fn get_font_size_through_stdio() -> Result<(u16, u16), WrappedErr> {
-	// send the command code to get the terminal window size
-	print!("\x1b[14t");
-	std::io::stdout().flush().unwrap();
-
 	// we need to enable raw mode here since this bit of output won't print a newline; it'll
 	// just print the info it wants to tell us. So we want to get all characters as they come
 	enable_raw_mode().map_err(|e| {

src/renderer.rs

@@ -2,7 +2,7 @@ use std::{collections::VecDeque, num::NonZeroUsize, thread::sleep, time::Duratio
 
 use flume::{Receiver, SendError, Sender, TryRecvError};
 use mupdf::{
-	Colorspace, Document, Matrix, Page, Pixmap, Quad, TextPageFlags, text_page::SearchHitResponse
+	Colorspace, Document, Matrix, Page, Pixmap, Quad, TextPageOptions, text_page::SearchHitResponse
 };
 use ratatui::layout::Rect;
 
@@ -520,7 +520,7 @@ fn render_single_page_to_ctx(
 	})
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct HighlightRect {
 	pub ul_x: u32,
 	pub ul_y: u32,
@@ -536,7 +536,8 @@ fn search_page(
 ) -> Result<Vec<Quad>, mupdf::error::Error> {
 	search_term
 		.map(|term| {
-			page.to_text_page(TextPageFlags::empty()).and_then(|page| {
+			page.to_text_page(TextPageOptions::empty())
+				.and_then(|page| {
 					let mut v = Vec::with_capacity(trusted_search_results);
 					page.search_cb(term, &mut v, |v, results| {
 						v.extend(results.iter().cloned());
@@ -551,7 +552,8 @@ fn search_page(
 
 #[inline]
 fn count_search_results(page: &Page, search_term: &str) -> Result<usize, mupdf::error::Error> {
-	page.to_text_page(TextPageFlags::empty()).and_then(|page| {
+	page.to_text_page(TextPageOptions::empty())
+		.and_then(|page| {
 			let mut count = 0;
 			page.search_cb(search_term, &mut count, |count, results| {
 				*count += results.len();