支持命令行参数启动编组

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,8 +31,8 @@ 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"] }

src-tauri/Cargo.toml

@@ -301,7 +301,25 @@ pub async fn launch(app: AppHandle, launcher_id: i64) -> Result<(), OneClickLaun
         OneClickLaunchError::ExecutionError("Unable to get DatabaseManager".to_string()),
     )?;
 
-    let resources = launcher_resource::query_by_launcher_id(&db.pool, launcher_id).await?;
+    let mut resources = launcher_resource::query_by_launcher_id(&db.pool, launcher_id).await?;
+
+    // 必须从启动资源中排除自己,防止出现死循环
+    let app_path = current_exe_path_str()?;
+    resources.retain(|e| {
+        // 检查路径是否包含空格
+        if e.path.contains(' ') {
+            // 按空格拆分并取第一个部分进行比较
+            e.path.split_whitespace().next() == Some(&app_path)
+        } else {
+            // 不包含空格时直接比较
+            e.path.eq(&app_path)
+        }
+    });
+
+    if resources.is_empty() {
+        tracing::debug!("资源列表为空");
+        return Ok(());
+    }
 
     launch_resources(&app, &resources);
 
@@ -354,17 +372,10 @@ pub async fn create_handler_shortcut(
     launcher_id: i64,
     db: State<'_, DatabaseManager>,
 ) -> 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();
-    }
-
     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)]);
 
@@ -377,3 +388,15 @@ pub async fn create_handler_shortcut(
     )
     .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

@@ -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

@@ -9,10 +9,12 @@ use crate::{
         window_api,
     },
     constants::{
-        self, AUTO_START_FLAG, AUTO_START_LAUNCHER_IDS_KEY, HIDE_AFTER_AUTO_START_KEY, THEME_KEY,
+        self, AUTO_START_FLAG, AUTO_START_LAUNCHER_IDS_KEY, HIDE_AFTER_AUTO_START_KEY,
+        LAUNCH_SPECIFIED_LAUNCHER_KEY, THEME_KEY,
     },
     db::{launcher_resource, settings},
     events::EventDispatcher,
+    extract_arg_value,
 };
 
 use super::{
@@ -59,6 +61,7 @@ fn register_application_startup_complete_listeners(app: &AppHandle) {
         hide_after_auto_start(&app_cloned, &payload);
         refresh_tray(&app_cloned);
         launch_auto_start_launchers(&app_cloned, &payload);
+        launch_specified_launcher(&app_cloned, &payload);
         debug!("application_startup_complete_listeners 处理完成");
     });
 }
@@ -184,6 +187,20 @@ fn launch_auto_start_launchers(app: &AppHandle, payload: &ApplicationStartupComp
     }
 }
 
+fn launch_specified_launcher(app: &AppHandle, payload: &ApplicationStartupCompletePayload) {
+    // 如果启动命令指定了LAUNCH_SPECIFIED_LAUNCHER_KEY, 需要启动指定的编组
+    if let Some(Ok(launcher_id)) = extract_arg_value(&payload.args, &LAUNCH_SPECIFIED_LAUNCHER_KEY)
+        .map(|value| value.parse::<i64>())
+    {
+        let app_cloned = app.clone();
+        tokio::spawn(async move {
+            if let Err(e) = launcher_api::launch(app_cloned, launcher_id).await {
+                tracing::error!("launcher launch fail: {}", e);
+            }
+        });
+    }
+}
+
 fn launch_then_exit(app: &AppHandle) {
     let app_cloned = app.clone();
     tauri::async_runtime::spawn(async move {

src-tauri/src/events/system_listeners.rs

@@ -15,6 +15,8 @@ use tauri::tray::TrayIcon;
 use tauri::{AppHandle, Manager};
 use tauri_plugin_autostart::MacosLauncher;
 use tracing::{debug, info};
+
+use crate::constants::LAUNCH_SPECIFIED_LAUNCHER_KEY;
 mod api;
 mod constants;
 mod db;
@@ -125,12 +127,12 @@ pub async fn run() -> Result<()> {
         .manage(ScaleFactorChangedState {
             last_reset: Mutex::new(None),
         })
-        // 优先注册单例插件
+        // 必须优先注册单例插件
         .plugin(tauri_plugin_single_instance::init(|app, argv, cwd| {
             info!("run app: {}, {argv:?}, {cwd}", app.package_info().name);
 
-            if let Some(Ok(launcher_id)) =
-                extract_arg_value(&argv, "launch").map(|value| value.parse::<i64>())
+            if let Some(Ok(launcher_id)) = extract_arg_value(&argv, &LAUNCH_SPECIFIED_LAUNCHER_KEY)
+                .map(|value| value.parse::<i64>())
             {
                 let app_cloned = app.clone();
                 tokio::spawn(async move {
@@ -189,7 +191,7 @@ fn register_listeners(app: &AppHandle) {
     register_system_listeners(app);
 }
 
-fn extract_arg_value(argv: &[String], key: &str) -> Option<String> {
+pub fn extract_arg_value(argv: &[String], key: &str) -> Option<String> {
     let mut iter = argv.iter();
     while let Some(arg) = iter.next() {
         if arg == key {

src-tauri/src/lib.rs

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "一键启动",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "identifier": "one-click-launch",
   "build": {
     "beforeDevCommand": "yarn dev",

src-tauri/tauri.conf.json

@@ -74,7 +74,7 @@
 
             </div>
         </div>
-        <button class="launch-button" :disabled="isLaunching" @click="launch">
+        <button class="launch-button" :disabled="isLaunching || !data.resources?.length" @click="launch">
             <span v-if="!isLaunching">启动</span>
             <span v-else>
                 <svg class="loading-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"
@@ -248,7 +248,7 @@ export default {
         const moveLauncher = (type) => {
             emit("launcher-moved", props.launcherData.id, type);
         };
-        
+
         const handleRightClick = (type) => {
             emit('show-context-menu', props.launcherData, type);
         };
@@ -562,4 +562,27 @@ hr {
     /* 点击时缩小效果 */
     transform: scale(0.95);
 }
+
+.launch-button:disabled {
+    background-color: #c6c8ca;
+    color: #6c757d;
+    cursor: not-allowed;
+    /* 取消 hover/active 的缩放效果 */
+    transform: none !important;
+    /* 确保禁用状态可被识别 */
+    pointer-events: auto;
+}
+
+.launch-button:disabled:hover {
+    background-color: #c6c8ca;
+    /* 取消 hover 放大 */
+    transform: none;
+}
+
+.launch-button:disabled:active {
+    background-color: #c6c8ca;
+    /* 取消 active 缩小 */
+    transform: none;
+}
+
 </style>