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

convert sort_kind_from_pb into from impl

Browse source
This commit is contained in:
Damien Elmes 2021-01-08 09:42:54 +10:00
parent 1a5b5f09cc
commit cbeb714062
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@ 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, backend_proto::builtin_search_order::BuiltinSortKind as SortKindProto,
backend_proto::concatenate_searches_in::Separator as BoolSeparatorProto, backend_proto::concatenate_searches_in::Separator as BoolSeparatorProto,
backend_proto::{ backend_proto::{
AddOrUpdateDeckConfigLegacyIn, BackendResult, Empty, RenderedTemplateReplacement, AddOrUpdateDeckConfigLegacyIn, BackendResult, Empty, RenderedTemplateReplacement,
@ -419,7 +419,7 @@ impl BackendService for Backend {
Some(V::Custom(s)) => SortMode::Custom(s), Some(V::Custom(s)) => SortMode::Custom(s),
Some(V::FromConfig(_)) => SortMode::FromConfig, Some(V::FromConfig(_)) => SortMode::FromConfig,
Some(V::Builtin(b)) => SortMode::Builtin { Some(V::Builtin(b)) => SortMode::Builtin {
kind: sort_kind_from_pb(b.kind), kind: SortKindProto::from_i32(b.kind).unwrap_or_default().into(),
reverse: b.reverse, reverse: b.reverse,
}, },
None => SortMode::FromConfig, None => SortMode::FromConfig,
@ -1834,25 +1834,23 @@ fn media_sync_progress(p: MediaSyncProgress, i18n: &I18n) -> pb::MediaSyncProgre
} }
} }
fn sort_kind_from_pb(kind: i32) -> SortKind { impl From<SortKindProto> for SortKind {
use SortKind as SK; fn from(kind: SortKindProto) -> Self {
match BuiltinSortKind::from_i32(kind) { match kind {
Some(pbkind) => match pbkind { SortKindProto::NoteCreation => SortKind::NoteCreation,
BuiltinSortKind::NoteCreation => SK::NoteCreation, SortKindProto::NoteMod => SortKind::NoteMod,
BuiltinSortKind::NoteMod => SK::NoteMod, SortKindProto::NoteField => SortKind::NoteField,
BuiltinSortKind::NoteField => SK::NoteField, SortKindProto::NoteTags => SortKind::NoteTags,
BuiltinSortKind::NoteTags => SK::NoteTags, SortKindProto::NoteType => SortKind::NoteType,
BuiltinSortKind::NoteType => SK::NoteType, SortKindProto::CardMod => SortKind::CardMod,
BuiltinSortKind::CardMod => SK::CardMod, SortKindProto::CardReps => SortKind::CardReps,
BuiltinSortKind::CardReps => SK::CardReps, SortKindProto::CardDue => SortKind::CardDue,
BuiltinSortKind::CardDue => SK::CardDue, SortKindProto::CardEase => SortKind::CardEase,
BuiltinSortKind::CardEase => SK::CardEase, SortKindProto::CardLapses => SortKind::CardLapses,
BuiltinSortKind::CardLapses => SK::CardLapses, SortKindProto::CardInterval => SortKind::CardInterval,
BuiltinSortKind::CardInterval => SK::CardInterval, SortKindProto::CardDeck => SortKind::CardDeck,
BuiltinSortKind::CardDeck => SK::CardDeck, SortKindProto::CardTemplate => SortKind::CardTemplate,
BuiltinSortKind::CardTemplate => SK::CardTemplate, }
},
_ => SortKind::NoteCreation,
} }
} }