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

review delete command

Browse source
This commit is contained in:
Clément DOUIN 2021-09-19 11:36:11 +02:00
parent 2e27972716
commit 71818e04b4
No known key found for this signature in database
GPG key ID: 69C9B9CFFDEE2DEF
3 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/domain/imap/service.rs
View file

@ -204,35 +204,22 @@ impl<'a> ImapServiceInterface for ImapService<'a> {
Ok(()) Ok(())
} }
/// Add the given flags to the given mail. /// Add flags to the given message UID sequence.
/// ///
/// # Example /// ```ignore
/// ```no_run
/// use himalaya::imap::model::ImapConnector;
/// use himalaya::config::model::Account;
/// use himalaya::flag::model::Flags;
/// use imap::types::Flag;
/// ///
/// fn main() { /// let flags = Flags::from(vec![Flag::Seen, Flag::Deleted]);
/// let account = Account::default(); /// imap.add_flags("5:10", flags)
/// let mut imap_conn = ImapConnector::new(&account).unwrap();
/// let flags = Flags::from(vec![Flag::Seen]);
///
/// // Mark the message with the UID 42 in the mailbox "rofl" as "Seen"
/// imap_conn.add_flags("rofl", "42", flags).unwrap();
///
/// imap_conn.logout();
/// }
/// ``` /// ```
fn add_flags(&mut self, uid_seq: &str, flags: Flags) -> Result<()> { fn add_flags(&mut self, uid_seq: &str, flags: Flags) -> Result<()> {
let mbox = self.mbox.to_owned(); let mbox = self.mbox.to_owned();
let flags: String = flags.to_string(); let flags: String = flags.to_string();
self.sess()? self.sess()?
.select(&mbox.name) .select(&mbox.name)
.context(format!("cannot select mbox `{}`", self.mbox.name))?; .context(format!(r#"cannot select mailbox "{}""#, self.mbox.name))?;
self.sess()? self.sess()?
.uid_store(uid_seq, format!("+FLAGS ({})", flags)) .uid_store(uid_seq, format!("+FLAGS ({})", flags))
.context(format!("cannot add flags `{}`", &flags))?; .context(format!(r#"cannot add flags "{}""#, &flags))?;
Ok(()) Ok(())
} }

2
src/domain/msg/arg.rs
View file

@ -298,7 +298,7 @@ pub fn subcmds<'a>() -> Vec<App<'a, 'a>> {
.arg(uid_arg()) .arg(uid_arg())
.arg(mbox::arg::target_arg()), .arg(mbox::arg::target_arg()),
SubCommand::with_name("delete") SubCommand::with_name("delete")
.aliases(&["remove", "rm"]) .aliases(&["del", "d", "remove", "rm"])
.about("Deletes a message") .about("Deletes a message")
.arg(uid_arg()), .arg(uid_arg()),
], ],

10
src/domain/msg/handler.rs
View file

@ -168,16 +168,16 @@ pub fn copy<OutputService: OutputServiceInterface, ImapService: ImapServiceInter
Ok(()) Ok(())
} }
pub fn delete<ImapService: ImapServiceInterface>( /// Delete the given message UID from the selected mailbox.
pub fn delete<OutputService: OutputServiceInterface, ImapService: ImapServiceInterface>(
uid: &str, uid: &str,
output: &OutputService, output: &OutputService,
imap: &mut ImapService, imap: &mut ImapService,
) -> Result<()> { ) -> Result<()> {
let flags = vec![Flag::Seen, Flag::Deleted]; let flags = Flags::from(vec![Flag::Seen, Flag::Deleted]);
imap.add_flags(uid, Flags::from(flags))?; imap.add_flags(uid, flags)?;
imap.expunge()?; imap.expunge()?;
debug!("message {} successfully deleted", uid); output.print(format!("Message(s) {} successfully deleted", uid))?;
output.print(format!("Message {} successfully deleted", uid))?;
imap.logout()?; imap.logout()?;
Ok(()) Ok(())
} }