Merge pull request #1 from Silwings-git/v1.0.4

编组级快捷方式,自定义启动参数与bug修复

Author: Silwings-git

package.json

@@ -1,7 +1,7 @@
 {
   "name": "one-click-launch",
   "private": true,
-  "version": "1.0.3",
+  "version": "1.0.4",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "one-click-launch"
-version = "1.0.3"
+version = "1.0.4"
 description = "One Click Launch"
 authors = ["Silwings"]
 edition = "2024"
@@ -31,14 +31,16 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 thiserror = "2.0.3"
 anyhow = "1.0.93"
-tracing = "0.1" # 日志处理
-tracing-subscriber = "0.3" # 日志处理
+tracing = "0.1"
+tracing-subscriber = "0.3"
 windows = "0.58.0"
 sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "sqlite"] }
 tokio = { version = "1.43.0", features = ["full"] }
 rand = "0.8.5"
 lazy_static = "1.5.0"
 itertools = "0.14.0"
+dirs = "5.0.1"
+shlex = "1.3.0"
 
 [features]
 portable = []

src-tauri/Cargo.toml

@@ -1,12 +1,15 @@
+use std::{path::Path, process::Command};
+
 use anyhow::Result;
 use rand::{Rng, distributions::Alphanumeric};
 use serde::Deserialize;
-use tauri::{AppHandle, State};
+use tauri::{AppHandle, Manager, State};
 use tauri_plugin_opener::OpenerExt;
 use tracing::info;
 
 use crate::{
     DatabaseManager,
+    api::window_api,
     db::{
         launcher,
         launcher_resource::{self, CreateResourceParam, LauncherResource},
@@ -283,6 +286,17 @@ pub async fn modify_resource_name(
     Ok(())
 }
 
+/// 修改资源路径
+#[tauri::command]
+pub async fn modify_resource_path(
+    db: State<'_, DatabaseManager>,
+    resource_id: i64,
+    path: &str,
+) -> Result<(), OneClickLaunchError> {
+    launcher_resource::modify_path(&db.pool, resource_id, path).await?;
+    Ok(())
+}
+
 /// 删除启动器中的资源
 #[tauri::command]
 pub async fn delete_resource(
@@ -295,12 +309,26 @@ pub async fn delete_resource(
 
 /// 启动启动器
 #[tauri::command]
-pub async fn launch(
-    app: AppHandle,
-    db: State<'_, DatabaseManager>,
-    launcher_id: i64,
-) -> Result<(), OneClickLaunchError> {
-    let resources = launcher_resource::query_by_launcher_id(&db.pool, launcher_id).await?;
+pub async fn launch(app: AppHandle, launcher_id: i64) -> Result<(), OneClickLaunchError> {
+    let db: State<'_, DatabaseManager> = app.try_state().ok_or(
+        OneClickLaunchError::ExecutionError("Unable to get DatabaseManager".to_string()),
+    )?;
+
+    let mut resources = launcher_resource::query_by_launcher_id(&db.pool, launcher_id).await?;
+
+    tracing::debug!("启动编组原始资源列表: {resources:?}");
+
+    // 必须从启动资源中排除自己,防止出现死循环
+    let app_path = current_exe_path_str()?;
+    resources.retain(|e| {
+        // 检查路径是否指向当前应用程序
+        !e.path.starts_with(&app_path)
+    });
+
+    if resources.is_empty() {
+        tracing::debug!("资源列表为空");
+        return Ok(());
+    }
 
     launch_resources(&app, &resources);
 
@@ -342,8 +370,78 @@ pub fn launch_resources(app: &AppHandle, resources: &[LauncherResource]) {
 /// - `Ok(())` 表示操作成功。
 /// - `Err(OneClickLaunchError)` 表示操作失败。
 pub fn open_using_default_program(app: &AppHandle, path: &str) -> Result<(), OneClickLaunchError> {
+    match try_open_as_command(path) {
+        Ok(true) => return Ok(()), // 已经作为程序执行
+        Ok(false) => {
+            // 不是程序，交给 opener
+            open_path_with_opener(app, path)?;
+        }
+        Err(e) => {
+            tracing::debug!("作为命令执行失败: {e:?}，尝试默认打开");
+            open_path_with_opener(app, path)?;
+        }
+    }
+
+    Ok(())
+}
+
+fn open_path_with_opener(app: &AppHandle, path: &str) -> Result<(), OneClickLaunchError> {
     app.opener()
         .open_path(path, None::<&str>)
         .map_err(|e| OneClickLaunchError::ExecutionError(e.to_string()))?;
     Ok(())
 }
+
+fn try_open_as_command(path: &str) -> Result<bool, OneClickLaunchError> {
+    let parts = shlex::split(path)
+        .ok_or_else(|| OneClickLaunchError::ExecutionError("无法解析路径".to_string()))?;
+
+    if parts.is_empty() {
+        return Ok(false);
+    }
+
+    let program = &parts[0];
+    let args = &parts[1..];
+
+    // 如果第一个部分是存在的文件（.exe/.bat/.sh 等），才当成命令执行
+    if Path::new(program).exists() {
+        Command::new(program).args(args).spawn()?;
+        return Ok(true);
+    }
+
+    Ok(false)
+}
+
+#[tauri::command]
+pub async fn create_handler_shortcut(
+    launcher_id: i64,
+    db: State<'_, DatabaseManager>,
+) -> Result<String, OneClickLaunchError> {
+    let launcher = launcher::find_by_id(&db.pool, launcher_id).await?;
+
+    let app_path = current_exe_path_str()?;
+
+    // 构建参数
+    let args = Some(vec![format!("launch {}", launcher_id)]);
+
+    window_api::create_shortcut(
+        &app_path,
+        &launcher.name,
+        args,
+        // None 表示保存到桌面
+        None,
+    )
+    .map(|path| path.to_string_lossy().to_string())
+}
+
+fn current_exe_path_str() -> Result<String, OneClickLaunchError> {
+    // 获取当前应用程序的绝对路径
+    let exe_path = std::env::current_exe()?;
+
+    // 转换为 Windows 可识别的普通路径
+    let mut app_path = exe_path.to_string_lossy().to_string();
+    if app_path.starts_with(r"\\?\") {
+        app_path = app_path.trim_start_matches(r"\\?\").to_string();
+    }
+    Ok(app_path)
+}

src-tauri/src/api/launcher_api.rs

@@ -1,6 +1,5 @@
 use std::{sync::Mutex, time::Instant};
 
-use anyhow::Result;
 use tauri::{
     AppHandle, DragDropEvent, Manager, State, Theme,
     menu::{MenuBuilder, MenuItem},
@@ -104,7 +103,7 @@ pub fn handle_window_event(window: &tauri::Window, event: &tauri::WindowEvent) {
 
             if let Ok(ref mut last_reset) = lock {
                 // 500ms防抖间隔
-                if last_reset.map_or(true, |t| now.duration_since(t).as_millis() > 500) {
+                if last_reset.is_none_or(|t| now.duration_since(t).as_millis() > 500) {
                     if let Ok(physical_size) = window.inner_size() {
                         // 如果窗口大小异常，强制调整到正常大小
                         if physical_size.width != WINDOW_MIN_WIDTH
@@ -140,7 +139,7 @@ pub fn handle_window_event(window: &tauri::Window, event: &tauri::WindowEvent) {
 }
 
 /// 初始化窗口
-pub fn setup_tray(app: &AppHandle) -> Result<()> {
+pub fn setup_tray(app: &AppHandle) -> Result<(), OneClickLaunchError> {
     let tray_icon = TrayIconBuilder::new()
         // 设置系统托盘的提示,鼠标悬浮时会显示
         .tooltip(constants::APPLICATION_NAME)
@@ -179,9 +178,7 @@ pub fn setup_tray(app: &AppHandle) -> Result<()> {
                 if let Ok(launcher_id) = id.parse::<i64>() {
                     let app_cloned = app.clone();
                     tauri::async_runtime::spawn(async move {
-                        let inner_app = app_cloned.clone();
-                        let db = inner_app.state();
-                        launcher_api::launch(app_cloned, db, launcher_id).await
+                        launcher_api::launch(app_cloned, launcher_id).await
                     });
                 }
             }
@@ -202,3 +199,74 @@ pub fn setup_tray(app: &AppHandle) -> Result<()> {
 pub struct ScaleFactorChangedState {
     pub last_reset: Mutex<Option<Instant>>,
 }
+
+use std::os::windows::ffi::OsStrExt;
+use std::path::PathBuf;
+use windows::{
+    Win32::{
+        System::Com::{
+            CLSCTX_INPROC_SERVER, COINIT_APARTMENTTHREADED, CoCreateInstance, CoInitializeEx,
+            CoUninitialize, IPersistFile,
+        },
+        UI::Shell::{IShellLinkW, ShellLink},
+    },
+    core::{HSTRING, Interface, PCWSTR},
+};
+
+/// 创建 Windows 快捷方式 (.lnk 文件)
+pub fn create_shortcut(
+    app_path: &str,
+    shortcut_name: &str,
+    args: Option<Vec<String>>,
+    target_dir: Option<&str>,
+) -> Result<PathBuf, OneClickLaunchError> {
+    unsafe {
+        // 初始化 COM
+        CoInitializeEx(None, COINIT_APARTMENTTHREADED).ok()?;
+
+        // 创建 IShellLink 实例
+        let shell_link: IShellLinkW = CoCreateInstance(&ShellLink, None, CLSCTX_INPROC_SERVER)?;
+
+        // 设置应用路径
+        shell_link.SetPath(&HSTRING::from(dbg!(app_path)))?;
+
+        // 设置参数
+        if let Some(arguments) = args {
+            let arg_str = arguments.join(" ");
+            shell_link.SetArguments(&HSTRING::from(arg_str))?;
+        }
+
+        // 设置工作目录（使用 app_path 的父目录）
+        if let Some(parent) = std::path::Path::new(app_path).parent() {
+            shell_link.SetWorkingDirectory(&HSTRING::from(parent.to_string_lossy().to_string()))?;
+        }
+
+        // 获取 IPersistFile 接口
+        let persist_file: IPersistFile = shell_link.cast()?;
+
+        // 目标目录（默认桌面）
+        let save_dir = if let Some(dir) = target_dir {
+            PathBuf::from(dir)
+        } else {
+            dirs::desktop_dir().ok_or_else(|| anyhow::anyhow!("无法获取桌面路径"))?
+        };
+
+        // 拼接快捷方式路径
+        let lnk_path = save_dir.join(format!("{}.lnk", shortcut_name));
+
+        // 转换为宽字符串
+        let wide: Vec<u16> = lnk_path
+            .as_os_str()
+            .encode_wide()
+            .chain(std::iter::once(0))
+            .collect();
+
+        // 保存
+        persist_file.Save(PCWSTR::from_raw(wide.as_ptr()), true)?;
+
+        // 释放 COM
+        CoUninitialize();
+
+        Ok(lnk_path)
+    }
+}

src-tauri/src/api/window_api.rs

@@ -2,6 +2,7 @@ use lazy_static::lazy_static;
 
 lazy_static! {
     pub static ref AUTO_START_FLAG: String = "--auto".to_string();
+    pub static ref LAUNCH_SPECIFIED_LAUNCHER_KEY: String = "launch".to_string();
 }
 
 pub static APPLICATION_NAME: &str = "一键启动";

src-tauri/src/constants.rs

@@ -85,6 +85,19 @@ where
     Ok(())
 }
 
+// 修改路径
+pub async fn modify_path<'a, E>(executor: E, resource_id: i64, path: &str) -> Result<()>
+where
+    E: Executor<'a, Database = Sqlite>,
+{
+    sqlx::query("UPDATE launcher_resource SET path = ? WHERE id = ?")
+        .bind(path)
+        .bind(resource_id)
+        .execute(executor)
+        .await?;
+    Ok(())
+}
+
 // 按launcher_id删除
 pub async fn delete_by_launcher<'a, E>(executor: E, launcher_id: i64) -> Result<()>
 where

src-tauri/src/db/launcher_resource.rs

@@ -14,13 +14,19 @@ pub enum OneClickLaunchError {
     AnyhowError(#[from] anyhow::Error),
 
     #[error("{0}")]
-    InfoError(#[from] std::io::Error),
+    IOError(#[from] std::io::Error),
 
     #[error("{0}")]
     TauriError(#[from] tauri::Error),
 
     #[error("Unable to convert from {0} to Event")]
     EventConvertError(String),
+
+    #[error("{0}")]
+    WindowsCommonError(String),
+
+    #[error("{0}")]
+    WindowsError(#[from] windows::core::Error),
 }
 
 // we must manually implement serde::Serialize