amanuensis/backend/index.py

@@ -3,9 +3,7 @@ Index query interface
 """
 
 import re
-from typing import Optional, Sequence
+from typing import Optional
-
-from sqlalchemy import select
 
 from amanuensis.db import DbContext, ArticleIndex, IndexType
 from amanuensis.errors import ArgumentError, BackendArgumentTypeError
@@ -74,42 +72,3 @@ def create(
     db.session.add(new_index)
     db.session.commit()
     return new_index
-
-
-def get_for_lexicon(db: DbContext, lexicon_id: int) -> Sequence[ArticleIndex]:
-    """Returns all index rules for a lexicon."""
-    return db(select(ArticleIndex).where(ArticleIndex.lexicon_id == lexicon_id)).scalars()
-
-def update(db: DbContext, lexicon_id: int, indices: Sequence[ArticleIndex]) -> None:
-    """
-    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
-    the input logical and display orders and capacity.
-    """
-    extant_indices: Sequence[ArticleIndex] = list(get_for_lexicon(db, lexicon_id))
-    s = lambda i: f"{i.index_type}:{i.pattern}"
-    for extant_index in extant_indices:
-        match = None
-        for new_index in indices:
-            is_match = extant_index.index_type == new_index.index_type and extant_index.pattern == new_index.pattern
-            if is_match:
-                match = new_index
-                break
-        if match:
-            extant_index.logical_order = new_index.logical_order
-            extant_index.display_order = new_index.display_order
-            extant_index.capacity = new_index.capacity
-        else:
-            db.session.delete(extant_index)
-    for new_index in indices:
-        match = None
-        for extant_index in extant_indices:
-            is_match = extant_index.index_type == new_index.index_type and extant_index.pattern == new_index.pattern
-            if is_match:
-                match = extant_index
-                break
-        if not match:
-            new_index.lexicon_id = lexicon_id
-            db.session.add(new_index)
-    db.session.commit()

amanuensis/cli/__init__.py

@@ -6,7 +6,6 @@ from typing import Callable
 
 import amanuensis.cli.admin
 import amanuensis.cli.character
-import amanuensis.cli.index
 import amanuensis.cli.lexicon
 import amanuensis.cli.user
 from amanuensis.db import DbContext
@@ -111,7 +110,6 @@ def main():
     subparsers = parser.add_subparsers(metavar="COMMAND")
     add_subcommand(subparsers, amanuensis.cli.admin)
     add_subcommand(subparsers, amanuensis.cli.character)
-    add_subcommand(subparsers, amanuensis.cli.index)
     add_subcommand(subparsers, amanuensis.cli.lexicon)
     add_subcommand(subparsers, amanuensis.cli.user)
 

amanuensis/cli/index.py

@@ -1,33 +0,0 @@
-import enum
-import logging
-
-from amanuensis.backend import *
-from amanuensis.db import DbContext, ArticleIndex, IndexType
-
-from .helpers import add_argument
-
-
-COMMAND_NAME = "index"
-COMMAND_HELP = "Interact with indexes."
-
-LOG = logging.getLogger(__name__)
-
-@add_argument("--lexicon", required=True)
-@add_argument("--type", required=True, type=lambda s: IndexType[s.upper()], choices=IndexType)
-@add_argument("--pattern", required=True)
-@add_argument("--logical", type=int, default=0)
-@add_argument("--display", type=int, default=0)
-@add_argument("--capacity", type=int, default=None)
-def command_create(args) -> int:
-    """
-    Create an index for a lexicon.
-    """
-    db: DbContext = args.get_db()
-    lexicon = lexiq.try_from_name(db, args.lexicon)
-    if not lexicon:
-        raise ValueError("Lexicon does not exist")
-    index: ArticleIndex = indq.create(
-        db, lexicon.id, args.type, args.pattern, args.logical, args.display, args.capacity
-    )
-    LOG.info(f"Created {index.index_type}:{index.pattern} in {lexicon.full_title}")
-    return 0

amanuensis/db/models.py

@@ -463,9 +463,6 @@ class IndexType(enum.Enum):
     PREFIX = 2
     ETC = 3
 
-    def __str__(self):
-        return self.name
-
 
 class ArticleIndex(ModelBase):
     """
@@ -473,7 +470,6 @@ class ArticleIndex(ModelBase):
     """
 
     __tablename__ = "article_index"
-    __table_args__ = (UniqueConstraint("lexicon_id", "index_type", "pattern"),)
 
     ##############
     # Index info #

amanuensis/resources/page.css

@@ -46,8 +46,11 @@ div#sidebar {
 img#logo {
 	max-width: 200px;
 }
-div#sidebar table {
+table {
+	table-layout: fixed;
 	width: 100%;
+}
+div#sidebar table {
 	border-collapse: collapse;
 }
 div.citeblock table td:first-child + td a {
@@ -115,6 +118,9 @@ input.fullwidth {
 	width: 100%;
 	box-sizing: border-box;
 }
+input.smallnumber {
+	width: 4em;
+}
 form#session-settings p {
 	line-height: 1.8em;
 }
@@ -201,20 +207,6 @@ ul.unordered-tabs li a[href]:hover {
 	background-color: var(--button-hover);
 	border-color: var(--button-hover);
 }
-#index-definition-help {
-	margin-block-start: 1em;
-	margin-block-end: 1em;
-}
-#index-definition-table td:nth-child(2) {
-	width: 100%;
-}
-#index-definition-table td:nth-child(2) *:only-child {
-	box-sizing: border-box;
-	width: 100%;
-}
-#index-definition-table td input[type=number] {
-	width: 4em;
-}
 @media only screen and (max-width: 816px) {
 	div#wrapper {
 		padding: 5px;

amanuensis/server/__init__.py

@@ -75,7 +75,6 @@ def get_app(
             "userq": userq,
             "memq": memq,
             "charq": charq,
-            "indq": indq,
             "current_lexicon": current_lexicon,
             "current_membership": current_membership
         }

amanuensis/server/lexicon/settings/__init__.py

@@ -1,5 +1,3 @@
-from typing import Sequence
-
 from flask import Blueprint, render_template, url_for, g, flash, redirect
 
 from amanuensis.backend import *
@@ -12,7 +10,7 @@ from amanuensis.server.helpers import (
     current_lexicon,
 )
 
-from .forms import PlayerSettingsForm, SetupSettingsForm, IndexSchemaForm
+from .forms import PlayerSettingsForm, SetupSettingsForm
 
 
 bp = Blueprint("settings", __name__, url_prefix="/settings", template_folder=".")
@@ -120,56 +118,15 @@ def setup(lexicon_name):
             )
 
 
-@bp.get("/index/")
+@bp.get("/progress/")
 @lexicon_param
 @editor_required
-def index(lexicon_name):
+def progress(lexicon_name):
-    # Get the current indices
-    indices: Sequence[ArticleIndex] = indq.get_for_lexicon(g.db, current_lexicon.id)
-    index_data = [
-        {
-            "index_type": str(index.index_type),
-            "pattern": index.pattern,
-            "logical_order": index.logical_order,
-            "display_order": index.display_order,
-            "capacity": index.capacity,
-        }
-        for index in indices
-    ]
-    # Add a blank index to allow for adding rules
-    index_data.append({
-        "index_type": "",
-        "pattern": None,
-        "logical_order": None,
-        "display_order": None,
-        "capacity": None,
-    })
-    form = IndexSchemaForm(indices=index_data)
     return render_template(
-        "settings.jinja", lexicon_name=lexicon_name, page_name=index.__name__, form=form
+        "settings.jinja", lexicon_name=lexicon_name, page_name=progress.__name__
     )
 
 
-@bp.post("/index/")
-@lexicon_param
-@editor_required
-def index_post(lexicon_name):
-    # Initialize the form
-    form = IndexSchemaForm()
-    if form.validate():
-        # Valid data, strip out all indexes with the blank type
-        indices = [
-            index_def.to_model()
-            for index_def in form.indices.entries
-            if index_def.index_type.data
-        ]
-        indq.update(g.db, current_lexicon.id, indices)
-        return redirect(url_for("lexicon.settings.index", lexicon_name=lexicon_name))
-    else:
-        # Invalid data
-        return render_template("settings.jinja", lexicon_name=lexicon_name, page_name=index.__name__, form=form)
-
-
 @bp.get("/publish/")
 @lexicon_param
 @editor_required

amanuensis/server/lexicon/settings/forms.py

@@ -1,20 +1,15 @@
 from flask_wtf import FlaskForm
 from wtforms import (
     BooleanField,
-    FieldList,
-    FormField,
     IntegerField,
     PasswordField,
-    SelectField,
     StringField,
     SubmitField,
     TextAreaField,
 )
-from wtforms.validators import Optional, DataRequired, ValidationError
+from wtforms.validators import Optional, DataRequired
 from wtforms.widgets.html5 import NumberInput
 
-from amanuensis.db import ArticleIndex, IndexType
-
 
 class PlayerSettingsForm(FlaskForm):
     """/lexicon/<name>/settings/player/"""
@@ -48,41 +43,3 @@ class SetupSettingsForm(FlaskForm):
         validators=[Optional()],
     )
     submit = SubmitField("Submit")
-
-
-def parse_index_type(type_str):
-    if not type_str:
-        return None
-    return getattr(IndexType, type_str)
-
-
-class IndexDefinitionForm(FlaskForm):
-    """/lexicon/<name>/settings/index/"""
-
-    TYPE_CHOICES = ([("", "")] + [(str(t), str(t).lower()) for t in IndexType])
-
-    index_type = SelectField(choices=TYPE_CHOICES, coerce=parse_index_type)
-    pattern = StringField()
-    logical_order = IntegerField(widget=NumberInput(min=-99, max=99), validators=[Optional()])
-    display_order = IntegerField(widget=NumberInput(min=-99, max=99), validators=[Optional()])
-    capacity = IntegerField(widget=NumberInput(min=0, max=99), validators=[Optional()])
-
-    def validate_pattern(form, field):
-        if form.index_type.data and not field.data:
-            raise ValidationError("Pattern must be defined")
-
-    def to_model(self):
-        return ArticleIndex(
-            index_type=self.index_type.data,
-            pattern=self.pattern.data,
-            logical_order=self.logical_order.data,
-            display_order=self.display_order.data,
-            capacity=self.capacity.data,
-        )
-
-
-class IndexSchemaForm(FlaskForm):
-    """/lexicon/<name>/settings/index/"""
-
-    indices = FieldList(FormField(IndexDefinitionForm))
-    submit = SubmitField("Submit")

amanuensis/server/lexicon/settings/settings.jinja

@@ -21,9 +21,9 @@
 {% block main %}
 {% if current_membership.is_editor %}
 <ul class="unordered-tabs">
-    <li>{{ settings_page_link("player", "Player Settings") }}</li>
+    <li>{{ settings_page_link("player", "Player") }}</li>
     <li>{{ settings_page_link("setup", "Game Setup") }}</li>
-    <li>{{ settings_page_link("index", "Article Indexes") }}</li>
+    <li>{{ settings_page_link("progress", "Game Progress") }}</li>
     <li>{{ settings_page_link("publish", "Turn Publishing") }}</li>
     <li>{{ settings_page_link("article", "Article Requirements") }}</li>
 </ul>
@@ -31,7 +31,6 @@
 
 {% if page_name == "player" %}
     <h3>Player Settings</h3>
-    <p>These settings are specific to you as a player in this lexicon.</p>
     <form action="" method="post" novalidate>
         {{ form.hidden_tag() }}
         <p>
@@ -84,49 +83,8 @@
     {% endfor %}
 {% endif %}
 
-{% if page_name == "index" %}
+{% if page_name == "progress" %}
-<h3>Article Indexes</h3>
+    <h3>Game Progress</h3>
-<details id="index-definition-help">
-    <summary>Index definition help</summary>
-    <p>An index is a rule that matches the title of a lexicon article based on its <em>index type</em> and <em>pattern</em>. A <em>char</em> index matches a title if the first letter of the title (excluding "A", "An", and "The") is one of the letters in the pattern. A <em>range</em> index has a pattern denoting a range of letters, such as "A-F", and matches a title if the first letter of the title is in the range. A <em>prefix</em> index matches any title that begins with the pattern. An <em>etc</em> index always matches a title.</p>
-    <p>When a title is to be sorted under an index, indices are checked in order, sorted first by descending order of <em>logical priority</em>, and then by alphabetical order of index pattern. The title is sorted under the first index that matches it.</p>
-    <p>On the contents page, indices and the articles under them are displayed sorted instead by <em>display order</em> and then alphabetically by pattern.</p>
-    <p>The <em>capacity</em> of an index is the number of articles that may exist under that index. If an index is at capacity, no new articles may be written or created via phantom citation in that index.</p>
-    <p>To add an index, fill in the type and pattern in the blank row and save your changes. To remove an index, set the type to blank. Note: If you change the type or pattern of an index, all index assignments will be reset. Avoid changing index definitions during gameplay.</p>
-</details>
-<form action="" method="post" novalidate>
-    {{ form.hidden_tag() }}
-    <table id="index-definition-table">
-        <tr>
-            <th>Type</th>
-            <th>Pattern</th>
-            <th>Disp Or</th>
-            <th>Log Or</th>
-            <th>Cap</th>
-        </tr>
-        {% for index_form in form.indices %}
-        {{ index_form.hidden_tag() }}
-        <tr>
-            <td>{{ index_form.index_type() }}</td>
-            <td>{{ index_form.pattern() }}</td>
-            <td>{{ index_form.logical_order() }}</td>
-            <td>{{ index_form.display_order() }}</td>
-            <td>{{ index_form.capacity() }}</td>
-        </tr>
-        {% for field in index_form %}
-        {% for error in field.errors %}
-        <tr>
-            <td colspan="5"><span style="color: #ff0000">{{ error }}</span></td>
-        </tr>
-        {% endfor %}
-        {% endfor %}
-        {% endfor %}
-    </table>
-    <p>{{ form.submit() }}</p>
-</form>
-{% for message in get_flashed_messages() %}
-<span style="color:#ff0000">{{ message }}</span><br>
-{% endfor %}
 {% endif %}
 
 {% if page_name == "publish" %}