diff --git a/proto/anki/backend.proto b/proto/anki/backend.proto index 8a3f465e7..b69fb2120 100644 --- a/proto/anki/backend.proto +++ b/proto/anki/backend.proto @@ -14,7 +14,7 @@ enum ServiceIndex { SERVICE_INDEX_NOTES = 2; SERVICE_INDEX_SYNC = 3; SERVICE_INDEX_NOTETYPES = 4; - SERVICE_INDEX_CONFIGS = 5; + SERVICE_INDEX_CONFIG = 5; SERVICE_INDEX_CARD_RENDERING = 6; SERVICE_INDEX_DECK_CONFIG = 7; SERVICE_INDEX_TAGS = 8; diff --git a/proto/anki/configs.proto b/proto/anki/config.proto similarity index 98% rename from proto/anki/configs.proto rename to proto/anki/config.proto index bd8078545..40f632664 100644 --- a/proto/anki/configs.proto +++ b/proto/anki/config.proto @@ -3,12 +3,12 @@ syntax = "proto3"; -package anki.configs; +package anki.config; import "anki/generic.proto"; import "anki/collection.proto"; -service ConfigsService { +service ConfigService { rpc GetConfigJson(generic.String) returns (generic.Json); rpc SetConfigJson(SetConfigJsonRequest) returns (collection.OpChanges); rpc SetConfigJsonNoUndo(SetConfigJsonRequest) returns (generic.Empty); diff --git a/proto/anki/scheduler.proto b/proto/anki/scheduler.proto index c058df9a2..7876e3554 100644 --- a/proto/anki/scheduler.proto +++ b/proto/anki/scheduler.proto @@ -9,7 +9,7 @@ import "anki/generic.proto"; import "anki/cards.proto"; import "anki/decks.proto"; import "anki/collection.proto"; -import "anki/configs.proto"; +import "anki/config.proto"; service SchedulerService { rpc GetQueuedCards(GetQueuedCardsRequest) returns (QueuedCards); @@ -178,7 +178,7 @@ message ScheduleCardsAsNewRequest { message SetDueDateRequest { repeated int64 card_ids = 1; string days = 2; - configs.OptionalStringConfigKey config_key = 3; + config.OptionalStringConfigKey config_key = 3; } message SortCardsRequest { diff --git a/pylib/anki/_backend/genbackend.py b/pylib/anki/_backend/genbackend.py index 28ce899ea..b5cb0964a 100755 --- a/pylib/anki/_backend/genbackend.py +++ b/pylib/anki/_backend/genbackend.py @@ -18,7 +18,7 @@ import anki.notes_pb2 import anki.notetypes_pb2 import anki.scheduler_pb2 import anki.sync_pb2 -import anki.configs_pb2 +import anki.config_pb2 import anki.search_pb2 import anki.stats_pb2 import anki.card_rendering_pb2 @@ -189,7 +189,7 @@ service_modules = dict( NOTETYPES=anki.notetypes_pb2, SCHEDULER=anki.scheduler_pb2, SYNC=anki.sync_pb2, - CONFIGS=anki.configs_pb2, + CONFIG=anki.config_pb2, SEARCH=anki.search_pb2, STATS=anki.stats_pb2, CARD_RENDERING=anki.card_rendering_pb2, @@ -240,7 +240,7 @@ import anki.notes_pb2 import anki.notetypes_pb2 import anki.scheduler_pb2 import anki.sync_pb2 -import anki.configs_pb2 +import anki.config_pb2 import anki.search_pb2 import anki.stats_pb2 import anki.card_rendering_pb2 diff --git a/pylib/anki/collection.py b/pylib/anki/collection.py index c5ec9a924..757170257 100644 --- a/pylib/anki/collection.py +++ b/pylib/anki/collection.py @@ -10,7 +10,7 @@ from typing import Any, Generator, List, Literal, Optional, Sequence, Tuple, Uni from anki import ( card_rendering_pb2, collection_pb2, - configs_pb2, + config_pb2, generic_pb2, search_pb2, stats_pb2, @@ -22,7 +22,7 @@ SearchNode = search_pb2.SearchNode Progress = collection_pb2.Progress EmptyCardsReport = card_rendering_pb2.EmptyCardsReport GraphPreferences = stats_pb2.GraphPreferences -Preferences = configs_pb2.Preferences +Preferences = config_pb2.Preferences UndoStatus = collection_pb2.UndoStatus OpChanges = collection_pb2.OpChanges OpChangesWithCount = collection_pb2.OpChangesWithCount diff --git a/pylib/anki/config.py b/pylib/anki/config.py index 770375d8d..61d3e9357 100644 --- a/pylib/anki/config.py +++ b/pylib/anki/config.py @@ -25,12 +25,12 @@ from typing import Any from weakref import ref import anki -from anki import configs_pb2 +from anki import config_pb2 from anki.collection import OpChanges from anki.errors import NotFoundError from anki.utils import from_json_bytes, to_json_bytes -Config = configs_pb2.ConfigKey +Config = config_pb2.ConfigKey class ConfigManager: diff --git a/pylib/anki/config_pb2.pyi b/pylib/anki/config_pb2.pyi new file mode 120000 index 000000000..4c6057427 --- /dev/null +++ b/pylib/anki/config_pb2.pyi @@ -0,0 +1 @@ +../../bazel-bin/pylib/anki/config_pb2.pyi \ No newline at end of file diff --git a/pylib/anki/configs_pb2.pyi b/pylib/anki/configs_pb2.pyi deleted file mode 120000 index a32f273c0..000000000 --- a/pylib/anki/configs_pb2.pyi +++ /dev/null @@ -1 +0,0 @@ -../../bazel-bin/pylib/anki/configs_pb2.pyi \ No newline at end of file diff --git a/pylib/anki/scheduler/base.py b/pylib/anki/scheduler/base.py index c8214b36a..defd25599 100644 --- a/pylib/anki/scheduler/base.py +++ b/pylib/anki/scheduler/base.py @@ -17,7 +17,7 @@ FilteredDeckForUpdate = decks_pb2.FilteredDeckForUpdate from typing import List, Optional, Sequence -from anki import configs_pb2 +from anki import config_pb2 from anki.cards import CardId from anki.consts import CARD_TYPE_NEW, NEW_CARDS_RANDOM, QUEUE_TYPE_NEW, QUEUE_TYPE_REV from anki.decks import DeckConfigDict, DeckId, DeckTreeNode @@ -167,9 +167,9 @@ select id from cards where did in %s and queue = {QUEUE_TYPE_REV} and due <= ? l """Set cards to be due in `days`, turning them into review cards if necessary. `days` can be of the form '5' or '5..7' If `config_key` is provided, provided days will be remembered in config.""" - key: Optional[configs_pb2.OptionalStringConfigKey] + key: Optional[config_pb2.OptionalStringConfigKey] if config_key is not None: - key = configs_pb2.OptionalStringConfigKey(key=config_key) + key = config_pb2.OptionalStringConfigKey(key=config_key) else: key = None return self.col._backend.set_due_date( diff --git a/rslib/src/backend/config.rs b/rslib/src/backend/config.rs index b9772c66f..a992de29d 100644 --- a/rslib/src/backend/config.rs +++ b/rslib/src/backend/config.rs @@ -4,7 +4,7 @@ use serde_json::Value; use super::Backend; -pub(super) use crate::backend_proto::configs_service::Service as ConfigsService; +pub(super) use crate::backend_proto::config_service::Service as ConfigService; use crate::{ backend_proto as pb, backend_proto::config_key::{Bool as BoolKeyProto, String as StringKeyProto}, @@ -46,7 +46,7 @@ impl From for StringKey { } } -impl ConfigsService for Backend { +impl ConfigService for Backend { fn get_config_json(&self, input: pb::String) -> Result { self.with_col(|col| { let val: Option = col.get_config_optional(input.val.as_str()); diff --git a/rslib/src/backend/mod.rs b/rslib/src/backend/mod.rs index e6c5daa2d..013d5104d 100644 --- a/rslib/src/backend/mod.rs +++ b/rslib/src/backend/mod.rs @@ -40,7 +40,7 @@ use self::{ card::CardsService, cardrendering::CardRenderingService, collection::CollectionService, - config::ConfigsService, + config::ConfigService, deckconfig::DeckConfigService, decks::DecksService, i18n::I18nService, @@ -121,7 +121,7 @@ impl Backend { pb::ServiceIndex::Decks => DecksService::run_method(self, method, input), pb::ServiceIndex::Notes => NotesService::run_method(self, method, input), pb::ServiceIndex::Notetypes => NotetypesService::run_method(self, method, input), - pb::ServiceIndex::Configs => ConfigsService::run_method(self, method, input), + pb::ServiceIndex::Config => ConfigService::run_method(self, method, input), pb::ServiceIndex::Sync => SyncService::run_method(self, method, input), pb::ServiceIndex::Tags => TagsService::run_method(self, method, input), pb::ServiceIndex::DeckConfig => DeckConfigService::run_method(self, method, input), diff --git a/rslib/src/backend_proto.rs b/rslib/src/backend_proto.rs index 0925b97aa..0fc6be831 100644 --- a/rslib/src/backend_proto.rs +++ b/rslib/src/backend_proto.rs @@ -17,7 +17,7 @@ protobuf!(backend); protobuf!(card_rendering); protobuf!(cards); protobuf!(collection); -protobuf!(configs); +protobuf!(config); protobuf!(deckconfig); protobuf!(decks); protobuf!(generic);