From b55742509a3ce67adb467ebf91fe52056023c1e4 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 14 Apr 2020 20:27:33 +1000 Subject: [PATCH] embed sort kind enum to avoid future namespace conflicts --- proto/backend.proto | 30 +++++++++++++++--------------- pylib/anki/rsbackend.py | 2 +- rslib/src/backend/mod.rs | 7 +++---- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/proto/backend.proto b/proto/backend.proto index 1ecd6fb11..b89dbf294 100644 --- a/proto/backend.proto +++ b/proto/backend.proto @@ -393,25 +393,25 @@ message SearchNotesOut { } 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; 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 { Card card = 1; diff --git a/pylib/anki/rsbackend.py b/pylib/anki/rsbackend.py index c0cdcbd3d..8e1bec29c 100644 --- a/pylib/anki/rsbackend.py +++ b/pylib/anki/rsbackend.py @@ -45,7 +45,7 @@ from anki.utils import intTime assert ankirspy.buildhash() == anki.buildinfo.buildhash SchedTimingToday = pb.SchedTimingTodayOut -BuiltinSortKind = pb.BuiltinSortKind +BuiltinSortKind = pb.BuiltinSearchOrder.BuiltinSortKind BackendCard = pb.Card TagUsnTuple = pb.TagUsnTuple diff --git a/rslib/src/backend/mod.rs b/rslib/src/backend/mod.rs index bd838bf41..8a680d2ea 100644 --- a/rslib/src/backend/mod.rs +++ b/rslib/src/backend/mod.rs @@ -4,9 +4,8 @@ use crate::{ backend::dbproxy::db_command_bytes, backend_proto as pb, - backend_proto::{ - AddOrUpdateDeckConfigIn, BuiltinSortKind, Empty, RenderedTemplateReplacement, SyncMediaIn, - }, + backend_proto::builtin_search_order::BuiltinSortKind, + backend_proto::{AddOrUpdateDeckConfigIn, Empty, RenderedTemplateReplacement, SyncMediaIn}, card::{Card, CardID}, card::{CardQueue, CardType}, 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 { use SortKind as SK; - match pb::BuiltinSortKind::from_i32(kind) { + match BuiltinSortKind::from_i32(kind) { Some(pbkind) => match pbkind { BuiltinSortKind::NoteCreation => SK::NoteCreation, BuiltinSortKind::NoteMod => SK::NoteMod,