Move webview path logic into Rust, remove unneeded code.

Author: trypsynth

app/config_manager.cpp

@@ -89,10 +89,6 @@ void config_manager::remove_document_history(const wxString& path) {
 	if (is_initialized()) config_manager_remove_document_history(backend_mut(), to_utf8(path));
 }
 
-void config_manager::remove_navigation_history(const wxString& path) {
-	if (is_initialized()) config_manager_remove_navigation_history(backend_mut(), to_utf8(path));
-}
-
 bool config_manager::get_document_opened(const wxString& path) const {
 	return is_initialized() ? config_manager_get_document_opened(backend_ref(), to_utf8(path)) : false;
 }

app/config_manager.hpp

@@ -76,7 +76,6 @@ class config_manager {
 	long get_document_position(const wxString& path) const;
 	void set_document_opened(const wxString& path, bool opened);
 	void remove_document_history(const wxString& path);
-	void remove_navigation_history(const wxString& path);
 	bool get_document_opened(const wxString& path) const;
 	wxArrayString get_all_opened_documents() const;
 	wxArrayString get_all_documents() const;

app/main_window.cpp

@@ -774,23 +774,12 @@ void main_window::on_open_in_webview(wxCommandEvent&) {
 	if (text_ctrl == nullptr) return;
 	const long pos = text_ctrl->GetInsertionPoint();
 	try {
-		rust::String section_path = session_get_current_section_path(*tab->session_doc->session, pos);
+		const std::string temp_dir_utf8 = std::string(wxStandardPaths::Get().GetTempDir().ToUTF8());
+		auto target = session_webview_target(*tab->session_doc->session, pos, temp_dir_utf8);
 		wxString url_to_load;
-		wxString section_path_wx = wxString::FromUTF8(section_path.c_str());
-		wxString temp_base = wxStandardPaths::Get().GetTempDir();
-		size_t path_hash = std::hash<std::string>{}(std::string(tab->file_path.ToUTF8().data()));
-		wxString doc_temp_dir = temp_base + wxFileName::GetPathSeparator() + "paperback_" + std::to_string(path_hash);
-		if (!wxDirExists(doc_temp_dir)) wxFileName::Mkdir(doc_temp_dir, wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL);
-		if (!section_path.empty()) {
-			wxFileName temp_file(doc_temp_dir, wxFileName(section_path_wx).GetFullName());
-			bool success = session_extract_resource(*tab->session_doc->session, section_path, temp_file.GetFullPath().ToStdString());
-			if (success) url_to_load = wxFileSystem::FileNameToURL(temp_file);
-		}
-		if (url_to_load.IsEmpty()) {
-			wxFileName fn(tab->file_path);
-			wxString ext = fn.GetExt().Lower();
-			if (ext == "html" || ext == "htm" || ext == "xhtml" || ext == "md" || ext == "markdown")
-				url_to_load = wxFileSystem::FileNameToURL(fn);
+		if (target.found) {
+			const wxString path_wx = wxString::FromUTF8(target.path.c_str());
+			url_to_load = wxFileSystem::FileNameToURL(path_wx);
 		}
 		auto navigation_handler = [](const wxString& url) -> bool {
 			if (url.Lower().StartsWith("http://") || url.Lower().StartsWith("https://") || url.Lower().StartsWith("mailto:")) {

lib/src/bridge.rs

@@ -264,6 +264,11 @@ pub mod ffi {
 		pub total_chars: i64,
 	}
 
+	pub struct FfiWebViewTarget {
+		pub found: bool,
+		pub path: String,
+	}
+
 	extern "Rust" {
 		type ConfigManager;
 		type DocumentSession;
@@ -297,7 +302,6 @@ pub mod ffi {
 		fn config_manager_set_document_opened(manager: &mut ConfigManager, path: &str, opened: bool);
 		fn config_manager_get_document_opened(manager: &ConfigManager, path: &str) -> bool;
 		fn config_manager_remove_document_history(manager: &mut ConfigManager, path: &str);
-		fn config_manager_remove_navigation_history(manager: &mut ConfigManager, path: &str);
 		fn config_manager_get_all_opened_documents(manager: &ConfigManager) -> Vec<String>;
 		fn config_manager_get_all_documents(manager: &ConfigManager) -> Vec<String>;
 		fn config_manager_add_bookmark(manager: &mut ConfigManager, path: &str, start: i64, end: i64, note: &str);
@@ -486,8 +490,7 @@ pub mod ffi {
 		fn session_history_go_forward(session: &mut DocumentSession, current_pos: i64) -> FfiSessionNavResult;
 		fn session_activate_link(session: &mut DocumentSession, position: i64) -> FfiLinkActivationResult;
 		fn session_get_table_at_position(session: &DocumentSession, position: i64) -> String;
-		fn session_get_current_section_path(session: &DocumentSession, position: i64) -> String;
-		fn session_extract_resource(session: &DocumentSession, resource_path: &str, output_path: &str) -> Result<bool>;
+		fn session_webview_target(session: &DocumentSession, position: i64, temp_dir: &str) -> FfiWebViewTarget;
 		fn session_get_status_info(session: &DocumentSession, position: i64) -> FfiStatusInfo;
 		fn session_stats(session: &DocumentSession) -> FfiDocumentStats;
 		fn session_page_count(session: &DocumentSession) -> usize;
@@ -593,7 +596,6 @@ ffi_wrapper!(config_manager_get_document_position, get_document_position(path: &
 ffi_wrapper!(mut config_manager_set_document_opened, set_document_opened(path: &str, opened: bool));
 ffi_wrapper!(config_manager_get_document_opened, get_document_opened(path: &str) -> bool);
 ffi_wrapper!(mut config_manager_remove_document_history, remove_document_history(path: &str));
-ffi_wrapper!(mut config_manager_remove_navigation_history, remove_navigation_history(path: &str));
 ffi_wrapper!(config_manager_get_all_opened_documents, get_all_opened_documents -> Vec<String>);
 ffi_wrapper!(config_manager_get_all_documents, get_all_documents -> Vec<String>);
 
@@ -1091,12 +1093,9 @@ fn session_get_table_at_position(session: &DocumentSession, position: i64) -> St
 	session.get_table_at_position(position).unwrap_or_default()
 }
 
-fn session_get_current_section_path(session: &DocumentSession, position: i64) -> String {
-	session.get_current_section_path(position).unwrap_or_default()
-}
-
-fn session_extract_resource(session: &DocumentSession, resource_path: &str, output_path: &str) -> Result<bool, String> {
-	session.extract_resource(resource_path, output_path).map_err(|e| e.to_string())
+fn session_webview_target(session: &DocumentSession, position: i64, temp_dir: &str) -> ffi::FfiWebViewTarget {
+	let path = session.webview_target_path(position, temp_dir);
+	ffi::FfiWebViewTarget { found: path.is_some(), path: path.unwrap_or_default() }
 }
 
 fn session_get_status_info(session: &DocumentSession, position: i64) -> ffi::FfiStatusInfo {

lib/src/session.rs

@@ -1,9 +1,10 @@
 use std::{
-	fs::File,
+	fs::{self, File},
 	io::{BufReader, Write},
 	path::Path,
 };
 
+use sha1::{Digest, Sha1};
 use zip::ZipArchive;
 
 use crate::{
@@ -561,6 +562,30 @@ impl DocumentSession {
 		Some(marker.reference.clone())
 	}
 
+	#[must_use]
+	pub fn webview_target_path(&self, position: i64, temp_dir: &str) -> Option<String> {
+		let section_path = self.get_current_section_path(position).filter(|path| !path.is_empty());
+		if let Some(section_path) = section_path {
+			let mut hasher = Sha1::new();
+			hasher.update(self.file_path.as_bytes());
+			let hash = format!("{:x}", hasher.finalize());
+			let doc_temp_dir = Path::new(temp_dir).join(format!("paperback_{hash}"));
+			if fs::create_dir_all(&doc_temp_dir).is_ok() {
+				let file_name = Path::new(&section_path).file_name()?.to_string_lossy().to_string();
+				let output_path = doc_temp_dir.join(file_name);
+				let output_str = output_path.to_string_lossy().to_string();
+				if self.extract_resource(&section_path, &output_str).ok() == Some(true) {
+					return Some(output_str);
+				}
+			}
+		}
+		let ext = Path::new(&self.file_path).extension().map(|ext| ext.to_string_lossy().to_ascii_lowercase());
+		match ext.as_deref() {
+			Some("html") | Some("htm") | Some("xhtml") | Some("md") | Some("markdown") => Some(self.file_path.clone()),
+			_ => None,
+		}
+	}
+
 	/// Extracts a resource to the given output path.
 	///
 	/// # Errors