From 6f73c58d2340afa139bc76a8f5f0f7775ab4db7b Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Sun, 12 Sep 2021 21:08:13 -0700 Subject: [PATCH] s/indexes/indices --- amanuensis/backend/index.py | 2 +- amanuensis/cli/index.py | 2 +- amanuensis/db/models.py | 4 ++-- amanuensis/lexicon/gameloop.py | 2 +- amanuensis/server/lexicon/settings/__init__.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/amanuensis/backend/index.py b/amanuensis/backend/index.py index 7a8af92..17a8bb5 100644 --- a/amanuensis/backend/index.py +++ b/amanuensis/backend/index.py @@ -87,7 +87,7 @@ def update(db: DbContext, lexicon_id: int, indices: Sequence[ArticleIndex]) -> N """ Update the indices for a lexicon. Indices are matched by type and pattern. An extant index not matched to an input is deleted, and an input index not - matched to a an extant index is created. Matched indexes are updated with + matched to a an extant index is created. Matched indices are updated with the input logical and display orders and capacity. """ extant_indices: Sequence[ArticleIndex] = list(get_for_lexicon(db, lexicon_id)) diff --git a/amanuensis/cli/index.py b/amanuensis/cli/index.py index 3b09df0..52cd3c1 100644 --- a/amanuensis/cli/index.py +++ b/amanuensis/cli/index.py @@ -8,7 +8,7 @@ from .helpers import add_argument COMMAND_NAME = "index" -COMMAND_HELP = "Interact with indexes." +COMMAND_HELP = "Interact with indices." LOG = logging.getLogger(__name__) diff --git a/amanuensis/db/models.py b/amanuensis/db/models.py index fa99e04..f208463 100644 --- a/amanuensis/db/models.py +++ b/amanuensis/db/models.py @@ -248,7 +248,7 @@ class Lexicon(ModelBase): memberships = relationship("Membership", back_populates="lexicon") characters = relationship("Character", back_populates="lexicon") articles = relationship("Article", back_populates="lexicon") - indexes = relationship("ArticleIndex", back_populates="lexicon") + indices = relationship("ArticleIndex", back_populates="lexicon") index_rules = relationship("ArticleIndexRule", back_populates="lexicon") content_rules = relationship("ArticleContentRule", back_populates="lexicon") posts = relationship("Post", back_populates="lexicon") @@ -502,7 +502,7 @@ class ArticleIndex(ModelBase): # Foreign key relationships # ############################# - lexicon = relationship("Lexicon", back_populates="indexes") + lexicon = relationship("Lexicon", back_populates="indices") index_rules = relationship("ArticleIndexRule", back_populates="index") diff --git a/amanuensis/lexicon/gameloop.py b/amanuensis/lexicon/gameloop.py index d606d57..e4d91db 100644 --- a/amanuensis/lexicon/gameloop.py +++ b/amanuensis/lexicon/gameloop.py @@ -392,7 +392,7 @@ def sort_by_index_spec(articles, index_specs, key=None): indexed = OrderedDict() for index in index_list_order: indexed[index.pattern] = [] - # Sort articles into indexes + # Sort articles into indices for article in articles_titlesorted: for index in index_eval_order: if index_match(index, key(article)): diff --git a/amanuensis/server/lexicon/settings/__init__.py b/amanuensis/server/lexicon/settings/__init__.py index 26b4558..f283756 100644 --- a/amanuensis/server/lexicon/settings/__init__.py +++ b/amanuensis/server/lexicon/settings/__init__.py @@ -159,7 +159,7 @@ def index_post(lexicon_name): # Initialize the form form = IndexSchemaForm() if form.validate(): - # Valid data, strip out all indexes with the blank type + # Valid data, strip out all indices with the blank type indices = [ index_def.to_model() for index_def in form.indices.entries