diff --git a/package.json b/package.json index 174d12a..f6c2c48 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "iccery", "private": true, - "version": "0.1.10", + "version": "0.1.11", "type": "module", "scripts": { "tauri": "tauri" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index b4c7995..b3ecdaf 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "iccery" -version = "0.1.10" +version = "0.1.11" description = "A Tauri App" authors = ["you"] edition = "2021" diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs index 7a37039..cbe2173 100644 --- a/src-tauri/src/commands.rs +++ b/src-tauri/src/commands.rs @@ -276,9 +276,8 @@ pub struct ColprofConfig { pub intent: Option, pub copyright: Option, pub description: Option, + pub basename: String, pub cwd: String, - pub ti3_path: String, - pub icc_path: String, } pub fn build_colprof_args(config: &ColprofConfig) -> Vec { @@ -311,8 +310,7 @@ pub fn build_colprof_args(config: &ColprofConfig) -> Vec { } } - args.push(config.ti3_path.clone()); - args.push(config.icc_path.clone()); + args.push(config.basename.clone()); args } @@ -324,7 +322,7 @@ pub async fn run_colprof( ) -> Result<(), String> { let binary = resolve_binary(app.clone(), "colprof".to_string()).await?; let args = build_colprof_args(&config); - let id = format!("colprof_{}", config.icc_path); + let id = format!("colprof_{}", config.basename); let cwd = if config.cwd.trim().is_empty() { None @@ -631,14 +629,13 @@ mod tests { intent: None, description: Some("My Profile".to_string()), copyright: Some("2026 ACME".to_string()), - ti3_path: "my_profile.ti3".to_string(), - icc_path: "my_profile.icc".to_string(), + basename: "my_profile".to_string(), cwd: "/home/user".to_string(), }; let args = build_colprof_args(&config); assert_eq!( args, - vec!["-v", "-a", "l", "-q", "h", "-C", "2026 ACME", "-D", "My Profile", "my_profile.ti3", "my_profile.icc"] + vec!["-v", "-a", "l", "-q", "h", "-C", "2026 ACME", "-D", "My Profile", "my_profile"] ); } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index fc6ab45..4da4476 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "ICCery", - "version": "0.1.10", + "version": "0.1.11", "identifier": "com.gronod.iccery", "build": { "frontendDist": "../src"