[rust] Error after desktop recording if command terminates

Author: bonigarcia

rust/src/ffmpeg.rs

@@ -23,12 +23,9 @@ use crate::files::{
 };
 use crate::lock::Lock;
 use crate::logger::Logger;
-use crate::shell::Command;
-use crate::{
-    format_four_args, format_one_arg, format_three_args, format_two_args,
-    run_shell_command_with_log, ENV_DISPLAY,
-};
-use anyhow::Error;
+use crate::shell::{run_shell_command_with_stderr, Command};
+use crate::{format_four_args, format_one_arg, format_three_args, format_two_args, ENV_DISPLAY};
+use anyhow::{anyhow, Error};
 use reqwest::Client;
 use std::fs::File;
 use std::path::{Path, PathBuf};
@@ -241,6 +238,7 @@ pub fn record_desktop_with_ffmpeg(
             &recording_name,
         ))
     };
-    run_shell_command_with_log(log, os, command).unwrap();
-    Ok(())
+    run_shell_command_with_stderr(log, os, command, true).unwrap();
+
+    return Err(anyhow!("Command for recording desktop terminated")); // This line should be executed
 }

rust/src/shell.rs

@@ -68,23 +68,49 @@ pub fn run_shell_command_with_log(
     log: &Logger,
     os: &str,
     command: Command,
+) -> Result<String, Error> {
+    run_shell_command_with_stderr(log, os, command, false)
+}
+
+pub fn run_shell_command_with_stderr(
+    log: &Logger,
+    os: &str,
+    command: Command,
+    stderr: bool,
 ) -> Result<String, Error> {
     log.debug(format!("Running command: {}", command.display()));
-    let output = run_shell_command_by_os(os, command)?;
+    let output = run_shell_command_by_os_stderr(os, command, stderr)?;
     log.debug(format!("Output: {:?}", output));
     Ok(output)
 }
 
 pub fn run_shell_command_by_os(os: &str, command: Command) -> Result<String, Error> {
+    run_shell_command_by_os_stderr(os, command, false)
+}
+
+pub fn run_shell_command_by_os_stderr(
+    os: &str,
+    command: Command,
+    stderr: bool,
+) -> Result<String, Error> {
     let (shell, flag) = if WINDOWS.is(os) {
         ("cmd", "/c")
     } else {
         ("sh", "-c")
     };
-    run_shell_command(shell, flag, command)
+    run_shell_command_stderr(shell, flag, command, stderr)
 }
 
 pub fn run_shell_command(shell: &str, flag: &str, command: Command) -> Result<String, Error> {
+    run_shell_command_stderr(shell, flag, command, false)
+}
+
+pub fn run_shell_command_stderr(
+    shell: &str,
+    flag: &str,
+    command: Command,
+    stderr: bool,
+) -> Result<String, Error> {
     let mut process = std::process::Command::new(shell);
     process.arg(flag);
 
@@ -96,9 +122,11 @@ pub fn run_shell_command(shell: &str, flag: &str, command: Command) -> Result<St
         }
     }
     let output = process.output()?;
-    let stdout = String::from_utf8_lossy(&output.stdout);
-    let stderr = String::from_utf8_lossy(&output.stderr);
-    Ok(strip_trailing_newline(&(stdout + " " + stderr)).to_string())
+    let mut stdout = String::from_utf8_lossy(&output.stdout);
+    if stderr {
+        stdout = stdout + " " + String::from_utf8_lossy(&output.stderr);
+    }
+    Ok(strip_trailing_newline(&stdout).to_string())
 }
 
 pub fn strip_trailing_newline(input: &str) -> &str {