meli
/
meli
8
Fork 13
Code Issues 10 Pull Requests 10 Actions Packages Projects 1 Releases 18 Wiki Activity

command: add a flag set/unset command
Run cargo lints / Lint on ${{ matrix.build }} (linux-amd64, ubuntu-latest, stable, x86_64-unknown-linux-gnu) (pull_request) Successful in 9m12s Details
Cargo manifest lints / Lint Cargo manifests on ${{ matrix.build }} (linux-amd64, ubuntu-latest, stable, x86_64-unknown-linux-gnu) (pull_request) Successful in 13m39s Details
Run Tests / Test on ${{ matrix.build }} (linux-amd64, ubuntu-latest, stable, x86_64-unknown-linux-gnu) (pull_request) Successful in 15m13s Details 

e.g. "flag unset draft"

Signed-off-by: Manos Pitsidianakis <manos@pitsidianak.is>
pull/335/head
Manos Pitsidianakis 2023-12-29 16:15:44 +02:00
parent bebb473d1b
commit ce4ba06ce9
Signed by: Manos Pitsidianakis
GPG Key ID: 7729C7707F7E09D0
4 changed files with 156 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meli/src/command.rs
View File

@ -55,10 +55,11 @@ pub use crate::actions::{
AccountAction::{self, *},
Action::{self, *},
ComposeAction::{self, *},
FlagAction,
ListingAction::{self, *},
MailingListAction::{self, *},
TabAction::{self, *},
TagAction::{self, *},
TagAction,
ViewAction::{self, *},
};

9
meli/src/command/actions.rs
View File

@ -23,10 +23,16 @@
use std::path::PathBuf;
use melib::{email::mailto::Mailto, SortField, SortOrder};
use melib::{email::mailto::Mailto, Flag, SortField, SortOrder};
use crate::components::{Component, ComponentId};
#[derive(Debug)]
pub enum FlagAction {
Set(Flag),
Unset(Flag),
}
#[derive(Debug)]
pub enum TagAction {
Add(String),
@ -52,6 +58,7 @@ pub enum ListingAction {
Delete,
OpenInNewTab,
Tag(TagAction),
Flag(FlagAction),
ToggleThreadSnooze,
}

146
meli/src/command/parser.rs
View File

@ -101,6 +101,7 @@ pub fn listing_action(input: &[u8]) -> IResult<&[u8], Result<Action, CommandErro
open_in_new_tab,
export_mbox,
_tag,
flag,
))(input)
}
@ -154,6 +155,133 @@ pub fn parse_command(input: &[u8]) -> Result<Action, CommandError> {
.and_then(|(_, v)| v)
}
/// Set/unset a flag.
///
/// # Example
///
/// ```
/// # use meli::{melib::Flag, command::{Action,ListingAction, FlagAction, parser}};
///
/// let (rest, parsed) = parser::flag(b"flag set junk").unwrap();
/// assert_eq!(rest, b"");
/// assert!(
/// matches!(
/// parsed,
/// Ok(Action::Listing(ListingAction::Flag(FlagAction::Set(
/// Flag::TRASHED
/// ))))
/// ),
/// "{:?}",
/// parsed
/// );
///
/// let (rest, parsed) = parser::flag(b"flag unset junk").unwrap();
/// assert_eq!(rest, b"");
/// assert!(
/// matches!(
/// parsed,
/// Ok(Action::Listing(ListingAction::Flag(FlagAction::Unset(
/// Flag::TRASHED
/// ))))
/// ),
/// "{:?}",
/// parsed
/// );
///
/// let (rest, parsed) = parser::flag(b"flag set draft").unwrap();
/// assert_eq!(rest, b"");
/// assert!(
/// matches!(
/// parsed,
/// Ok(Action::Listing(ListingAction::Flag(FlagAction::Set(
/// Flag::DRAFT
/// ))))
/// ),
/// "{:?}",
/// parsed
/// );
///
/// let (rest, parsed) = parser::flag(b"flag set xunk").unwrap();
/// assert_eq!(rest, b"");
/// assert_eq!(
/// &parsed.unwrap_err().to_string(),
/// "Bad value/argument: xunk is not a valid flag name. Possible values are: passed, replied, \
/// seen or read, junk or trash or trashed, draft and flagged."
/// );
/// ```
pub fn flag<'a>(input: &'a [u8]) -> IResult<&'a [u8], Result<Action, CommandError>> {
use melib::Flag;
fn parse_flag(s: &str) -> Option<Flag> {
match s {
o if o.eq_ignore_ascii_case("passed") => Some(Flag::PASSED),
o if o.eq_ignore_ascii_case("replied") => Some(Flag::REPLIED),
o if o.eq_ignore_ascii_case("seen") => Some(Flag::SEEN),
o if o.eq_ignore_ascii_case("read") => Some(Flag::SEEN),
o if o.eq_ignore_ascii_case("junk") => Some(Flag::TRASHED),
o if o.eq_ignore_ascii_case("trash") => Some(Flag::TRASHED),
o if o.eq_ignore_ascii_case("trashed") => Some(Flag::TRASHED),
o if o.eq_ignore_ascii_case("draft") => Some(Flag::DRAFT),
o if o.eq_ignore_ascii_case("flagged") => Some(Flag::FLAGGED),
_ => None,
}
}
preceded(
tag("flag"),
alt((
|input: &'a [u8]| -> IResult<&'a [u8], Result<Action, CommandError>> {
let mut check = arg_init! { min_arg:2, max_arg: 2, flag};
let (input, _) = tag("set")(input.trim())?;
arg_chk!(start check, input);
let (input, _) = is_a(" ")(input)?;
arg_chk!(inc check, input);
let (input, flag) = quoted_argument(input.trim())?;
arg_chk!(finish check, input);
let (input, _) = eof(input)?;
let Some(flag) = parse_flag(flag) else {
return Ok((
b"",
Err(CommandError::BadValue {
inner: format!(
"{flag} is not a valid flag name. Possible values are: passed, \
replied, seen or read, junk or trash or trashed, draft and \
flagged."
)
.into(),
}),
));
};
Ok((input, Ok(Listing(Flag(FlagAction::Set(flag))))))
},
|input: &'a [u8]| -> IResult<&'a [u8], Result<Action, CommandError>> {
let mut check = arg_init! { min_arg:2, max_arg: 2, flag};
let (input, _) = tag("unset")(input.trim())?;
arg_chk!(start check, input);
let (input, _) = is_a(" ")(input)?;
arg_chk!(inc check, input);
let (input, flag) = quoted_argument(input.trim())?;
arg_chk!(finish check, input);
let (input, _) = eof(input)?;
let Some(flag) = parse_flag(flag) else {
return Ok((
b"",
Err(CommandError::BadValue {
inner: format!(
"{flag} is not a valid flag name. Possible values are: passed, \
replied, seen or read, junk or trash or trashed, draft and \
flagged."
)
.into(),
}),
));
};
Ok((input, Ok(Listing(Flag(FlagAction::Unset(flag))))))
},
)),
)(input.trim())
}
pub fn set(input: &[u8]) -> IResult<&[u8], Result<Action, CommandError>> {
fn toggle(input: &[u8]) -> IResult<&[u8], Result<Action, CommandError>> {
let mut check = arg_init! { min_arg:1, max_arg: 1, set};
@ -708,6 +836,19 @@ pub fn add_addresses_to_contacts(input: &[u8]) -> IResult<&[u8], Result<Action,
let (input, _) = eof(input)?;
Ok((input, Ok(View(AddAddressesToContacts))))
}
/// Set/unset a tag.
///
/// # Example
///
/// ```
/// # use meli::command::{Action,ListingAction, TagAction, parser::_tag};
///
/// let (rest, parsed) = _tag(b"tag add newsletters").unwrap();
/// println!("parsed is {:?}", parsed);
/// assert_eq!(rest, b"");
/// assert!(matches!(parsed, Ok(Action::Listing(ListingAction::Tag(TagAction::Add(ref tagname)))) if tagname == "newsletters"), "{:?}", parsed);
/// ```
pub fn _tag<'a>(input: &'a [u8]) -> IResult<&'a [u8], Result<Action, CommandError>> {
preceded(
tag("tag"),
@ -721,7 +862,7 @@ pub fn _tag<'a>(input: &'a [u8]) -> IResult<&'a [u8], Result<Action, CommandErro
let (input, tag) = quoted_argument(input.trim())?;
arg_chk!(finish check, input);
let (input, _) = eof(input)?;
Ok((input, Ok(Listing(Tag(Add(tag.to_string()))))))
Ok((input, Ok(Listing(Tag(TagAction::Add(tag.to_string()))))))
},
|input: &'a [u8]| -> IResult<&'a [u8], Result<Action, CommandError>> {
let mut check = arg_init! { min_arg:2, max_arg: 2, tag};
@ -732,11 +873,12 @@ pub fn _tag<'a>(input: &'a [u8]) -> IResult<&'a [u8], Result<Action, CommandErro
let (input, tag) = quoted_argument(input.trim())?;
arg_chk!(finish check, input);
let (input, _) = eof(input)?;
Ok((input, Ok(Listing(Tag(Remove(tag.to_string()))))))
Ok((input, Ok(Listing(Tag(TagAction::Remove(tag.to_string()))))))
},
)),
)(input.trim())
}
pub fn print_account_setting(input: &[u8]) -> IResult<&[u8], Result<Action, CommandError>> {
let mut check = arg_init! { min_arg:2, max_arg: 2, print};
let (input, _) = tag("print")(input.trim())?;

4
meli/src/mail/listing.rs
View File

@ -546,7 +546,7 @@ pub trait MailListingTrait: ListingTrait {
));
}
}
ListingAction::Tag(Add(ref tag_str)) => {
ListingAction::Tag(TagAction::Add(ref tag_str)) => {
if let Err(err) = account.set_flags(
env_hashes.clone(),
mailbox_hash,
@ -557,7 +557,7 @@ pub trait MailListingTrait: ListingTrait {
));
}
}
ListingAction::Tag(Remove(ref tag_str)) => {
ListingAction::Tag(TagAction::Remove(ref tag_str)) => {
if let Err(err) = account.set_flags(
env_hashes.clone(),
mailbox_hash,