Code cleanup

visorcraft · visorcraft · commit 9de95abe0705 · 2026-06-17T07:29:41.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@
 .vscode/
 .idea/
 .zed/
+.opencode/
 
 # Python cache directories from project scripts (e.g. scripts/l10n-report.py)
 **/__pycache__/
diff --git a/apps/linsync-gui/Cargo.toml b/apps/linsync-gui/Cargo.toml
@@ -17,7 +17,6 @@ path = "src/main.rs"
 default = []
 cxxqt = ["dep:cxx", "dep:cxx-qt", "dep:cxx-qt-build", "dep:cxx-qt-lib", "dep:qt-build-utils"]
 cxxqt-app = ["cxxqt", "cxx-qt-lib/qt_gui", "cxx-qt-lib/qt_qml"]
-cxxqt-smoke = ["cxxqt"]
 test-support = []
 web-engine = ["linsync-core/web-engine"]
 
@@ -73,6 +72,5 @@ cxx-qt-build = { version = "0.8.1", optional = true }
 qt-build-utils = { version = "0.8.1", optional = true }
 
 [dev-dependencies]
-image = { workspace = true }
 sha2 = { workspace = true }
 tempfile = "3"
diff --git a/apps/linsync-gui/build.rs b/apps/linsync-gui/build.rs
@@ -28,12 +28,7 @@ fn main() {
             "qml/SessionsPage.qml",
             "qml/SettingsPage.qml",
         ]);
-        rust_sources.push("src/cxxqt_session.rs");
-    }
-
-    if cfg!(feature = "cxxqt-smoke") {
-        module = module.qml_file("qml/CxxQtSmoke.qml");
-        rust_sources.push("src/cxxqt_smoke.rs");
+        rust_sources.push("src/cxxqt_translator.rs");
     }
 
     let mut builder = CxxQtBuilder::new_qml_module(module);
diff --git a/apps/linsync-gui/qml/CxxQtSmoke.qml b/apps/linsync-gui/qml/CxxQtSmoke.qml
diff --git a/apps/linsync-gui/src/bridge.rs b/apps/linsync-gui/src/bridge.rs
@@ -4709,7 +4709,7 @@ pub(crate) fn run_cxxqt_host(
     // No-op when no catalog matches the locale, so the English source strings
     // remain. Must run before the engine loads QML so qsTr() resolves.
     if let Some(i18n_dir) = qml_root.parent().map(|p| p.join("i18n")) {
-        let loaded = crate::cxxqt_session::ffi::linsync_install_translator(&QString::from(
+        let loaded = crate::cxxqt_translator::ffi::linsync_install_translator(&QString::from(
             i18n_dir.to_string_lossy().as_ref(),
         ));
         if loaded {
diff --git a/apps/linsync-gui/src/cxxqt_smoke.rs b/apps/linsync-gui/src/cxxqt_smoke.rs
diff --git a/apps/linsync-gui/src/cxxqt_translator.rs b/apps/linsync-gui/src/cxxqt_translator.rs
diff --git a/apps/linsync-gui/src/main.rs b/apps/linsync-gui/src/main.rs
@@ -40,9 +40,7 @@ const GUI_TAB_SNAPSHOT_SCHEMA_VERSION: u32 = 1;
 const GUI_TABS_SNAPSHOT_KEY: &str = "gui_tabs_snapshot";
 
 #[cfg(feature = "cxxqt-app")]
-mod cxxqt_session;
-#[cfg(feature = "cxxqt-smoke")]
-mod cxxqt_smoke;
+mod cxxqt_translator;
 #[cfg(feature = "cxxqt-app")]
 mod icon_theme;
 
@@ -3919,7 +3917,6 @@ fn summary_item_string(label: &str, value: String) -> GuiSummaryItem {
 }
 
 mod bridge;
-#[allow(unused_imports)]
 pub(crate) use bridge::*;
 
 #[cfg(test)]
diff --git a/crates/linsync-cli/Cargo.toml b/crates/linsync-cli/Cargo.toml
@@ -16,4 +16,3 @@ serde_json.workspace = true
 [dev-dependencies]
 image = { workspace = true }
 tempfile = "3"
-serde_json = { workspace = true }
diff --git a/crates/linsync-core/src/archive.rs b/crates/linsync-core/src/archive.rs
@@ -92,6 +92,7 @@ pub fn compare_builtin_archives_with_dirs<
 /// the folder compare engine over the extracted trees.
 ///
 /// `TempDir` handles cleanup automatically when the returned result is dropped.
+#[cfg(test)]
 pub fn compare_builtin_archives<P: AsRef<Path>>(
     left: P,
     right: P,
diff --git a/crates/linsync-core/src/image.rs b/crates/linsync-core/src/image.rs
@@ -604,20 +604,6 @@ fn compare_decoded_same_size(
     }
 }
 
-/// Compare every frame of two animated (or still) images pairwise. Reports a
-/// per-frame summary plus aggregate pixel counts; a frame-count mismatch marks
-/// the extra frames as one-sided (their full pixel count counted as differing)
-/// and the overall result as different. Aggregate `differing_pixels`/`diff_ratio`
-/// are pixel-count-weighted across frames (a larger frame contributes more); use
-/// `per_frame_summaries` for un-weighted per-frame ratios.
-pub fn compare_images_all_frames(
-    left: &Path,
-    right: &Path,
-    options: &ImageCompareOptions,
-) -> Result<ImageCompareResult, ImageCompareError> {
-    compare_images_all_frames_cancellable(left, right, options, &NEVER_CANCELLED)
-}
-
 fn compare_images_all_frames_cancellable(
     left: &Path,
     right: &Path,
diff --git a/crates/linsync-core/src/lib.rs b/crates/linsync-core/src/lib.rs
@@ -21,10 +21,7 @@ pub mod trash;
 pub mod webpage;
 
 #[cfg(feature = "sandbox")]
-pub use archive::{
-    ArchiveError, compare_builtin_archives, compare_builtin_archives_with_dirs,
-    is_builtin_archive_format,
-};
+pub use archive::{ArchiveError, compare_builtin_archives_with_dirs, is_builtin_archive_format};
 pub use archive_write::{
     ArchiveEditCaps, ArchiveWriteError, CommitOptions, CommitOutcome, MemberEditContext,
     commit_member_edit, extract_member_for_edit, extract_member_for_edit_with_caps,
@@ -59,9 +56,8 @@ pub use folder::{
 #[cfg(feature = "image-compare")]
 pub use image::{
     FrameCompareMode, FrameSummary, ImageCompareError, ImageCompareMode, ImageCompareOptions,
-    ImageCompareResult, ImageFormatSupport, compare_images, compare_images_all_frames,
-    compare_images_cancellable, compare_images_streaming, generate_overlay,
-    supported_image_formats,
+    ImageCompareResult, ImageFormatSupport, compare_images, compare_images_cancellable,
+    compare_images_streaming, generate_overlay, supported_image_formats,
 };
 pub use logging::{LoggingError, init_file_logging, install_panic_log_hook};
 pub use merge::{
@@ -72,16 +68,16 @@ pub use merge::{
 };
 pub use paths::AppPaths;
 pub use plugin::{
-    CURRENT_PLUGIN_PROTOCOL_VERSION, CURRENT_PLUGIN_SCHEMA_VERSION, DiscoveredPlugin,
-    ExtractMemberResponse, PluginCancellationToken, PluginChunk, PluginClass, PluginDiagnostic,
-    PluginDiscovery, PluginDiscoveryError, PluginError, PluginExecutionOptions,
-    PluginExecutionResult, PluginInputDescriptor, PluginManifest, PluginOperation,
-    PluginOperationError, PluginOperationOutput, PluginOperationRequest, PluginOperationResponse,
-    PluginOperationStatus, PluginOption, PluginOptionError, PluginOptionKind, PluginOutputKind,
-    PluginOutputStream, PluginProbeOutcome, PluginSandbox, PluginStoreError,
-    PluginTextOperationOptions, PluginTextResult, PredifferConflictPolicy, RenderPagesResponse,
-    SandboxStatus, UnpackFolderResponse, VirtualNode, WordPosition, active_sandbox_status,
-    clear_plugin_option, compare_archives_with_unpacker, compare_archives_with_unpacker_recursive,
+    CURRENT_PLUGIN_SCHEMA_VERSION, DiscoveredPlugin, ExtractMemberResponse,
+    PluginCancellationToken, PluginChunk, PluginClass, PluginDiagnostic, PluginDiscovery,
+    PluginDiscoveryError, PluginError, PluginExecutionOptions, PluginExecutionResult,
+    PluginInputDescriptor, PluginManifest, PluginOperation, PluginOperationError,
+    PluginOperationOutput, PluginOperationRequest, PluginOperationResponse, PluginOperationStatus,
+    PluginOption, PluginOptionError, PluginOptionKind, PluginOutputKind, PluginOutputStream,
+    PluginProbeOutcome, PluginSandbox, PluginStoreError, PluginTextOperationOptions,
+    PluginTextResult, PredifferConflictPolicy, RenderPagesResponse, SandboxStatus,
+    UnpackFolderResponse, VirtualNode, WordPosition, active_sandbox_status, clear_plugin_option,
+    compare_archives_with_unpacker, compare_archives_with_unpacker_recursive,
     discover_installed_plugins, discover_plugins, extract_archive_member, install_plugin,
     is_plugin_enabled_for_profile, is_plugin_trusted, is_stable_plugin_id, load_plugin_enabled_map,
     load_plugin_options, load_plugin_trusted_map, plugin_discovery_roots, probe_plugin,
@@ -94,8 +90,7 @@ pub use plugin::{
 };
 pub use profile::builtin::{builtin_profile_ids, builtin_profiles, find_builtin};
 pub use profile::{
-    ActiveProfilePointer, CURRENT_PROFILE_SCHEMA_VERSION, CompareProfile, ProfileId, ProfileStore,
-    ProfileStoreError, ProfileValidationError,
+    CompareProfile, ProfileId, ProfileStore, ProfileStoreError, ProfileValidationError,
 };
 pub use storage::{
     ArtifactManifest, CompareArtifact, CompareViewMode, FilterStore, NamedFilters, ProjectFile,
@@ -118,8 +113,8 @@ pub use text::{
     TextFindOptions, TextInputEncoding, TextRegexRuleSet, TextRenderMode, TextSubstitution,
     TextViewPage, TextViewRow, builtin_text_regex_rule_sets, compare_documents,
     compare_documents_cancellable, compare_text, compare_text_files,
-    compare_text_files_cancellable, compare_text_files_with_prediffer,
-    compare_text_files_with_prediffer_chain, text_regex_rule_set,
+    compare_text_files_with_prediffer, compare_text_files_with_prediffer_chain,
+    text_regex_rule_set,
 };
 pub use trash::{
     DeleteBackend, DeleteError, DeleteOutcome, DeletePlan, DeletePreference, DeleteRestoreGuidance,
diff --git a/crates/linsync-core/src/paths.rs b/crates/linsync-core/src/paths.rs
@@ -70,10 +70,6 @@ impl AppPaths {
         self.config_dir.join("profiles")
     }
 
-    pub fn profile_file(&self, profile_id: &str) -> PathBuf {
-        self.profiles_dir().join(format!("{profile_id}.json"))
-    }
-
     /// Records the user's active-profile pointer:
     /// `$XDG_CONFIG_HOME/linsync/active-profile.json`.
     pub fn active_profile_pointer_file(&self) -> PathBuf {
diff --git a/crates/linsync-core/src/plugin.rs b/crates/linsync-core/src/plugin.rs
@@ -15,7 +15,7 @@ use crate::paths::AppPaths;
 
 pub const PLUGIN_MANIFEST_FILE: &str = "linsync-plugin.json";
 pub const CURRENT_PLUGIN_SCHEMA_VERSION: u32 = 1;
-pub const CURRENT_PLUGIN_PROTOCOL_VERSION: u32 = 1;
+pub(crate) const CURRENT_PLUGIN_PROTOCOL_VERSION: u32 = 1;
 
 fn current_plugin_schema_version() -> u32 {
     CURRENT_PLUGIN_SCHEMA_VERSION
diff --git a/crates/linsync-core/src/profile/mod.rs b/crates/linsync-core/src/profile/mod.rs
@@ -52,7 +52,7 @@ use crate::webpage::WebpageCompareOptions;
 /// can't safely consume. `ProfileStore::load` upgrades older versions
 /// to this version on read; if a profile carries a newer
 /// `schema_version` the store refuses to load it.
-pub const CURRENT_PROFILE_SCHEMA_VERSION: u32 = 1;
+pub(crate) const CURRENT_PROFILE_SCHEMA_VERSION: u32 = 1;
 
 /// Stable identifier for a profile, used in file names and active-profile
 /// pointers. Must be ASCII kebab-case (`[a-z0-9-]+`) and non-empty.
@@ -250,7 +250,9 @@ impl CompareProfile {
     /// Parse a profile from its raw JSON representation, upgrading older
     /// schema versions to the current one. Returns an error if the JSON is
     /// malformed or if the profile declares a future schema version.
-    pub fn migrate_from_legacy(raw: serde_json::Value) -> Result<Self, ProfileMigrationError> {
+    pub(crate) fn migrate_from_legacy(
+        raw: serde_json::Value,
+    ) -> Result<Self, ProfileMigrationError> {
         let version = parse_schema_version(&raw)?;
 
         if version > CURRENT_PROFILE_SCHEMA_VERSION {
@@ -330,7 +332,7 @@ impl std::fmt::Display for ProfileValidationError {
 impl std::error::Error for ProfileValidationError {}
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ProfileMigrationError {
+pub(crate) enum ProfileMigrationError {
     Parse { message: String },
     Validation(ProfileValidationError),
 }
@@ -351,7 +353,7 @@ impl std::error::Error for ProfileMigrationError {}
 /// additional fields; readers tolerate them via `serde(default)`.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-pub struct ActiveProfilePointer {
+pub(crate) struct ActiveProfilePointer {
     pub schema_version: u32,
     pub profile_id: ProfileId,
 }
diff --git a/crates/linsync-core/src/storage.rs b/crates/linsync-core/src/storage.rs
@@ -178,10 +178,6 @@ impl ThemePreference {
         }
     }
 
-    pub fn theme_value(self) -> u8 {
-        self as u8
-    }
-
     pub fn from_legacy_key(value: &str) -> Option<Self> {
         match value {
             "system" => Some(Self::System),
@@ -329,17 +325,20 @@ impl SettingsStore {
         write_json(&self.path, settings)
     }
 
+    #[cfg(test)]
     pub fn import_from(&self, source: &Path) -> Result<Settings, StoreError> {
         let settings = read_json::<Settings>(source)?.validate_current_schema()?;
         self.save(&settings)?;
         Ok(settings)
     }
 
+    #[cfg(test)]
     pub fn export_to(&self, destination: &Path) -> Result<(), StoreError> {
         let settings = self.load_or_default()?;
         write_json(destination, &settings)
     }
 
+    #[cfg(test)]
     pub fn backup_to(&self, destination: &Path) -> Result<(), StoreError> {
         self.export_to(destination)
     }
diff --git a/crates/linsync-core/src/text.rs b/crates/linsync-core/src/text.rs
@@ -738,26 +738,6 @@ pub fn compare_text_files(
     Ok(compare_documents(left_document, right_document, options))
 }
 
-/// Cancellable variant of [`compare_text_files`]. `should_cancel` is polled
-/// before and during the (O(n·m)) LCS construction; returning `true` aborts the
-/// compare and yields `Ok(None)`. Used by the GUI bridge to honour the Stop
-/// button on large-file text compares.
-pub fn compare_text_files_cancellable(
-    left: &Path,
-    right: &Path,
-    options: &TextCompareOptions,
-    should_cancel: &dyn Fn() -> bool,
-) -> io::Result<Option<TextCompareResult>> {
-    let left_document = TextDocument::from_path_with_encoding(left, options.encoding)?;
-    let right_document = TextDocument::from_path_with_encoding(right, options.encoding)?;
-    Ok(compare_documents_cancellable(
-        left_document,
-        right_document,
-        options,
-        should_cancel,
-    ))
-}
-
 /// Apply a prediffer plugin to both sides before comparing.
 ///
 /// If `prediffer_plugin_dir` is `Some` and the plugin is a valid prediffer,
diff --git a/crates/linsync-webengine/Cargo.toml b/crates/linsync-webengine/Cargo.toml
@@ -5,9 +5,6 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 
-[features]
-default = []
-
 [dependencies]
 
 [dev-dependencies]
diff --git a/crates/linsync-webengine/src/lib.rs b/crates/linsync-webengine/src/lib.rs
@@ -289,11 +289,11 @@ fn read_tail(path: &Path, max_bytes: usize) -> String {
 ///
 /// Privacy contract: the browser runs against a LinSync-owned profile
 /// (`--user-data-dir` under [`WebEngineOptions::profile_storage_dir`]) — it
-/// never touches the user's real browser profile. "Ephemeral" here means
-/// wiped-by-[`clear_profile`]: the directory persists between renders (so
-/// per-URL cache survives), and concurrent renders would contend on
-/// Chromium's `SingletonLock` in it — fine today because core renders
-/// sequentially (left, then right).
+/// never touches the user's real browser profile. The directory is ephemeral
+/// (cleaned up by the caller after rendering), but it persists between renders
+/// so per-URL cache survives; concurrent renders would contend on Chromium's
+/// `SingletonLock` in it — fine today because core renders sequentially (left,
+/// then right).
 fn render_url_chromium(
     binary: &Path,
     url: &str,
@@ -523,6 +523,10 @@ Item {{
 }
 
 /// Delete all Qt WebEngine profile data under `profile_storage_dir`.
+///
+/// Test-only helper kept for idempotency coverage; production callers own
+/// profile cleanup via `linsync_core::webpage::WebProfileDir`.
+#[cfg(test)]
 pub fn clear_profile(options: &WebEngineOptions) -> Result<(), WebEngineError> {
     let dir = &options.profile_storage_dir;
     if dir.exists() {
diff --git a/tests/fixtures/document/simple.odt b/tests/fixtures/document/simple.odt
