nest search term message/order enum

This commit is contained in:
Damien Elmes 2021-03-23 23:28:50 +10:00
parent 6db47c2ea5
commit b5c58ff8e6
3 changed files with 25 additions and 23 deletions

View file

@ -385,30 +385,30 @@ message NormalDeck {
} }
message FilteredDeck { message FilteredDeck {
bool reschedule = 1; message SearchTerm {
repeated FilteredSearchTerm search_terms = 2; enum Order {
// v1 scheduler only OLDEST_FIRST = 0;
repeated float delays = 3; RANDOM = 1;
// v2 scheduler only INTERVALS_ASCENDING = 2;
uint32 preview_delay = 4; INTERVALS_DESCENDING = 3;
} LAPSES = 4;
ADDED = 5;
message FilteredSearchTerm { DUE = 6;
enum FilteredSearchOrder { REVERSE_ADDED = 7;
FILTERED_SEARCH_ORDER_OLDEST_FIRST = 0; DUE_PRIORITY = 8;
FILTERED_SEARCH_ORDER_RANDOM = 1;
FILTERED_SEARCH_ORDER_INTERVALS_ASCENDING = 2;
FILTERED_SEARCH_ORDER_INTERVALS_DESCENDING = 3;
FILTERED_SEARCH_ORDER_LAPSES = 4;
FILTERED_SEARCH_ORDER_ADDED = 5;
FILTERED_SEARCH_ORDER_DUE = 6;
FILTERED_SEARCH_ORDER_REVERSE_ADDED = 7;
FILTERED_SEARCH_ORDER_DUE_PRIORITY = 8;
} }
string search = 1; string search = 1;
uint32 limit = 2; uint32 limit = 2;
FilteredSearchOrder order = 3; Order order = 3;
}
bool reschedule = 1;
repeated SearchTerm search_terms = 2;
// v1 scheduler only
repeated float delays = 3;
// v2 scheduler only
uint32 preview_delay = 4;
} }
message NoteFieldConfig { message NoteFieldConfig {

View file

@ -7,8 +7,9 @@ mod tree;
pub(crate) mod undo; pub(crate) mod undo;
pub use crate::backend_proto::{ pub use crate::backend_proto::{
deck_kind::Kind as DeckKind, filtered_search_term::FilteredSearchOrder, Deck as DeckProto, deck_kind::Kind as DeckKind,
DeckCommon, DeckKind as DeckKindProto, FilteredDeck, FilteredSearchTerm, NormalDeck, filtered_deck::{search_term::Order as FilteredSearchOrder, SearchTerm as FilteredSearchTerm},
Deck as DeckProto, DeckCommon, DeckKind as DeckKindProto, FilteredDeck, NormalDeck,
}; };
use crate::{backend_proto as pb, markdown::render_markdown, text::sanitize_html_no_images}; use crate::{backend_proto as pb, markdown::render_markdown, text::sanitize_html_no_images};
use crate::{ use crate::{

View file

@ -2,10 +2,11 @@
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
pub use crate::backend_proto::{ pub use crate::backend_proto::{
deck_kind::Kind as DeckKind, filtered_search_term::FilteredSearchOrder, Deck as DeckProto, deck_kind::Kind as DeckKind, Deck as DeckProto, DeckCommon, DeckKind as DeckKindProto,
DeckCommon, DeckKind as DeckKindProto, FilteredDeck, FilteredSearchTerm, NormalDeck, FilteredDeck, NormalDeck,
}; };
use crate::decks::{Deck, DeckID}; use crate::decks::{Deck, DeckID};
use crate::decks::{FilteredSearchOrder, FilteredSearchTerm};
use crate::{ use crate::{
card::{Card, CardID, CardQueue, CardType}, card::{Card, CardID, CardQueue, CardType},
collection::Collection, collection::Collection,