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

embed sort kind enum to avoid future namespace conflicts

Browse source
This commit is contained in:
Damien Elmes 2020-04-14 20:27:33 +10:00
parent a686f2cf44
commit b55742509a
3 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
proto/backend.proto
View file

@ -393,25 +393,25 @@ message SearchNotesOut {
} }
message BuiltinSearchOrder { message BuiltinSearchOrder {
enum BuiltinSortKind {
NOTE_CREATION = 0;
NOTE_MOD = 1;
NOTE_FIELD = 2;
NOTE_TAGS = 3;
NOTE_TYPE = 4;
CARD_MOD = 5;
CARD_REPS = 6;
CARD_DUE = 7;
CARD_EASE = 8;
CARD_LAPSES = 9;
CARD_INTERVAL = 10;
CARD_DECK = 11;
CARD_TEMPLATE = 12;
}
BuiltinSortKind kind = 1; BuiltinSortKind kind = 1;
bool reverse = 2; bool reverse = 2;
} }
enum BuiltinSortKind {
NOTE_CREATION = 0;
NOTE_MOD = 1;
NOTE_FIELD = 2;
NOTE_TAGS = 3;
NOTE_TYPE = 4;
CARD_MOD = 5;
CARD_REPS = 6;
CARD_DUE = 7;
CARD_EASE = 8;
CARD_LAPSES = 9;
CARD_INTERVAL = 10;
CARD_DECK = 11;
CARD_TEMPLATE = 12;
}
message GetCardOut { message GetCardOut {
Card card = 1; Card card = 1;

2
pylib/anki/rsbackend.py
View file

@ -45,7 +45,7 @@ from anki.utils import intTime
assert ankirspy.buildhash() == anki.buildinfo.buildhash assert ankirspy.buildhash() == anki.buildinfo.buildhash
SchedTimingToday = pb.SchedTimingTodayOut SchedTimingToday = pb.SchedTimingTodayOut
BuiltinSortKind = pb.BuiltinSortKind BuiltinSortKind = pb.BuiltinSearchOrder.BuiltinSortKind
BackendCard = pb.Card BackendCard = pb.Card
TagUsnTuple = pb.TagUsnTuple TagUsnTuple = pb.TagUsnTuple

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

@ -4,9 +4,8 @@
use crate::{ use crate::{
backend::dbproxy::db_command_bytes, backend::dbproxy::db_command_bytes,
backend_proto as pb, backend_proto as pb,
backend_proto::{ backend_proto::builtin_search_order::BuiltinSortKind,
AddOrUpdateDeckConfigIn, BuiltinSortKind, Empty, RenderedTemplateReplacement, SyncMediaIn, backend_proto::{AddOrUpdateDeckConfigIn, Empty, RenderedTemplateReplacement, SyncMediaIn},
},
card::{Card, CardID}, card::{Card, CardID},
card::{CardQueue, CardType}, card::{CardQueue, CardType},
collection::{open_collection, Collection}, collection::{open_collection, Collection},
@ -956,7 +955,7 @@ fn media_sync_progress(p: &MediaSyncProgress, i18n: &I18n) -> pb::MediaSyncProgr
fn sort_kind_from_pb(kind: i32) -> SortKind { fn sort_kind_from_pb(kind: i32) -> SortKind {
use SortKind as SK; use SortKind as SK;
match pb::BuiltinSortKind::from_i32(kind) { match BuiltinSortKind::from_i32(kind) {
Some(pbkind) => match pbkind { Some(pbkind) => match pbkind {
BuiltinSortKind::NoteCreation => SK::NoteCreation, BuiltinSortKind::NoteCreation => SK::NoteCreation,
BuiltinSortKind::NoteMod => SK::NoteMod, BuiltinSortKind::NoteMod => SK::NoteMod,