github/himalaya
1
0
Fork 0
mirror of https://github.com/pimalaya/himalaya.git synced 2026-06-17 13:17:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix tpl forward/reply, fix flag subcmd (#190)

Browse Source
This commit is contained in:
Clément DOUIN
2021-09-18 22:02:42 +02:00
parent e065d8d905
commit cdce6c0bf2
9 changed files with 101 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.rs
+6 -9
View File
@@ -25,7 +25,6 @@ fn create_app<'a>() -> clap::App<'a, 'a> {
.about(env!("CARGO_PKG_DESCRIPTION"))
.author(env!("CARGO_PKG_AUTHORS"))
.setting(AppSettings::GlobalVersion)
.setting(AppSettings::SubcommandRequiredElseHelp)
.args(&config::arg::args())
.args(&output::arg::args())
.arg(mbox::arg::source_arg())
@@ -144,16 +143,14 @@ fn main() -> Result<()> {
_ => (),
},
Some(msg::arg::Command::Tpl(m)) => match m {
Some(msg::tpl::arg::Command::New(sub, from, to, cc, bcc, h, body, sig)) => {
return msg::tpl::handler::new(
sub, from, to, cc, bcc, h, body, sig, &account, &output, &mut imap,
);
Some(msg::tpl::arg::Command::New(tpl)) => {
return msg::tpl::handler::new(tpl, &account, &output, &mut imap);
}
Some(msg::tpl::arg::Command::Reply(uid, all)) => {
return msg::tpl::handler::reply(uid, all, &account, &output, &mut imap);
Some(msg::tpl::arg::Command::Reply(uid, all, tpl)) => {
return msg::tpl::handler::reply(uid, all, tpl, &account, &output, &mut imap);
}
Some(msg::tpl::arg::Command::Forward(uid)) => {
return msg::tpl::handler::forward(uid, &account, &output, &mut imap);
Some(msg::tpl::arg::Command::Forward(uid, tpl)) => {
return msg::tpl::handler::forward(uid, tpl, &account, &output, &mut imap);
}
_ => (),
},