From bd2b45e1c1c35993289a5a3f45052bed57051d94 Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Fri, 28 Nov 2025 12:44:11 +0800 Subject: [PATCH] refactor(extensions): move windows-thumbnail to extensions (#2562) --- .../thumbnail => extensions/windows-thumbnail}/Cargo.lock | 0 .../thumbnail => extensions/windows-thumbnail}/Cargo.toml | 2 +- .../thumbnail => extensions/windows-thumbnail}/README.md | 0 .../windows-thumbnail/src}/com_provider.rs | 0 .../windows-thumbnail/src}/extraction.rs | 2 +- .../thumbnail => extensions/windows-thumbnail/src}/mod.rs | 0 apps/readest-app/src-tauri/build.rs | 7 +++++-- 7 files changed, 7 insertions(+), 4 deletions(-) rename apps/readest-app/{src-tauri/src/windows/thumbnail => extensions/windows-thumbnail}/Cargo.lock (100%) rename apps/readest-app/{src-tauri/src/windows/thumbnail => extensions/windows-thumbnail}/Cargo.toml (97%) rename apps/readest-app/{src-tauri/src/windows/thumbnail => extensions/windows-thumbnail}/README.md (100%) rename apps/readest-app/{src-tauri/src/windows/thumbnail => extensions/windows-thumbnail/src}/com_provider.rs (100%) rename apps/readest-app/{src-tauri/src/windows/thumbnail => extensions/windows-thumbnail/src}/extraction.rs (99%) rename apps/readest-app/{src-tauri/src/windows/thumbnail => extensions/windows-thumbnail/src}/mod.rs (100%) diff --git a/apps/readest-app/src-tauri/src/windows/thumbnail/Cargo.lock b/apps/readest-app/extensions/windows-thumbnail/Cargo.lock similarity index 100% rename from apps/readest-app/src-tauri/src/windows/thumbnail/Cargo.lock rename to apps/readest-app/extensions/windows-thumbnail/Cargo.lock diff --git a/apps/readest-app/src-tauri/src/windows/thumbnail/Cargo.toml b/apps/readest-app/extensions/windows-thumbnail/Cargo.toml similarity index 97% rename from apps/readest-app/src-tauri/src/windows/thumbnail/Cargo.toml rename to apps/readest-app/extensions/windows-thumbnail/Cargo.toml index bf00d779..b35eb53e 100644 --- a/apps/readest-app/src-tauri/src/windows/thumbnail/Cargo.toml +++ b/apps/readest-app/extensions/windows-thumbnail/Cargo.toml @@ -8,7 +8,7 @@ publish = false [lib] name = "windows_thumbnail" -path = "mod.rs" +path = "src/mod.rs" crate-type = ["cdylib"] [dependencies] diff --git a/apps/readest-app/src-tauri/src/windows/thumbnail/README.md b/apps/readest-app/extensions/windows-thumbnail/README.md similarity index 100% rename from apps/readest-app/src-tauri/src/windows/thumbnail/README.md rename to apps/readest-app/extensions/windows-thumbnail/README.md diff --git a/apps/readest-app/src-tauri/src/windows/thumbnail/com_provider.rs b/apps/readest-app/extensions/windows-thumbnail/src/com_provider.rs similarity index 100% rename from apps/readest-app/src-tauri/src/windows/thumbnail/com_provider.rs rename to apps/readest-app/extensions/windows-thumbnail/src/com_provider.rs diff --git a/apps/readest-app/src-tauri/src/windows/thumbnail/extraction.rs b/apps/readest-app/extensions/windows-thumbnail/src/extraction.rs similarity index 99% rename from apps/readest-app/src-tauri/src/windows/thumbnail/extraction.rs rename to apps/readest-app/extensions/windows-thumbnail/src/extraction.rs index 5490c586..07017ee8 100644 --- a/apps/readest-app/src-tauri/src/windows/thumbnail/extraction.rs +++ b/apps/readest-app/extensions/windows-thumbnail/src/extraction.rs @@ -434,7 +434,7 @@ pub fn create_thumbnail_with_overlay(cover_bytes: &[u8], requested_size: u32) -> /// Load the Readest overlay icon. fn load_overlay_icon() -> Option { // Try embedded icon - let icon_bytes = include_bytes!("../../../../public/icon.png"); + let icon_bytes = include_bytes!("../../../public/icon.png"); if let Ok(img) = image::load_from_memory(icon_bytes) { return Some(img); } diff --git a/apps/readest-app/src-tauri/src/windows/thumbnail/mod.rs b/apps/readest-app/extensions/windows-thumbnail/src/mod.rs similarity index 100% rename from apps/readest-app/src-tauri/src/windows/thumbnail/mod.rs rename to apps/readest-app/extensions/windows-thumbnail/src/mod.rs diff --git a/apps/readest-app/src-tauri/build.rs b/apps/readest-app/src-tauri/build.rs index c9e95029..722d9e68 100644 --- a/apps/readest-app/src-tauri/build.rs +++ b/apps/readest-app/src-tauri/build.rs @@ -1,7 +1,7 @@ use std::{env, fs, path::PathBuf, process::Command}; fn main() { - println!("cargo:rerun-if-changed=src/windows/thumbnail"); + println!("cargo:rerun-if-changed=../extensions/windows-thumbnail/src"); let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap_or_default(); if target_os == "windows" { build_windows_thumbnail(); @@ -12,7 +12,10 @@ fn main() { fn build_windows_thumbnail() { let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()); - let dll_crate_dir = manifest_dir.join("src/windows/thumbnail"); + let dll_crate_dir = manifest_dir + .join("..") + .join("extensions") + .join("windows-thumbnail"); let dll_crate_manifest = dll_crate_dir.join("Cargo.toml"); let profile = env::var("PROFILE").unwrap_or_else(|_| "debug".into());