Moved more recent documents logic into Rust, ditched unused FFI helpers.

Author: trypsynth

app/config_manager.cpp

@@ -28,9 +28,6 @@ std::vector<long> to_long_vector(const rust::Vec<long long>& values) {
 	return result;
 }
 
-bookmark to_bookmark(const FfiBookmark& fb) {
-	return bookmark(static_cast<long>(fb.start), static_cast<long>(fb.end), to_wx_string(fb.note));
-}
 } // namespace
 
 config_manager::~config_manager() {
@@ -84,27 +81,6 @@ void config_manager::add_recent_document(const wxString& path) {
 	if (is_initialized()) config_manager_add_recent_document(backend_mut(), to_utf8(path));
 }
 
-wxArrayString config_manager::get_recent_documents() const {
-	if (!is_initialized()) return {};
-	return to_wx_array(config_manager_get_recent_documents(backend_ref()));
-}
-
-void config_manager::clear_recent_documents() {
-	if (is_initialized()) config_manager_clear_recent_documents(backend_mut());
-}
-
-void config_manager::add_opened_document(const wxString& path) {
-	if (is_initialized()) config_manager_add_opened_document(backend_mut(), to_utf8(path));
-}
-
-void config_manager::remove_opened_document(const wxString& path) {
-	if (is_initialized()) config_manager_remove_opened_document(backend_mut(), to_utf8(path));
-}
-
-void config_manager::clear_opened_documents() {
-	if (is_initialized()) config_manager_clear_opened_documents(backend_mut());
-}
-
 void config_manager::set_document_position(const wxString& path, long position) {
 	if (is_initialized()) config_manager_set_document_position(backend_mut(), to_utf8(path), static_cast<std::int64_t>(position));
 }
@@ -176,31 +152,6 @@ void config_manager::update_bookmark_note(const wxString& path, long start, long
 	if (is_initialized()) config_manager_update_bookmark_note(backend_mut(), to_utf8(path), static_cast<std::int64_t>(start), static_cast<std::int64_t>(end), to_utf8(note));
 }
 
-std::vector<bookmark> config_manager::get_bookmarks(const wxString& path) const {
-	if (!is_initialized()) return {};
-	const auto rust_bookmarks = config_manager_get_bookmarks(backend_ref(), to_utf8(path));
-	std::vector<bookmark> result;
-	result.reserve(rust_bookmarks.size());
-	std::transform(rust_bookmarks.begin(), rust_bookmarks.end(), std::back_inserter(result), [](const FfiBookmark& bm) {
-		return to_bookmark(bm);
-	});
-	return result;
-}
-
-void config_manager::clear_bookmarks(const wxString& path) {
-	if (is_initialized()) config_manager_clear_bookmarks(backend_mut(), to_utf8(path));
-}
-
-bookmark config_manager::get_next_bookmark(const wxString& path, long current_position) const {
-	if (!is_initialized()) return bookmark(-1, -1);
-	return to_bookmark(config_manager_get_next_bookmark(backend_ref(), to_utf8(path), static_cast<std::int64_t>(current_position)));
-}
-
-bookmark config_manager::get_previous_bookmark(const wxString& path, long current_position) const {
-	if (!is_initialized()) return bookmark(-1, -1);
-	return to_bookmark(config_manager_get_previous_bookmark(backend_ref(), to_utf8(path), static_cast<std::int64_t>(current_position)));
-}
-
 void config_manager::set_document_format(const wxString& path, const wxString& format) {
 	if (is_initialized()) config_manager_set_document_format(backend_mut(), to_utf8(path), to_utf8(format));
 }

app/config_manager.hpp

@@ -26,14 +26,6 @@ struct bookmark {
 	bookmark() : start{0}, end{0}, note{wxEmptyString} {
 	}
 
-	bool is_whole_line() const {
-		return start == end;
-	}
-
-	bool has_note() const {
-		return !note.IsEmpty();
-	}
-
 	bool operator==(const bookmark& other) const {
 		return start == other.start && end == other.end;
 	}
@@ -81,11 +73,6 @@ class config_manager {
 	}
 
 	void add_recent_document(const wxString& path);
-	wxArrayString get_recent_documents() const;
-	void clear_recent_documents();
-	void add_opened_document(const wxString& path);
-	void remove_opened_document(const wxString& path);
-	void clear_opened_documents();
 	void set_document_position(const wxString& path, long position);
 	long get_document_position(const wxString& path) const;
 	void set_navigation_history(const wxString& path, const std::vector<long>& history, size_t history_index);
@@ -100,10 +87,6 @@ class config_manager {
 	void remove_bookmark(const wxString& path, long start, long end);
 	void toggle_bookmark(const wxString& path, long start, long end, const wxString& note = wxEmptyString);
 	void update_bookmark_note(const wxString& path, long start, long end, const wxString& note);
-	std::vector<bookmark> get_bookmarks(const wxString& path) const;
-	void clear_bookmarks(const wxString& path);
-	bookmark get_next_bookmark(const wxString& path, long current_position) const;
-	bookmark get_previous_bookmark(const wxString& path, long current_position) const;
 	void set_document_format(const wxString& path, const wxString& format);
 	wxString get_document_format(const wxString& path) const;
 	void set_document_password(const wxString& path, const wxString& password);

app/main_window.cpp

@@ -1007,9 +1007,9 @@ void main_window::on_recent_document(wxCommandEvent& event) {
 	const int id = event.GetId();
 	const int index = id - ID_RECENT_DOCUMENTS_BASE;
 	auto& config_mgr = wxGetApp().get_config_manager();
-	const wxArrayString recent_docs = config_mgr.get_recent_documents();
-	if (index >= 0 && index < static_cast<int>(recent_docs.GetCount())) {
-		const wxString& path = recent_docs[index];
+	auto recent_docs = get_recent_documents_for_menu(config_mgr.backend_for_ffi(), config_mgr.get(config_manager::recent_documents_to_show));
+	if (index >= 0 && index < static_cast<int>(recent_docs.size())) {
+		const wxString path = wxString::FromUTF8(recent_docs[static_cast<size_t>(index)].path.c_str());
 		[[maybe_unused]] const bool success = doc_manager->open_file(path);
 	}
 }

lib/src/bridge.rs

@@ -214,12 +214,6 @@ pub mod ffi {
 		pub closest_index: i32,
 	}
 
-	pub struct FfiBookmark {
-		pub start: i64,
-		pub end: i64,
-		pub note: String,
-	}
-
 	pub struct FfiNavigationHistory {
 		pub positions: Vec<i64>,
 		pub index: usize,
@@ -298,11 +292,6 @@ pub mod ffi {
 		fn config_manager_set_doc_bool(manager: &mut ConfigManager, path: &str, key: &str, value: bool);
 		fn config_manager_set_doc_int(manager: &mut ConfigManager, path: &str, key: &str, value: i64);
 		fn config_manager_add_recent_document(manager: &mut ConfigManager, path: &str);
-		fn config_manager_get_recent_documents(manager: &ConfigManager) -> Vec<String>;
-		fn config_manager_clear_recent_documents(manager: &mut ConfigManager);
-		fn config_manager_add_opened_document(manager: &mut ConfigManager, path: &str);
-		fn config_manager_remove_opened_document(manager: &mut ConfigManager, path: &str);
-		fn config_manager_clear_opened_documents(manager: &mut ConfigManager);
 		fn config_manager_set_document_position(manager: &mut ConfigManager, path: &str, position: i64);
 		fn config_manager_get_document_position(manager: &ConfigManager, path: &str) -> i64;
 		fn config_manager_set_navigation_history(
@@ -328,14 +317,6 @@ pub mod ffi {
 			end: i64,
 			note: &str,
 		);
-		fn config_manager_get_bookmarks(manager: &ConfigManager, path: &str) -> Vec<FfiBookmark>;
-		fn config_manager_clear_bookmarks(manager: &mut ConfigManager, path: &str);
-		fn config_manager_get_next_bookmark(manager: &ConfigManager, path: &str, current_position: i64) -> FfiBookmark;
-		fn config_manager_get_previous_bookmark(
-			manager: &ConfigManager,
-			path: &str,
-			current_position: i64,
-		) -> FfiBookmark;
 		fn config_manager_set_document_format(manager: &mut ConfigManager, path: &str, format: &str);
 		fn config_manager_get_document_format(manager: &ConfigManager, path: &str) -> String;
 		fn config_manager_set_document_password(manager: &mut ConfigManager, path: &str, password: &str);
@@ -531,7 +512,7 @@ use std::{fs::File, path::Path};
 
 use self::ffi::UpdateStatus;
 use crate::{
-	config::{Bookmark, ConfigManager as RustConfigManager, NavigationHistory},
+	config::{ConfigManager as RustConfigManager, NavigationHistory},
 	document::{DocumentHandle, TocItem},
 	parser, update as update_module,
 	utils::{encoding, text, zip as zip_module},
@@ -611,11 +592,6 @@ fn config_manager_set_doc_int(manager: &mut RustConfigManager, path: &str, key:
 }
 
 ffi_wrapper!(mut config_manager_add_recent_document, add_recent_document(path: &str));
-ffi_wrapper!(config_manager_get_recent_documents, get_recent_documents -> Vec<String>);
-ffi_wrapper!(mut config_manager_clear_recent_documents, clear_recent_documents);
-ffi_wrapper!(mut config_manager_add_opened_document, add_opened_document(path: &str));
-ffi_wrapper!(mut config_manager_remove_opened_document, remove_opened_document(path: &str));
-ffi_wrapper!(mut config_manager_clear_opened_documents, clear_opened_documents);
 ffi_wrapper!(mut config_manager_set_document_position, set_document_position(path: &str, position: i64));
 ffi_wrapper!(config_manager_get_document_position, get_document_position(path: &str) -> i64);
 
@@ -656,28 +632,6 @@ fn config_manager_update_bookmark_note(manager: &mut RustConfigManager, path: &s
 	manager.update_bookmark_note(path, start, end, note);
 }
 
-fn config_manager_get_bookmarks(manager: &RustConfigManager, path: &str) -> Vec<ffi::FfiBookmark> {
-	manager.get_bookmarks(path).into_iter().map(Into::into).collect()
-}
-
-ffi_wrapper!(mut config_manager_clear_bookmarks, clear_bookmarks(path: &str));
-
-fn config_manager_get_next_bookmark(
-	manager: &RustConfigManager,
-	path: &str,
-	current_position: i64,
-) -> ffi::FfiBookmark {
-	manager.get_next_bookmark(path, current_position).into()
-}
-
-fn config_manager_get_previous_bookmark(
-	manager: &RustConfigManager,
-	path: &str,
-	current_position: i64,
-) -> ffi::FfiBookmark {
-	manager.get_previous_bookmark(path, current_position).into()
-}
-
 ffi_wrapper!(mut config_manager_set_document_format, set_document_format(path: &str, format: &str));
 ffi_wrapper!(config_manager_get_document_format, get_document_format(path: &str) -> String);
 ffi_wrapper!(mut config_manager_set_document_password, set_document_password(path: &str, password: &str));
@@ -688,12 +642,6 @@ ffi_wrapper!(config_manager_export_document_settings, export_document_settings(d
 ffi_wrapper!(mut config_manager_import_document_settings, import_document_settings(path: &str));
 ffi_wrapper!(mut config_manager_import_settings_from_file, import_settings_from_file(doc_path: &str, import_path: &str));
 
-impl From<Bookmark> for ffi::FfiBookmark {
-	fn from(bookmark: Bookmark) -> Self {
-		Self { start: bookmark.start, end: bookmark.end, note: bookmark.note }
-	}
-}
-
 fn check_for_updates(current_version: &str, is_installer: bool) -> ffi::UpdateResult {
 	match update_module::check_for_updates(current_version, is_installer) {
 		Ok(outcome) => match outcome {