Refactor modules and fix word-wrap control rebinding

Author: trypsynth

src/config.rs

@@ -13,6 +13,8 @@ use base64::{
 use sha1::{Digest, Sha1};
 use wxdragon::config::{Config, ConfigStyle};
 
+use crate::types::DocumentListItem;
+
 const CONFIG_VERSION_LEGACY: i64 = 0;
 const CONFIG_VERSION_1: i64 = 1;
 const CONFIG_VERSION_2: i64 = 2;
@@ -828,12 +830,8 @@ impl Drop for ConfigManager {
 	}
 }
 
-pub fn get_sorted_document_list(
-	config: &ConfigManager,
-	open_paths: &[String],
-	filter: &str,
-) -> Vec<crate::ui_types::DocumentListItem> {
-	use crate::ui_types::{DocumentListItem, DocumentListStatus};
+pub fn get_sorted_document_list(config: &ConfigManager, open_paths: &[String], filter: &str) -> Vec<DocumentListItem> {
+	use crate::types::{DocumentListItem, DocumentListStatus};
 
 	let recent_docs = config.get_recent_documents();
 	let all_docs = config.get_all_documents();

src/document.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use bitflags::bitflags;
 
-use crate::utils::text::{display_len, is_space_like};
+use crate::text::{display_len, is_space_like};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 #[repr(i32)]

src/utils/encoding.rs src/encoding.rssrc/utils/encoding.rs renamed to src/encoding.rs

@@ -4,7 +4,7 @@ use bitflags::bitflags;
 use ego_tree::NodeRef;
 use scraper::{ElementRef, Html, Node, node};
 
-use crate::utils::text::{collapse_whitespace, display_len, format_list_item, remove_soft_hyphens, trim_string};
+use crate::text::{collapse_whitespace, display_len, format_list_item, remove_soft_hyphens, trim_string};
 
 bitflags! {
 	#[derive(Default, Clone, Copy)]

src/html_to_text.rs

@@ -1,4 +1,7 @@
-use std::{env, path::{Path, PathBuf}};
+use std::{
+	env,
+	path::{Path, PathBuf},
+};
 
 pub const IPC_SERVICE: &str = "4242";
 pub const IPC_TOPIC_OPEN_FILE: &str = "open_file";

src/ipc.rs

@@ -3,18 +3,20 @@
 
 mod config;
 mod document;
+mod encoding;
 mod html_to_text;
 mod ipc;
 mod parser;
 mod reader_core;
 mod session;
+mod text;
 mod translation_manager;
+mod types;
 mod ui;
-mod ui_types;
 mod update;
-mod utils;
 mod version;
 mod xml_to_text;
+mod zip;
 
 use ui::PaperbackApp;
 use wxdragon::prelude::{Appearance, SystemOptions, set_appearance};

src/main.rs

@@ -15,11 +15,14 @@ pub mod html;
 pub mod markdown;
 pub mod odp;
 pub mod odt;
+pub mod ooxml;
+pub mod path;
 pub mod pdf;
 pub mod pptx;
 pub mod rtf;
 pub mod text;
-pub mod utils;
+pub mod toc;
+pub mod xml;
 
 pub const PASSWORD_REQUIRED_ERROR_PREFIX: &str = "[password_required]";
 

src/parser.rs

@@ -6,12 +6,9 @@ use scraper::{ElementRef, Html, Selector};
 
 use crate::{
 	document::{Document, DocumentBuffer, Marker, MarkerType, ParserContext, ParserFlags, TocItem},
+	encoding::convert_to_utf8,
 	html_to_text::{HtmlSourceMode, HtmlToText},
-	parser::{
-		Parser,
-		utils::{extract_title_from_path, heading_level_to_marker_type},
-	},
-	utils::encoding::convert_to_utf8,
+	parser::{Parser, path::extract_title_from_path, toc::heading_level_to_marker_type},
 };
 
 pub struct ChmParser;

src/parser/chm.rs

@@ -9,12 +9,12 @@ use crate::{
 	html_to_text::HeadingInfo,
 	parser::{
 		Parser,
-		utils::{
-			build_toc_from_buffer, collect_ooxml_run_text, extract_title_from_path, find_child_element,
-			heading_level_to_marker_type, read_ooxml_relationships,
-		},
+		ooxml::{collect_ooxml_run_text, read_ooxml_relationships},
+		path::extract_title_from_path,
+		toc::{build_toc_from_buffer, heading_level_to_marker_type},
+		xml::find_child_element,
 	},
-	utils::zip::read_zip_entry_by_name,
+	zip::read_zip_entry_by_name,
 };
 
 pub struct DocxParser;

src/parser/docx.rs

@@ -14,15 +14,10 @@ use crate::{
 	html_to_text::{
 		HeadingInfo, HtmlSourceMode, HtmlToText, LinkInfo, ListInfo, ListItemInfo, SeparatorInfo, TableInfo,
 	},
-	parser::{
-		Parser,
-		utils::{extract_title_from_path, heading_level_to_marker_type},
-	},
-	utils::{
-		text::{collapse_whitespace, trim_string, url_decode},
-		zip::read_zip_entry_by_name,
-	},
+	parser::{Parser, path::extract_title_from_path, toc::heading_level_to_marker_type},
+	text::{collapse_whitespace, trim_string, url_decode},
 	xml_to_text::XmlToText,
+	zip::read_zip_entry_by_name,
 };
 
 struct SectionContent {