0ct0pu5/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2025-04-22 17:23:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix message and template send stdin issues

Browse source
This commit is contained in:
Clément DOUIN 2023-12-19 15:36:56 +01:00
parent 73e1824a0d
commit c11f00d791
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
2 changed files with 5 additions and 9 deletions
src/email/message
command
send.rs
template/command
send.rs

6
src/email/message/command/send.rs
View file

@ -36,16 +36,14 @@ impl MessageSendCommand {
config.clone().into_account_configs(account, cache)?;
let backend = Backend::new(toml_account_config, account_config.clone(), true).await?;
let is_tty = io::stdin().is_terminal();
let is_json = printer.is_json();
let msg = if is_tty || is_json {
let msg = if io::stdin().is_terminal() {
self.message.raw()
} else {
io::stdin()
.lock()
.lines()
.filter_map(Result::ok)
.collect::<Vec<String>>()
.collect::<Vec<_>>()
.join("\r\n")
};

8
src/email/message/template/command/send.rs
View file

@ -39,17 +39,15 @@ impl TemplateSendCommand {
config.clone().into_account_configs(account, cache)?;
let backend = Backend::new(toml_account_config, account_config.clone(), true).await?;
let is_tty = io::stdin().is_terminal();
let is_json = printer.is_json();
let tpl = if is_tty || is_json {
let tpl = if io::stdin().is_terminal() {
self.template.raw()
} else {
io::stdin()
.lock()
.lines()
.filter_map(Result::ok)
.collect::<Vec<String>>()
.join("\r\n")
.collect::<Vec<_>>()
.join("\n")
};
#[allow(unused_mut)]