From ffadbf577b2bf2ca9ee7ef6d7507f25145ee0932 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 3 Jul 2023 13:44:54 +1000 Subject: [PATCH] deckconfig.proto -> deck_config.proto Makes it consistent with our other proto files, and matches the service name. --- .../{deckconfig.proto => deck_config.proto} | 2 +- pylib/anki/decks.py | 6 ++-- rslib/proto/python.rs | 2 +- rslib/proto/src/lib.rs | 5 ++- rslib/src/deckconfig/mod.rs | 14 ++++---- rslib/src/deckconfig/service.rs | 32 +++++++++---------- rslib/src/deckconfig/update.rs | 10 +++--- rslib/src/scheduler/queue/builder/mod.rs | 4 +-- ts/deck-options/DisplayOrder.svelte | 2 +- ts/deck-options/NewOptions.svelte | 2 +- ts/deck-options/lib.test.ts | 2 +- ts/deck-options/lib.ts | 6 ++-- 12 files changed, 45 insertions(+), 42 deletions(-) rename proto/anki/{deckconfig.proto => deck_config.proto} (99%) diff --git a/proto/anki/deckconfig.proto b/proto/anki/deck_config.proto similarity index 99% rename from proto/anki/deckconfig.proto rename to proto/anki/deck_config.proto index e12efaa28..d1ca4a0be 100644 --- a/proto/anki/deckconfig.proto +++ b/proto/anki/deck_config.proto @@ -7,7 +7,7 @@ option java_multiple_files = true; // the DeckConfig message clashes with the name of the file option java_outer_classname = "DeckConf"; -package anki.deckconfig; +package anki.deck_config; import "anki/generic.proto"; import "anki/collection.proto"; diff --git a/pylib/anki/decks.py b/pylib/anki/decks.py index dd81e2926..0ea73e1d8 100644 --- a/pylib/anki/decks.py +++ b/pylib/anki/decks.py @@ -11,7 +11,7 @@ if TYPE_CHECKING: import anki.cards import anki.collection -from anki import deckconfig_pb2, decks_pb2 +from anki import deck_config_pb2, decks_pb2 from anki._legacy import DeprecatedNamesMixin, deprecated, print_deprecation_warning from anki.collection import OpChanges, OpChangesWithCount, OpChangesWithId from anki.consts import * @@ -23,8 +23,8 @@ DeckTreeNode = decks_pb2.DeckTreeNode DeckNameId = decks_pb2.DeckNameId FilteredDeckConfig = decks_pb2.Deck.Filtered DeckCollapseScope = decks_pb2.SetDeckCollapsedRequest.Scope -DeckConfigsForUpdate = deckconfig_pb2.DeckConfigsForUpdate -UpdateDeckConfigs = deckconfig_pb2.UpdateDeckConfigsRequest +DeckConfigsForUpdate = deck_config_pb2.DeckConfigsForUpdate +UpdateDeckConfigs = deck_config_pb2.UpdateDeckConfigsRequest Deck = decks_pb2.Deck # type aliases until we can move away from dicts diff --git a/rslib/proto/python.rs b/rslib/proto/python.rs index 01850158d..67788568b 100644 --- a/rslib/proto/python.rs +++ b/rslib/proto/python.rs @@ -225,7 +225,7 @@ import anki.card_rendering_pb2 import anki.cards_pb2 import anki.collection_pb2 import anki.config_pb2 -import anki.deckconfig_pb2 +import anki.deck_config_pb2 import anki.decks_pb2 import anki.i18n_pb2 import anki.image_occlusion_pb2 diff --git a/rslib/proto/src/lib.rs b/rslib/proto/src/lib.rs index a995c57a4..e7d8ad6b3 100644 --- a/rslib/proto/src/lib.rs +++ b/rslib/proto/src/lib.rs @@ -1,6 +1,9 @@ // Copyright: Ankitects Pty Ltd and contributors // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html +// DeckConfig inside deck_config.proto +#![allow(clippy::module_inception)] + mod generic_helpers; macro_rules! protobuf { @@ -17,7 +20,7 @@ protobuf!(card_rendering, "card_rendering"); protobuf!(cards, "cards"); protobuf!(collection, "collection"); protobuf!(config, "config"); -protobuf!(deckconfig, "deckconfig"); +protobuf!(deck_config, "deck_config"); protobuf!(decks, "decks"); protobuf!(generic, "generic"); protobuf!(i18n, "i18n"); diff --git a/rslib/src/deckconfig/mod.rs b/rslib/src/deckconfig/mod.rs index 9b6f45f60..ba2f10eb0 100644 --- a/rslib/src/deckconfig/mod.rs +++ b/rslib/src/deckconfig/mod.rs @@ -6,13 +6,13 @@ mod service; pub(crate) mod undo; mod update; -pub use anki_proto::deckconfig::deck_config::config::LeechAction; -pub use anki_proto::deckconfig::deck_config::config::NewCardGatherPriority; -pub use anki_proto::deckconfig::deck_config::config::NewCardInsertOrder; -pub use anki_proto::deckconfig::deck_config::config::NewCardSortOrder; -pub use anki_proto::deckconfig::deck_config::config::ReviewCardOrder; -pub use anki_proto::deckconfig::deck_config::config::ReviewMix; -pub use anki_proto::deckconfig::deck_config::Config as DeckConfigInner; +pub use anki_proto::deck_config::deck_config::config::LeechAction; +pub use anki_proto::deck_config::deck_config::config::NewCardGatherPriority; +pub use anki_proto::deck_config::deck_config::config::NewCardInsertOrder; +pub use anki_proto::deck_config::deck_config::config::NewCardSortOrder; +pub use anki_proto::deck_config::deck_config::config::ReviewCardOrder; +pub use anki_proto::deck_config::deck_config::config::ReviewMix; +pub use anki_proto::deck_config::deck_config::Config as DeckConfigInner; pub use schema11::DeckConfSchema11; pub use schema11::NewCardOrderSchema11; pub use update::UpdateDeckConfigsRequest; diff --git a/rslib/src/deckconfig/service.rs b/rslib/src/deckconfig/service.rs index 438098321..451187afc 100644 --- a/rslib/src/deckconfig/service.rs +++ b/rslib/src/deckconfig/service.rs @@ -13,13 +13,13 @@ impl crate::services::DeckConfigService for Collection { fn add_or_update_deck_config_legacy( &mut self, input: generic::Json, - ) -> error::Result { + ) -> error::Result { let conf: DeckConfSchema11 = serde_json::from_slice(&input.json)?; let mut conf: DeckConfig = conf.into(); self.transact_no_undo(|col| { col.add_or_update_deck_config_legacy(&mut conf)?; - Ok(anki_proto::deckconfig::DeckConfigId { dcid: conf.id.0 }) + Ok(anki_proto::deck_config::DeckConfigId { dcid: conf.id.0 }) }) .map(Into::into) } @@ -38,8 +38,8 @@ impl crate::services::DeckConfigService for Collection { fn get_deck_config( &mut self, - input: anki_proto::deckconfig::DeckConfigId, - ) -> error::Result { + input: anki_proto::deck_config::DeckConfigId, + ) -> error::Result { Ok(Collection::get_deck_config(self, input.into(), true)? .unwrap() .into()) @@ -47,7 +47,7 @@ impl crate::services::DeckConfigService for Collection { fn get_deck_config_legacy( &mut self, - input: anki_proto::deckconfig::DeckConfigId, + input: anki_proto::deck_config::DeckConfigId, ) -> error::Result { let conf = Collection::get_deck_config(self, input.into(), true)?.unwrap(); let conf: DeckConfSchema11 = conf.into(); @@ -62,7 +62,7 @@ impl crate::services::DeckConfigService for Collection { fn remove_deck_config( &mut self, - input: anki_proto::deckconfig::DeckConfigId, + input: anki_proto::deck_config::DeckConfigId, ) -> error::Result<()> { self.transact_no_undo(|col| col.remove_deck_config_inner(input.into())) .map(Into::into) @@ -71,21 +71,21 @@ impl crate::services::DeckConfigService for Collection { fn get_deck_configs_for_update( &mut self, input: anki_proto::decks::DeckId, - ) -> error::Result { + ) -> error::Result { self.get_deck_configs_for_update(input.did.into()) } fn update_deck_configs( &mut self, - input: anki_proto::deckconfig::UpdateDeckConfigsRequest, + input: anki_proto::deck_config::UpdateDeckConfigsRequest, ) -> error::Result { self.update_deck_configs(input.into()).map(Into::into) } } -impl From for anki_proto::deckconfig::DeckConfig { +impl From for anki_proto::deck_config::DeckConfig { fn from(c: DeckConfig) -> Self { - anki_proto::deckconfig::DeckConfig { + anki_proto::deck_config::DeckConfig { id: c.id.0, name: c.name, mtime_secs: c.mtime_secs.0, @@ -95,8 +95,8 @@ impl From for anki_proto::deckconfig::DeckConfig { } } -impl From for UpdateDeckConfigsRequest { - fn from(c: anki_proto::deckconfig::UpdateDeckConfigsRequest) -> Self { +impl From for UpdateDeckConfigsRequest { + fn from(c: anki_proto::deck_config::UpdateDeckConfigsRequest) -> Self { UpdateDeckConfigsRequest { target_deck_id: c.target_deck_id.into(), configs: c.configs.into_iter().map(Into::into).collect(), @@ -109,8 +109,8 @@ impl From for UpdateDeckConfig } } -impl From for DeckConfig { - fn from(c: anki_proto::deckconfig::DeckConfig) -> Self { +impl From for DeckConfig { + fn from(c: anki_proto::deck_config::DeckConfig) -> Self { DeckConfig { id: c.id.into(), name: c.name, @@ -121,8 +121,8 @@ impl From for DeckConfig { } } -impl From for DeckConfigId { - fn from(dcid: anki_proto::deckconfig::DeckConfigId) -> Self { +impl From for DeckConfigId { + fn from(dcid: anki_proto::deck_config::DeckConfigId) -> Self { DeckConfigId(dcid.dcid) } } diff --git a/rslib/src/deckconfig/update.rs b/rslib/src/deckconfig/update.rs index dbd5b92e7..ec18aded7 100644 --- a/rslib/src/deckconfig/update.rs +++ b/rslib/src/deckconfig/update.rs @@ -7,9 +7,9 @@ use std::collections::HashMap; use std::collections::HashSet; use std::iter; -use anki_proto::deckconfig::deck_configs_for_update::current_deck::Limits; -use anki_proto::deckconfig::deck_configs_for_update::ConfigWithExtra; -use anki_proto::deckconfig::deck_configs_for_update::CurrentDeck; +use anki_proto::deck_config::deck_configs_for_update::current_deck::Limits; +use anki_proto::deck_config::deck_configs_for_update::ConfigWithExtra; +use anki_proto::deck_config::deck_configs_for_update::CurrentDeck; use anki_proto::decks::deck::normal::DayLimit; use crate::config::StringKey; @@ -35,8 +35,8 @@ impl Collection { pub fn get_deck_configs_for_update( &mut self, deck: DeckId, - ) -> Result { - Ok(anki_proto::deckconfig::DeckConfigsForUpdate { + ) -> Result { + Ok(anki_proto::deck_config::DeckConfigsForUpdate { all_config: self.get_deck_config_with_extra_for_update()?, current_deck: Some(self.get_current_deck_for_update(deck)?), defaults: Some(DeckConfig::default().into()), diff --git a/rslib/src/scheduler/queue/builder/mod.rs b/rslib/src/scheduler/queue/builder/mod.rs index 3363325e1..88747c49d 100644 --- a/rslib/src/scheduler/queue/builder/mod.rs +++ b/rslib/src/scheduler/queue/builder/mod.rs @@ -267,8 +267,8 @@ impl Collection { #[cfg(test)] mod test { - use anki_proto::deckconfig::deck_config::config::NewCardGatherPriority; - use anki_proto::deckconfig::deck_config::config::NewCardSortOrder; + use anki_proto::deck_config::deck_config::config::NewCardGatherPriority; + use anki_proto::deck_config::deck_config::config::NewCardSortOrder; use super::*; use crate::card::CardQueue; diff --git a/ts/deck-options/DisplayOrder.svelte b/ts/deck-options/DisplayOrder.svelte index 14ccd295b..fb686b508 100644 --- a/ts/deck-options/DisplayOrder.svelte +++ b/ts/deck-options/DisplayOrder.svelte @@ -6,7 +6,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import { DeckConfig_Config_NewCardGatherPriority as GatherOrder, DeckConfig_Config_NewCardSortOrder as SortOrder, - } from "@tslib/anki/deckconfig_pb"; + } from "@tslib/anki/deck_config_pb"; import * as tr from "@tslib/ftl"; import { HelpPage } from "@tslib/help-page"; import type Carousel from "bootstrap/js/dist/carousel"; diff --git a/ts/deck-options/NewOptions.svelte b/ts/deck-options/NewOptions.svelte index 857049b3d..41cd8153f 100644 --- a/ts/deck-options/NewOptions.svelte +++ b/ts/deck-options/NewOptions.svelte @@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html -->