From 705012164b2751792c27acb8398a9b915f1a7787 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sat, 30 Jan 2021 11:54:39 +1000 Subject: [PATCH] move Rating up a level More ergonomic, and will allow reuse if we expose prop:rated in the future. --- qt/aqt/browser.py | 2 +- qt/aqt/customstudy.py | 2 +- rslib/backend.proto | 16 ++++++++-------- rslib/src/backend/mod.rs | 16 ++++++++-------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt/aqt/browser.py b/qt/aqt/browser.py index 77bf9def9..9a1a1a34a 100644 --- a/qt/aqt/browser.py +++ b/qt/aqt/browser.py @@ -1001,7 +1001,7 @@ QTableView {{ gridline-color: {grid} }} tr(TR.BROWSING_AGAIN_TODAY), SearchTerm( rated=SearchTerm.Rated( - days=1, rating=SearchTerm.Rated.Rating.ANSWER_BUTTON_1 + days=1, rating=SearchTerm.Rating.ANSWER_BUTTON_1 ) ), ), diff --git a/qt/aqt/customstudy.py b/qt/aqt/customstudy.py index 4610f9910..335689506 100644 --- a/qt/aqt/customstudy.py +++ b/qt/aqt/customstudy.py @@ -163,7 +163,7 @@ class CustomStudy(QDialog): search = self.mw.col.build_search_string( SearchTerm( rated=SearchTerm.Rated( - days=spin, rating=SearchTerm.Rated.Rating.ANSWER_BUTTON_1 + days=spin, rating=SearchTerm.Rating.ANSWER_BUTTON_1 ) ) ) diff --git a/rslib/backend.proto b/rslib/backend.proto index 238a71de6..cdb4aa988 100644 --- a/rslib/backend.proto +++ b/rslib/backend.proto @@ -777,15 +777,15 @@ message SearchTerm { GREEN = 4; BLUE = 5; } + enum Rating { + ANY_ANSWER_BUTTON = 0; + ANSWER_BUTTON_1 = 1; + ANSWER_BUTTON_2 = 2; + ANSWER_BUTTON_3 = 3; + ANSWER_BUTTON_4 = 4; + MANUAL_RESCHEDULE = 5; + } message Rated { - enum Rating { - ANY_ANSWER_BUTTON = 0; - ANSWER_BUTTON_1 = 1; - ANSWER_BUTTON_2 = 2; - ANSWER_BUTTON_3 = 3; - ANSWER_BUTTON_4 = 4; - MANUAL_RESCHEDULE = 5; - } uint32 days = 1; Rating rating = 2; } diff --git a/rslib/src/backend/mod.rs b/rslib/src/backend/mod.rs index 52e0e6be9..2bd5f5a96 100644 --- a/rslib/src/backend/mod.rs +++ b/rslib/src/backend/mod.rs @@ -355,15 +355,15 @@ impl From for BoolSeparator { } } -impl From for EaseKind { - fn from(r: pb::search_term::rated::Rating) -> Self { +impl From for EaseKind { + fn from(r: pb::search_term::Rating) -> Self { match r { - pb::search_term::rated::Rating::AnswerButton1 => EaseKind::AnswerButton(1), - pb::search_term::rated::Rating::AnswerButton2 => EaseKind::AnswerButton(2), - pb::search_term::rated::Rating::AnswerButton3 => EaseKind::AnswerButton(3), - pb::search_term::rated::Rating::AnswerButton4 => EaseKind::AnswerButton(4), - pb::search_term::rated::Rating::AnyAnswerButton => EaseKind::AnyAnswerButton, - pb::search_term::rated::Rating::ManualReschedule => EaseKind::ManualReschedule, + pb::search_term::Rating::AnswerButton1 => EaseKind::AnswerButton(1), + pb::search_term::Rating::AnswerButton2 => EaseKind::AnswerButton(2), + pb::search_term::Rating::AnswerButton3 => EaseKind::AnswerButton(3), + pb::search_term::Rating::AnswerButton4 => EaseKind::AnswerButton(4), + pb::search_term::Rating::AnyAnswerButton => EaseKind::AnyAnswerButton, + pb::search_term::Rating::ManualReschedule => EaseKind::ManualReschedule, } } }