CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-01 10:01:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): random shell command output order, closes #2184 (#2376)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira
2021-08-09 10:56:21 -03:00
committed by GitHub
parent 77595b1c37
commit 737da87244
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/shell-command-output-order.md Normal file
View File

@@ -0,0 +1,5 @@
---
"tauri": patch
---
Fixes a consistency issue on the order of `tauri::process::Command` emitted events.

10
core/tauri/src/api/process/command.rs
View File

@@ -19,7 +19,7 @@ use std::os::windows::process::CommandExt;
#[cfg(windows)]
const CREATE_NO_WINDOW: u32 = 0x0800_0000;
use crate::async_runtime::{channel, spawn as spawn_task, Receiver};
use crate::async_runtime::{block_on as block_on_task, channel, Receiver};
use os_pipe::{pipe, PipeWriter};
use serde::Serialize;
use shared_child::SharedChild;
@@ -248,7 +248,7 @@ impl Command {
let reader = BufReader::new(stdout_reader);
for line in reader.lines() {
let tx_ = tx_.clone();
spawn_task(async move {
block_on_task(async move {
let _ = match line {
Ok(line) => tx_.send(CommandEvent::Stdout(line)).await,
Err(e) => tx_.send(CommandEvent::Error(e.to_string())).await,
@@ -264,7 +264,7 @@ impl Command {
let reader = BufReader::new(stderr_reader);
for line in reader.lines() {
let tx_ = tx_.clone();
spawn_task(async move {
block_on_task(async move {
let _ = match line {
Ok(line) => tx_.send(CommandEvent::Stderr(line)).await,
Err(e) => tx_.send(CommandEvent::Error(e.to_string())).await,
@@ -278,7 +278,7 @@ impl Command {
Ok(status) => {
let _l = guard.write().unwrap();
commands().lock().unwrap().remove(&child_.id());
spawn_task(async move {
let _ = block_on_task(async move {
tx.send(CommandEvent::Terminated(TerminatedPayload {
code: status.code(),
#[cfg(windows)]
@@ -291,7 +291,7 @@ impl Command {
}
Err(e) => {
let _l = guard.write().unwrap();
spawn_task(async move { tx.send(CommandEvent::Error(e.to_string())).await });
let _ = block_on_task(async move { tx.send(CommandEvent::Error(e.to_string())).await });
}
};
});