feat: add option to preserve logs in the output window (#20)

uAtomicBoolean · web-flow · commit 0fd779837ba6 · 2025-08-01T13:00:19.000+02:00
Closes #18
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "scriptboard"
-version = "1.1.1"
+version = "1.2.0"
 edition = "2024"
 license = "GPL-3.0-only"
 
 [package.metadata.winresource]
 FileDescription = "Scriptboard"
-FileVersion = "1.1.1"
+FileVersion = "1.2.0"
 ProductName = "Scriptboard"
 Comments = "A simple desktop software to execute saved script files."
 OriginalFilename = "scriptboard.exe"
@@ -46,7 +46,7 @@ panic = "abort"
 strip = true
 
 [package.metadata.packager]
-version = "1.1.1"
+version = "1.2.0"
 authors = ["uAtomicBoolean"]
 copyright = "Copyright (C) 2025 uAtomicBoolean"
 category = "DeveloperTool"
diff --git a/changelogs/1.2.0-changelog.txt b/changelogs/1.2.0-changelog.txt
@@ -0,0 +1,2 @@
+**Features:**
+- It is now possible to preserve a script's output after restarting it (#18).
diff --git a/src/app/scripts/commands.rs b/src/app/scripts/commands.rs
@@ -0,0 +1,81 @@
+use crate::app::store::StoredScript;
+use std::process::{Command, Stdio};
+
+#[cfg(target_os = "windows")]
+use std::os::windows::process::CommandExt;
+
+#[cfg(target_os = "linux")]
+pub fn get_linux_command(script: &StoredScript, parsed_args: Vec<String>) -> Command {
+    if !script.need_admin {
+        let mut cmd = Command::new(&script.interpreter);
+        cmd.arg(&script.path)
+            .args(parsed_args)
+            .stdout(Stdio::piped());
+        return cmd;
+    }
+
+    let mut cmd = Command::new("pkexec");
+    cmd.args([&script.interpreter, &script.path])
+        .args(parsed_args)
+        .stdout(Stdio::piped());
+
+    cmd
+}
+
+#[cfg(target_os = "macos")]
+pub fn get_macos_command(script: &StoredScript, parsed_args: Vec<String>) -> Command {
+    if !script.need_admin {
+        let mut cmd = Command::new(&script.interpreter);
+        cmd.arg(&script.path)
+            .args(parsed_args)
+            .stdout(Stdio::piped());
+        return cmd;
+    }
+
+    let osascript_arg = format!(
+        "do shell script \"{} {} {}\" with prompt \"{}\" with administrator privileges",
+        &script.interpreter,
+        &script.path,
+        parsed_args.join(" "),
+        &script.name,
+    );
+
+    let mut cmd = Command::new("osascript");
+    cmd.arg("-e").arg(osascript_arg).stdout(Stdio::piped());
+
+    cmd
+}
+
+#[cfg(target_os = "windows")]
+pub fn get_windows_command(script: &StoredScript, parsed_args: Vec<String>) -> Command {
+    // Ask for admin password
+    // Start-Process cmd -ArgumentList "/C your_command_here" -Verb RunAs
+    // Example with custom interpreter :
+    // Start-Process cmd -ArgumentList "/C python -c \"print('Hello, World!')\"" -Verb RunAs
+
+    if !script.need_admin {
+        let mut cmd = Command::new(&script.interpreter);
+        cmd.arg("-File")
+            .arg(&script.path)
+            .args(parsed_args)
+            .creation_flags(0x08000000)
+            .stdout(Stdio::piped());
+        return cmd;
+    }
+
+    let script_args = format!(
+        "\"/C {} {} {}\"",
+        &script.interpreter,
+        &script.path,
+        parsed_args.join(" ")
+    );
+
+    let mut cmd: Command = Command::new("Start-Process");
+    cmd.arg("cmd")
+        .arg("-ArgumentList")
+        .arg(script_args)
+        .creation_flags(0x08000000)
+        .stdout(Stdio::piped());
+
+    cmd
+}
diff --git a/src/app/scripts/execute.rs b/src/app/scripts/execute.rs
@@ -1,17 +1,32 @@
+use super::commands::*;
 use crate::app::notifications::{send_notification, send_notification_with_custom_title};
 use crate::app::store::structs::StoredScript;
 use crate::{MainPageLogic, NotifStringEnum, NotifTypeEnum, Script, Scriptboard};
 use slint::{ComponentHandle, Model, VecModel, Weak};
 use std::io::{BufReader, Read};
-use std::process::{Command, Output, Stdio};
+use std::process::Output;
 use std::rc::Rc;
 
-#[cfg(target_os = "windows")]
-use std::os::windows::process::CommandExt;
+/// Prepare the scripts before its execution then start the execution.
+pub fn execute_script(
+    ui_weak: Weak<Scriptboard>,
+    scripts: Rc<VecModel<Script>>,
+    script_index: usize,
+) {
+    let mut script = scripts.row_data(script_index as usize).unwrap();
+    script.running = true;
+    if !script.preserve_output {
+        script.output = "".into();
+    } else {
+        script.output.push_str("\n");
+    }
+    scripts.set_row_data(script_index as usize, script.clone());
+    run_execution_script(ui_weak.clone(), script, script_index as usize);
+}
 
 /// Execute the script and store its output.
 /// This function updates the scripts list to update the UI.
-pub fn execute_script(ui_weak: Weak<Scriptboard>, script: Script, script_index: usize) {
+fn run_execution_script(ui_weak: Weak<Scriptboard>, script: Script, script_index: usize) {
     std::thread::spawn({
         let light_script: StoredScript = script.into();
         move || {
@@ -152,81 +167,3 @@ fn finish_script_execution(ui: Scriptboard, output: Option<Output>, script_index
         send_notification_with_custom_title(ui.as_weak(), theme, script.name.into(), message);
     }
 }
-
-#[cfg(target_os = "linux")]
-fn get_linux_command(script: &StoredScript, parsed_args: Vec<String>) -> Command {
-    if !script.need_admin {
-        use std::process::Stdio;
-
-        let mut cmd = Command::new(&script.interpreter);
-        cmd.arg(&script.path)
-            .args(parsed_args)
-            .stdout(Stdio::piped());
-        return cmd;
-    }
-
-    let mut cmd = Command::new("pkexec");
-    cmd.args([&script.interpreter, &script.path])
-        .args(parsed_args)
-        .stdout(Stdio::piped());
-
-    cmd
-}
-
-#[cfg(target_os = "macos")]
-fn get_macos_command(script: &StoredScript, parsed_args: Vec<String>) -> Command {
-    if !script.need_admin {
-        let mut cmd = Command::new(&script.interpreter);
-        cmd.arg(&script.path)
-            .args(parsed_args)
-            .stdout(Stdio::piped());
-        return cmd;
-    }
-
-    let osascript_arg = format!(
-        "do shell script \"{} {} {}\" with prompt \"{}\" with administrator privileges",
-        &script.interpreter,
-        &script.path,
-        parsed_args.join(" "),
-        &script.name,
-    );
-
-    let mut cmd = Command::new("osascript");
-    cmd.arg("-e").arg(osascript_arg).stdout(Stdio::piped());
-
-    cmd
-}
-
-#[cfg(target_os = "windows")]
-fn get_windows_command(script: &StoredScript, parsed_args: Vec<String>) -> Command {
-    // Ask for admin password
-    // Start-Process cmd -ArgumentList "/C your_command_here" -Verb RunAs
-    // Example with custom interpreter :
-    // Start-Process cmd -ArgumentList "/C python -c \"print('Hello, World!')\"" -Verb RunAs
-
-    if !script.need_admin {
-        let mut cmd = Command::new(&script.interpreter);
-        cmd.arg("-File")
-            .arg(&script.path)
-            .args(parsed_args)
-            .creation_flags(0x08000000)
-            .stdout(Stdio::piped());
-        return cmd;
-    }
-
-    let script_args = format!(
-        "\"/C {} {} {}\"",
-        &script.interpreter,
-        &script.path,
-        parsed_args.join(" ")
-    );
-
-    let mut cmd: Command = Command::new("Start-Process");
-    cmd.arg("cmd")
-        .arg("-ArgumentList")
-        .arg(script_args)
-        .creation_flags(0x08000000)
-        .stdout(Stdio::piped());
-
-    cmd
-}
diff --git a/src/app/scripts/mod.rs b/src/app/scripts/mod.rs
@@ -1,3 +1,4 @@
+mod commands;
 pub mod execute;
 
 use rfd::FileDialog;
diff --git a/src/app/store/structs.rs b/src/app/store/structs.rs
@@ -52,6 +52,7 @@ impl Into<Script> for StoredScript {
             args: self.args.into(),
             running: false,
             output: SharedString::new(),
+            preserve_output: false,
             status_code: 0,
         }
     }
@@ -70,6 +71,7 @@ impl Into<Script> for &StoredScript {
             args: self.args.clone().into(),
             running: false,
             output: SharedString::new(),
+            preserve_output: false,
             status_code: 0,
         }
     }
diff --git a/src/ui/pages/main_page.rs b/src/ui/pages/main_page.rs
@@ -19,10 +19,9 @@ pub fn init_ui(ui: Weak<Scriptboard>, scripts: Rc<VecModel<Script>>) {
         let ui_weak = ui.as_weak();
         let scripts_clone = scripts.clone();
         move |script_index| {
-            let script = scripts_clone.row_data(script_index as usize).unwrap();
             crate::app::scripts::execute::execute_script(
                 ui_weak.clone(),
-                script,
+                scripts_clone.clone(),
                 script_index as usize,
             );
         }
@@ -65,18 +64,23 @@ pub fn init_ui(ui: Weak<Scriptboard>, scripts: Rc<VecModel<Script>>) {
                 let ui_weak = ui_weak.clone();
                 let scripts_clone = scripts.clone();
                 move || {
-                    let mut script = scripts_clone.row_data(index as usize).unwrap();
-                    script.running = true;
-                    script.output = "".into();
-                    scripts_clone.set_row_data(index as usize, script.clone());
                     crate::app::scripts::execute::execute_script(
                         ui_weak.clone(),
-                        script,
+                        scripts_clone.clone(),
                         index as usize,
                     );
                 }
             });
 
+            output_window.on_update_preserve_output({
+                let scripts_clone = scripts.clone();
+                move |preserve_output| {
+                    let mut script = scripts_clone.row_data(index as usize).unwrap();
+                    script.preserve_output = preserve_output;
+                    scripts_clone.set_row_data(index as usize, script);
+                }
+            });
+
             if let Err(err) = slint::select_bundled_translation(&store::get_language()) {
                 error!("Couldn't select the bundled translation.");
                 error!("{}", err.to_string());
diff --git a/ui/pages/main.slint b/ui/pages/main.slint
@@ -31,8 +31,6 @@ export component MainPage {
                     x: (mod(idx, columns) * card-width);
                     y: (floor(idx / columns) * card-height);
                     clicked => {
-                        script.running = true;
-                        script.output = "";
                         MainPageLogic.execute-script(idx);
                     }
                     open-output => {
diff --git a/ui/structs.slint b/ui/structs.slint
@@ -9,5 +9,6 @@ export struct Script {
 	args: string,
 	running: bool,
 	output: string,
+	preserve-output: bool,
 	status-code: int,
 }
diff --git a/ui/windows/script_output_window.slint b/ui/windows/script_output_window.slint
@@ -2,7 +2,7 @@ import "../assets/fonts/Inter-Italic-VariableFont_opsz,wght.ttf";
 import "../assets/fonts/Inter-VariableFont_opsz,wght.ttf";
 
 import { UAppTheme } from "@sleek-ui/app-theme.slint";
-import { UButton, UDivider, UText, UCenter } from "@sleek-ui/widgets.slint";
+import { UButton, UCheckbox, UDivider, UText, UCenter } from "@sleek-ui/widgets.slint";
 
 import { ScrollView } from "std-widgets.slint";
 
@@ -14,6 +14,7 @@ export component ScriptOutputWindow inherits Window {
     in-out property <int> script_index;
     property <Script> script: scripts[script_index];
     callback execute-script();
+    callback update-preserve-output(pre-out: bool);
     title: @tr("Output - ") + script.name;
     icon: @image-url("../../res/linux/32x32.png");
     default-font-family: "Inter";
@@ -25,8 +26,20 @@ export component ScriptOutputWindow inherits Window {
         HorizontalLayout {
             vertical-stretch: 0;
             padding: UAppTheme.padding-base;
-            alignment: center;
+            alignment: space-between;
             height: 40px * UAppTheme.scale-factor;
+            VerticalLayout {
+                alignment: center;
+                UCheckbox {
+                    checked: script.preserve-output;
+                    text: @tr("Preserve output");
+                    text-placement: end;
+                    changed checked => {
+                        root.update-preserve-output(self.checked);
+                    }
+                }
+            }
+
             VerticalLayout {
                 alignment: center;
                 UButton {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Features:`
	`2`	`+- It is now possible to preserve a script's output after restarting it (#18).`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+mod commands;`
`1`	`2`	`pub mod execute;`
`2`	`3`
`3`	`4`	`use rfd::FileDialog;`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ impl Into<Script> for StoredScript {`
`52`	`52`	`args: self.args.into(),`
`53`	`53`	`running: false,`
`54`	`54`	`output: SharedString::new(),`
	`55`	`+ preserve_output: false,`
`55`	`56`	`status_code: 0,`
`56`	`57`	`}`
`57`	`58`	`}`
`@@ -70,6 +71,7 @@ impl Into<Script> for &StoredScript {`
`70`	`71`	`args: self.args.clone().into(),`
`71`	`72`	`running: false,`
`72`	`73`	`output: SharedString::new(),`
	`74`	`+ preserve_output: false,`
`73`	`75`	`status_code: 0,`
`74`	`76`	`}`
`75`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@ export component MainPage {`
`31`	`31`	`x: (mod(idx, columns) * card-width);`
`32`	`32`	`y: (floor(idx / columns) * card-height);`
`33`	`33`	`clicked => {`
`34`		`- script.running = true;`
`35`		`- script.output = "";`
`36`	`34`	`MainPageLogic.execute-script(idx);`
`37`	`35`	`}`
`38`	`36`	`open-output => {`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,6 @@ export struct Script {`
`9`	`9`	`args: string,`
`10`	`10`	`running: bool,`
`11`	`11`	`output: string,`
	`12`	`+ preserve-output: bool,`
`12`	`13`	`status-code: int,`
`13`	`14`	`}`