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

Fix issues after rebasing

Browse source
This commit is contained in:
Henrik Giesel 2021-01-16 13:07:35 +01:00
parent 908e0a375c
commit 47542f97e5
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -402,7 +402,7 @@ fn parse_prop(s: &str) -> ParseResult<SearchNode> {
FailKind::InvalidPropInteger(format!("{}{}", prop, operator)), FailKind::InvalidPropInteger(format!("{}{}", prop, operator)),
)); ));
} }
} else if key == "rated" { } else if prop == "rated" {
let mut it = num.splitn(2, ':'); let mut it = num.splitn(2, ':');
let days: i32 = if let Ok(i) = it.next().unwrap().parse::<i32>() { let days: i32 = if let Ok(i) = it.next().unwrap().parse::<i32>() {
@ -412,13 +412,13 @@ fn parse_prop(s: &str) -> ParseResult<SearchNode> {
s, s,
FailKind::InvalidPropInteger(format!("{}{}", prop, operator)), FailKind::InvalidPropInteger(format!("{}{}", prop, operator)),
)); ));
} };
let ease = match it.next() { let ease = match it.next() {
Some(v) => { Some(v) => {
let n: u8 = if let Ok(i) = v.parse() { if let Ok(u) = v.parse::<u8>() {
if (1..5).contains(i) { if (1..5).contains(&u) {
EaseKind::AnswerButton(i) EaseKind::AnswerButton(u)
} else { } else {
return Err(parse_failure( return Err(parse_failure(
s, s,
@ -436,16 +436,7 @@ fn parse_prop(s: &str) -> ParseResult<SearchNode> {
}; };
PropertyKind::Rated(days, ease) PropertyKind::Rated(days, ease)
} else if key == "resched" { } else if prop == "resched" {
let mut it = val.splitn(2, ':');
let n: i32 = it.next().unwrap().parse()?;
let days = n.max(-365).min(0);
let ease = EaseKind::ManualReschedule;
PropertyKind::Rated(days, ease)
} else if key == "resched" {
if let Ok(days) = num.parse::<i32>() { if let Ok(days) = num.parse::<i32>() {
PropertyKind::Rated(days, EaseKind::ManualReschedule) PropertyKind::Rated(days, EaseKind::ManualReschedule)
} else { } else {