From b5c58ff8e61aa9f472e4061fdbc0fcfc31d40eb6 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Tue, 23 Mar 2021 23:28:50 +1000
Subject: [PATCH] nest search term message/order enum

---
 rslib/backend.proto    | 38 +++++++++++++++++++-------------------
 rslib/src/decks/mod.rs |  5 +++--
 rslib/src/filtered.rs  |  5 +++--
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/rslib/backend.proto b/rslib/backend.proto
index 8b37fbda8..32dd788da 100644
--- a/rslib/backend.proto
+++ b/rslib/backend.proto
@@ -385,32 +385,32 @@ message NormalDeck {
 }
 
 message FilteredDeck {
+  message SearchTerm {
+    enum Order {
+      OLDEST_FIRST = 0;
+      RANDOM = 1;
+      INTERVALS_ASCENDING = 2;
+      INTERVALS_DESCENDING = 3;
+      LAPSES = 4;
+      ADDED = 5;
+      DUE = 6;
+      REVERSE_ADDED = 7;
+      DUE_PRIORITY = 8;
+    }
+
+    string search = 1;
+    uint32 limit = 2;
+    Order order = 3;
+  }
+
   bool reschedule = 1;
-  repeated FilteredSearchTerm search_terms = 2;
+  repeated SearchTerm search_terms = 2;
   // v1 scheduler only
   repeated float delays = 3;
   // v2 scheduler only
   uint32 preview_delay = 4;
 }
 
-message FilteredSearchTerm {
-  enum FilteredSearchOrder {
-    FILTERED_SEARCH_ORDER_OLDEST_FIRST = 0;
-    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;
-  uint32 limit = 2;
-  FilteredSearchOrder order = 3;
-}
-
 message NoteFieldConfig {
   bool sticky = 1;
   bool rtl = 2;
diff --git a/rslib/src/decks/mod.rs b/rslib/src/decks/mod.rs
index 8c1029436..69b69bafe 100644
--- a/rslib/src/decks/mod.rs
+++ b/rslib/src/decks/mod.rs
@@ -7,8 +7,9 @@ mod tree;
 pub(crate) mod undo;
 
 pub use crate::backend_proto::{
-    deck_kind::Kind as DeckKind, filtered_search_term::FilteredSearchOrder, Deck as DeckProto,
-    DeckCommon, DeckKind as DeckKindProto, FilteredDeck, FilteredSearchTerm, NormalDeck,
+    deck_kind::Kind as DeckKind,
+    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::{
diff --git a/rslib/src/filtered.rs b/rslib/src/filtered.rs
index 0fae27f07..bc2a5047b 100644
--- a/rslib/src/filtered.rs
+++ b/rslib/src/filtered.rs
@@ -2,10 +2,11 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 pub use crate::backend_proto::{
-    deck_kind::Kind as DeckKind, filtered_search_term::FilteredSearchOrder, Deck as DeckProto,
-    DeckCommon, DeckKind as DeckKindProto, FilteredDeck, FilteredSearchTerm, NormalDeck,
+    deck_kind::Kind as DeckKind, Deck as DeckProto, DeckCommon, DeckKind as DeckKindProto,
+    FilteredDeck, NormalDeck,
 };
 use crate::decks::{Deck, DeckID};
+use crate::decks::{FilteredSearchOrder, FilteredSearchTerm};
 use crate::{
     card::{Card, CardID, CardQueue, CardType},
     collection::Collection,