beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-07-05 17:15:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

add flags managers

Browse source
This commit is contained in:
Clément DOUIN 2021-03-19 22:02:33 +01:00
parent 64019fa5ec
commit ac6931624b
No known key found for this signature in database
GPG key ID: 69C9B9CFFDEE2DEF
2 changed files with 117 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
src/app.rs
View file

@ -29,14 +29,14 @@ impl<'a> App<'a> {
Arg::with_name("mailbox")
.short("m")
.long("mailbox")
.help("Name of the mailbox")
.help("Mailbox name")
.value_name("STRING")
.default_value("INBOX")
}
fn uid_arg() -> Arg<'a, 'a> {
Arg::with_name("uid")
.help("UID of the email")
.help("Message UID")
.value_name("UID")
.required(true)
}
@ -66,17 +66,24 @@ impl<'a> App<'a> {
.default_value("0")
}
fn flags_arg() -> Arg<'a, 'a> {
Arg::with_name("flags")
.help("IMAP flags (see https://tools.ietf.org/html/rfc3501#page-11)")
.value_name("FLAGS")
.multiple(true)
.required(true)
}
pub fn new() -> Self {
Self(clap::App::new("Himalaya")
Self(clap::App::new(env!("CARGO_PKG_NAME"))
.version(env!("CARGO_PKG_VERSION"))
.about("📫 Minimalist CLI email client")
.author("soywod <clement.douin@posteo.net>")
.setting(clap::AppSettings::ArgRequiredElseHelp)
.about(env!("CARGO_PKG_DESCRIPTION"))
.author(env!("CARGO_PKG_AUTHORS"))
.arg(
Arg::with_name("output")
.long("output")
.short("o")
.help("Format of the output to print")
.help("Formats the output")
.value_name("STRING")
.possible_values(&["text", "json"])
.default_value("text"),
@ -85,14 +92,47 @@ impl<'a> App<'a> {
Arg::with_name("account")
.long("account")
.short("a")
.help("Name of the account to use")
.help("Selects a specific account")
.value_name("STRING"),
)
.arg(
Arg::with_name("mailbox")
.short("m")
.long("mailbox")
.help("Selects a specific mailbox")
.value_name("STRING")
.default_value("INBOX")
)
.subcommand(
SubCommand::with_name("mailboxes")
.aliases(&["mboxes", "mbox", "mb", "m"])
.aliases(&["mailbox", "mboxes", "mbox", "mb", "m"])
.about("Lists all available mailboxes"),
)
.subcommand(
SubCommand::with_name("flags")
.aliases(&["flag", "f"])
.subcommand(
SubCommand::with_name("set")
.aliases(&["s"])
.about("Replaces all message flags")
.arg(Self::uid_arg())
.arg(Self::flags_arg()),
)
.subcommand(
SubCommand::with_name("add")
.aliases(&["a"])
.about("Appends flags to a message")
.arg(Self::uid_arg())
.arg(Self::flags_arg()),
)
.subcommand(
SubCommand::with_name("remove")
.aliases(&["rm", "r"])
.about("Removes flags from a message")
.arg(Self::uid_arg())
.arg(Self::flags_arg()),
)
)
.subcommand(
SubCommand::with_name("list")
.aliases(&["lst", "l"])
@ -202,8 +242,9 @@ impl<'a> App<'a> {
pub fn run(self) -> Result<()> {
let matches = self.0.get_matches();
let account_name = matches.value_of("account");
let output_type = matches.value_of("output").unwrap().to_owned();
let account_name = matches.value_of("account");
let mbox = matches.value_of("mailbox").unwrap();
if let Some(_) = matches.subcommand_matches("mailboxes") {
let config = Config::new_from_file()?;
@ -216,6 +257,30 @@ impl<'a> App<'a> {
imap_conn.logout();
}
if let Some(matches) = matches.subcommand_matches("flags") {
let config = Config::new_from_file()?;
let account = config.find_account_by_name(account_name)?;
let mut imap_conn = ImapConnector::new(&account)?;
if let Some(matches) = matches.subcommand_matches("set") {
let uid = matches.value_of("uid").unwrap();
let flags = matches.value_of("flags").unwrap();
imap_conn.set_flags(mbox, uid, flags)?;
}
if let Some(matches) = matches.subcommand_matches("add") {
let uid = matches.value_of("uid").unwrap();
let flags = matches.value_of("flags").unwrap();
imap_conn.add_flags(mbox, uid, flags)?;
}
if let Some(matches) = matches.subcommand_matches("remove") {
let uid = matches.value_of("uid").unwrap();
let flags = matches.value_of("flags").unwrap();
imap_conn.remove_flags(mbox, uid, flags)?;
}
}
if let Some(matches) = matches.subcommand_matches("list") {
let config = Config::new_from_file()?;
let account = config.find_account_by_name(account_name)?;
@ -339,8 +404,9 @@ impl<'a> App<'a> {
Ok(choice) => match choice {
input::Choice::Send => {
println!("Sending…");
smtp::send(&account, &msg.to_sendable_msg()?)?;
imap_conn.append_msg("Sent", &msg.to_vec()?)?;
let msg = msg.to_sendable_msg()?;
smtp::send(&account, &msg)?;
imap_conn.append_msg("Sent", &msg.formatted())?;
println!("Done!");
break;
}
@ -494,9 +560,10 @@ impl<'a> App<'a> {
let msg = matches.value_of("message").unwrap();
let msg = Msg::from(msg.to_string());
let msg = msg.to_sendable_msg()?;
smtp::send(&account, &msg.to_sendable_msg()?)?;
imap_conn.append_msg("Sent", &msg.to_vec()?)?;
smtp::send(&account, &msg)?;
imap_conn.append_msg("Sent", &msg.formatted())?;
imap_conn.logout();
}

36
src/imap.rs
View file

@ -45,6 +45,42 @@ impl<'a> ImapConnector<'a> {
}
}
pub fn set_flags(&mut self, mbox: &str, uid_seq: &str, flags: &str) -> Result<()> {
self.sess
.select(mbox)
.chain_err(|| format!("Cannot select mailbox `{}`", mbox))?;
self.sess
.uid_store(uid_seq, format!("FLAGS ({})", flags))
.chain_err(|| format!("Cannot set flags `{}`", &flags))?;
Ok(())
}
pub fn add_flags(&mut self, mbox: &str, uid_seq: &str, flags: &str) -> Result<()> {
self.sess
.select(mbox)
.chain_err(|| format!("Cannot select mailbox `{}`", mbox))?;
self.sess
.uid_store(uid_seq, format!("+FLAGS ({})", flags))
.chain_err(|| format!("Cannot add flags `{}`", &flags))?;
Ok(())
}
pub fn remove_flags(&mut self, mbox: &str, uid_seq: &str, flags: &str) -> Result<()> {
self.sess
.select(mbox)
.chain_err(|| format!("Cannot select mailbox `{}`", mbox))?;
self.sess
.uid_store(uid_seq, format!("-FLAGS ({})", flags))
.chain_err(|| format!("Cannot remove flags `{}`", &flags))?;
Ok(())
}
fn last_new_seq(&mut self) -> Result<Option<u32>> {
Ok(self
.sess