GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-12-11 13:56:55 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

handle SortOrderProto conversion separately, and use enum getter

Browse source 
In most cases we can just fall back on the default enum value instead
of caring if it's missing/invalid.
This commit is contained in:
Damien Elmes 2021-01-08 15:56:20 +10:00
parent cbeb714062
commit 10630ab723
1 changed files with 26 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,10 +5,11 @@ pub use crate::backend_proto::BackendMethod;
use crate::{ use crate::{
backend::dbproxy::db_command_bytes, backend::dbproxy::db_command_bytes,
backend_proto as pb, backend_proto as pb,
backend_proto::builtin_search_order::BuiltinSortKind as SortKindProto,
backend_proto::concatenate_searches_in::Separator as BoolSeparatorProto,
backend_proto::{ backend_proto::{
AddOrUpdateDeckConfigLegacyIn, BackendResult, Empty, RenderedTemplateReplacement, builtin_search_order::BuiltinSortKind as SortKindProto,
concatenate_searches_in::Separator as BoolSeparatorProto,
sort_order::Value as SortOrderProto, AddOrUpdateDeckConfigLegacyIn, BackendResult, Empty,
RenderedTemplateReplacement,
}, },
card::{Card, CardID}, card::{Card, CardID},
card::{CardQueue, CardType}, card::{CardQueue, CardType},
@ -412,21 +413,7 @@ impl BackendService for Backend {
fn search_cards(&self, input: pb::SearchCardsIn) -> Result<pb::SearchCardsOut> { fn search_cards(&self, input: pb::SearchCardsIn) -> Result<pb::SearchCardsOut> {
self.with_col(|col| { self.with_col(|col| {
let order = if let Some(order) = input.order { let order = input.order.unwrap_or_default().value.into();
use pb::sort_order::Value as V;
match order.value {
Some(V::None(_)) => SortMode::NoOrder,
Some(V::Custom(s)) => SortMode::Custom(s),
Some(V::FromConfig(_)) => SortMode::FromConfig,
Some(V::Builtin(b)) => SortMode::Builtin {
kind: SortKindProto::from_i32(b.kind).unwrap_or_default().into(),
reverse: b.reverse,
},
None => SortMode::FromConfig,
}
} else {
SortMode::FromConfig
};
let cids = col.search_cards(&input.search, order)?; let cids = col.search_cards(&input.search, order)?;
Ok(pb::SearchCardsOut { Ok(pb::SearchCardsOut {
card_ids: cids.into_iter().map(|v| v.0).collect(), card_ids: cids.into_iter().map(|v| v.0).collect(),
@ -448,13 +435,7 @@ impl BackendService for Backend {
} }
fn concatenate_searches(&self, input: pb::ConcatenateSearchesIn) -> Result<pb::String> { fn concatenate_searches(&self, input: pb::ConcatenateSearchesIn) -> Result<pb::String> {
Ok(concatenate_searches( Ok(concatenate_searches(input.sep().into(), &input.searches)?.into())
BoolSeparatorProto::from_i32(input.sep)
.unwrap_or_default()
.into(),
&input.searches,
)?
.into())
} }
fn replace_search_term(&self, input: pb::ReplaceSearchTermIn) -> Result<pb::String> { fn replace_search_term(&self, input: pb::ReplaceSearchTermIn) -> Result<pb::String> {
@ -1280,18 +1261,11 @@ impl BackendService for Backend {
} }
fn format_timespan(&self, input: pb::FormatTimespanIn) -> BackendResult<pb::String> { fn format_timespan(&self, input: pb::FormatTimespanIn) -> BackendResult<pb::String> {
let context = match pb::format_timespan_in::Context::from_i32(input.context) { use pb::format_timespan_in::Context;
Some(context) => context, Ok(match input.context() {
None => return Ok("".to_string().into()), Context::Precise => time_span(input.seconds, &self.i18n, true),
}; Context::Intervals => time_span(input.seconds, &self.i18n, false),
Ok(match context { Context::AnswerButtons => answer_button_time(input.seconds, &self.i18n),
pb::format_timespan_in::Context::Precise => time_span(input.seconds, &self.i18n, true),
pb::format_timespan_in::Context::Intervals => {
time_span(input.seconds, &self.i18n, false)
}
pb::format_timespan_in::Context::AnswerButtons => {
answer_button_time(input.seconds, &self.i18n)
}
} }
.into()) .into())
} }
@ -1854,6 +1828,21 @@ impl From<SortKindProto> for SortKind {
} }
} }
impl From<Option<SortOrderProto>> for SortMode {
fn from(order: Option<SortOrderProto>) -> Self {
use pb::sort_order::Value as V;
match order.unwrap_or(V::FromConfig(pb::Empty {})) {
V::None(_) => SortMode::NoOrder,
V::Custom(s) => SortMode::Custom(s),
V::FromConfig(_) => SortMode::FromConfig,
V::Builtin(b) => SortMode::Builtin {
kind: b.kind().into(),
reverse: b.reverse,
},
}
}
}
impl From<Card> for pb::Card { impl From<Card> for pb::Card {
fn from(c: Card) -> Self { fn from(c: Card) -> Self {
pb::Card { pb::Card {