mirror of
https://github.com/ouch-org/ouch.git
synced 2025-06-06 19:45:29 +00:00
tweak: improve error message
in case the user is trying to decompress a file with no filestem, just the extension, which is confusing
This commit is contained in:
parent
4bb759b21c
commit
065124cd30
@ -54,10 +54,10 @@ pub fn warning(contents: String) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
enum Message {
|
enum LoggerCommand {
|
||||||
|
Print(PrintMessage),
|
||||||
Flush { finished_barrier: Arc<Barrier> },
|
Flush { finished_barrier: Arc<Barrier> },
|
||||||
FlushAndShutdown,
|
FlushAndShutdown,
|
||||||
PrintMessage(PrintMessage),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Message object used for sending logs from worker threads to a logging thread via channels.
|
/// Message object used for sending logs from worker threads to a logging thread via channels.
|
||||||
@ -110,8 +110,8 @@ mod logger_thread {
|
|||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
type LogReceiver = mpsc::Receiver<Message>;
|
type LogReceiver = mpsc::Receiver<LoggerCommand>;
|
||||||
type LogSender = mpsc::Sender<Message>;
|
type LogSender = mpsc::Sender<LoggerCommand>;
|
||||||
|
|
||||||
static SENDER: OnceLock<LogSender> = OnceLock::new();
|
static SENDER: OnceLock<LogSender> = OnceLock::new();
|
||||||
|
|
||||||
@ -130,14 +130,14 @@ mod logger_thread {
|
|||||||
#[track_caller]
|
#[track_caller]
|
||||||
pub(super) fn send_log_message(msg: PrintMessage) {
|
pub(super) fn send_log_message(msg: PrintMessage) {
|
||||||
get_sender()
|
get_sender()
|
||||||
.send(Message::PrintMessage(msg))
|
.send(LoggerCommand::Print(msg))
|
||||||
.expect("Failed to send print message");
|
.expect("Failed to send print message");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[track_caller]
|
#[track_caller]
|
||||||
fn send_shutdown_message() {
|
fn send_shutdown_message() {
|
||||||
get_sender()
|
get_sender()
|
||||||
.send(Message::FlushAndShutdown)
|
.send(LoggerCommand::FlushAndShutdown)
|
||||||
.expect("Failed to send shutdown message");
|
.expect("Failed to send shutdown message");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -146,7 +146,7 @@ mod logger_thread {
|
|||||||
let barrier = Arc::new(Barrier::new(2));
|
let barrier = Arc::new(Barrier::new(2));
|
||||||
|
|
||||||
get_sender()
|
get_sender()
|
||||||
.send(Message::Flush {
|
.send(LoggerCommand::Flush {
|
||||||
finished_barrier: barrier.clone(),
|
finished_barrier: barrier.clone(),
|
||||||
})
|
})
|
||||||
.expect("Failed to send shutdown message");
|
.expect("Failed to send shutdown message");
|
||||||
@ -208,7 +208,7 @@ mod logger_thread {
|
|||||||
};
|
};
|
||||||
|
|
||||||
match msg {
|
match msg {
|
||||||
Message::PrintMessage(msg) => {
|
LoggerCommand::Print(msg) => {
|
||||||
// Append message to buffer
|
// Append message to buffer
|
||||||
if let Some(msg) = msg.to_processed_message() {
|
if let Some(msg) = msg.to_processed_message() {
|
||||||
buffer.push(msg);
|
buffer.push(msg);
|
||||||
@ -218,11 +218,11 @@ mod logger_thread {
|
|||||||
flush_logs_to_stderr(&mut buffer);
|
flush_logs_to_stderr(&mut buffer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Message::FlushAndShutdown => {
|
LoggerCommand::FlushAndShutdown => {
|
||||||
flush_logs_to_stderr(&mut buffer);
|
flush_logs_to_stderr(&mut buffer);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
Message::Flush { finished_barrier } => {
|
LoggerCommand::Flush { finished_barrier } => {
|
||||||
flush_logs_to_stderr(&mut buffer);
|
flush_logs_to_stderr(&mut buffer);
|
||||||
finished_barrier.wait();
|
finished_barrier.wait();
|
||||||
break;
|
break;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user