GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 06:22:22 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Rename EaseKind values

Browse source
This commit is contained in:
Henrik Giesel 2021-01-13 11:41:48 +01:00
parent 81d851610e
commit c0ec21b139
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rslib/src/backend/mod.rs
View file

@ -292,11 +292,11 @@ impl From<pb::FilterToSearchIn> for Node<'_> {
NamedFilter::AddedToday => Node::Search(SearchNode::AddedInDays(1)), NamedFilter::AddedToday => Node::Search(SearchNode::AddedInDays(1)),
NamedFilter::StudiedToday => Node::Search(SearchNode::Rated { NamedFilter::StudiedToday => Node::Search(SearchNode::Rated {
days: 1, days: 1,
ease: EaseKind::Reviewed, ease: EaseKind::AnyAnswerButton,
}), }),
NamedFilter::AgainToday => Node::Search(SearchNode::Rated { NamedFilter::AgainToday => Node::Search(SearchNode::Rated {
days: 1, days: 1,
ease: EaseKind::Rated(1), ease: EaseKind::AnswerButton(1),
}), }),
NamedFilter::New => Node::Search(SearchNode::State(StateKind::New)), NamedFilter::New => Node::Search(SearchNode::State(StateKind::New)),
NamedFilter::Learn => Node::Search(SearchNode::State(StateKind::Learning)), NamedFilter::Learn => Node::Search(SearchNode::State(StateKind::Learning)),

14
rslib/src/search/parser.rs
View file

@ -120,9 +120,9 @@ pub enum TemplateKind<'a> {
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
pub enum EaseKind { pub enum EaseKind {
Rated(u8), AnswerButton(u8),
Reviewed, AnyAnswerButton,
Manually, ManualReschedule,
} }
/// Parse the input string into a list of nodes. /// Parse the input string into a list of nodes.
@ -367,14 +367,14 @@ fn parse_rated(val: &str) -> ParseResult<SearchNode<'static>> {
let ease = match it.next() { let ease = match it.next() {
Some(v) => { Some(v) => {
let u: u8 = v.parse().unwrap(); let u: u8 = v.parse()?;
if (1..5).contains(&u) { if (1..5).contains(&u) {
EaseKind::Rated(u) EaseKind::AnswerButton(u)
} else { } else {
return Err(ParseError {}); return Err(ParseError {});
} }
} }
None => EaseKind::Reviewed, None => EaseKind::AnyAnswerButton,
}; };
Ok(SearchNode::Rated { days, ease }) Ok(SearchNode::Rated { days, ease })
@ -387,7 +387,7 @@ fn parse_resched(val: &str) -> ParseResult<SearchNode<'static>> {
let n: u32 = it.next().unwrap().parse()?; let n: u32 = it.next().unwrap().parse()?;
let days = n.max(1).min(365); let days = n.max(1).min(365);
let ease = EaseKind::Manually; let ease = EaseKind::ManualReschedule;
Ok(SearchNode::Rated { days, ease }) Ok(SearchNode::Rated { days, ease })
} }

6
rslib/src/search/sqlwriter.rs
View file

@ -225,9 +225,9 @@ impl SqlWriter<'_> {
.unwrap(); .unwrap();
match ease { match ease {
EaseKind::Rated(u) => write!(self.sql, " and ease = {})", u), EaseKind::AnswerButton(u) => write!(self.sql, " and ease = {})", u),
EaseKind::Reviewed => write!(self.sql, " and ease between 1 and 4)"), EaseKind::AnyAnswerButton => write!(self.sql, " and ease between 1 and 4)"),
EaseKind::Manually => write!(self.sql, " and ease = 0)"), EaseKind::ManualReschedule => write!(self.sql, " and ease = 0)"),
} }
.unwrap(); .unwrap();

6
rslib/src/search/writer.rs
View file

@ -157,9 +157,9 @@ fn write_template(template: &TemplateKind) -> String {
fn write_rated(days: &u32, ease: &EaseKind) -> String { fn write_rated(days: &u32, ease: &EaseKind) -> String {
use EaseKind::*; use EaseKind::*;
match ease { match ease {
Rated(n) => format!("\"rated:{}:{}\"", days, n), AnswerButton(n) => format!("\"rated:{}:{}\"", days, n),
Reviewed => format!("\"rated:{}\"", days), AnyAnswerButton => format!("\"rated:{}\"", days),
Manually => format!("\"resched:{}\"", days), ManualReschedule => format!("\"resched:{}\"", days),
} }
} }