Fix wrong call

.dockerignore

@@ -1,2 +1,4 @@
 .git/
-db-importer/
+db-importer/
+# poetry
+poetry.lock

db-importer/db_importer/__main__.py

@@ -28,11 +28,15 @@ def main():
                     if obj_type not in collections:
                         collections[obj_type] = []
                     collections[obj_type].append(obj)
-    print("Inserting all data")
+    # print("Inserting all data")
-    mongo[DB][COLLECTION].insert_many(items)
+    # mongo[DB][COLLECTION].insert_many(items)
-    for collection in collections:
+    with mongo.start_session() as s:
-        print(f"Inserting collection: {collection}")
+        s.start_transaction()
-        mongo[DB][collection].insert_many(collections[collection])
+        mongo.drop_database(DB)
+        for collection in collections:
+            print(f"Inserting collection: {collection}")
+            mongo[DB][collection].insert_many(collections[collection])
+        s.commit_transaction()
 
 if __name__ == "__main__":
     main()

db_explorer/Dockerfile

@@ -5,10 +5,12 @@ RUN python3 -m pip install poetry
 EXPOSE 5000
 WORKDIR /app
 
-COPY db_explorer/ /app/
+COPY db_explorer/pyproject.toml /app/
 
 RUN poetry update
 RUN poetry run pip install setuptools
 
+COPY db_explorer/ /app/
+
 ENTRYPOINT [ "poetry", "run" ]
 CMD [ "gunicorn", "-b=0.0.0.0:5000", "db_explorer:app" ]

db_explorer/db_explorer/app.py

@@ -1,4 +1,5 @@
 
+import json
 import urllib.parse
 import os
 import re
@@ -10,16 +11,32 @@ app = Flask(__name__)
 app.config["MONGO_URI"] = os.environ["MONGO_URI"]
 mongo = PyMongo(app)
 
+LOCALIZATION_JSON = {}
+with open("./db_explorer/en.json") as f:
+    LOCALIZATION_JSON = json.load(f)
+
 @app.template_filter('filter_vtt')
 def filter_vtt(text):
-    compendium_re = re.compile(r"@Compendium\[([^\]]+)\]\{([^\}]+)\}")
+    compendium_re = re.compile(r"@Compendium\[(?P<ref>[^\]]+)\]\{(?P<value>[^\}]+)\}")
     def compendium_return(m):
-        return f"<a>{m.group(2)}</a>"
+        # TODO: Actually add links
-    macro_re = re.compile(r"\[\[\/\S?r\s(?:(?P<sdice>[^\{\] ]+)[^\{\]]*|(?:\{(?P<ldice>[^\}]+)\}\[[^\]]+\])?)\]\](?:\{(?P<alt>[^\}]+)\})?")
+        return f"<a>{m.group('value')}</a>"
+    macro_re = re.compile(r"\[\[\/\S*?r(?:oll)?\s(?:(?P<sdice>[^\{\] ]+)[^\{\]]*|(?:\{(?P<ldice>[^\}]+)\}\[[^\]]+\])?)\]\](?:\{(?P<alt>[^\}]+)\})?")
     def macro_return(m):
         if m.group('alt') is not None:
             return m.group('alt')
         return m.group('sdice')
+    localize_re = re.compile(r"@Localize\[([^\]]+)\]")
+    def localize_return(m):
+        path = m.group(1)
+        output = LOCALIZATION_JSON
+        for chunk in path.split('.'):
+            output = output.get(chunk, {})
+        if type(output) != str:
+            output = f"[LOCALIZATION LOOKUP ERROR - {m.group(0)}]"
+        return output
+    # Template
+    text = localize_re.sub(localize_return, text) # Has to be run before Compendium and Macro replacement
     text = compendium_re.sub(compendium_return, text)
     text = macro_re.sub(macro_return, text)
     return text
@@ -37,6 +54,7 @@ def list_actions():
 @app.route("/action/<name>")
 def show_action(name):
     item = mongo.db.action.find_one_or_404({"name": name})
+    # Actions
     if item["data"]["actions"]["value"] == None:
         if item["data"]["actionType"]["value"] == 'passive':
             item['_action_icon'] = None
@@ -50,7 +68,13 @@ def show_action(name):
         item['_action_icon'] = item["data"]["actions"]["value"]
     else:
         raise ValueError(f'Unknown action: {item["data"]["actionType"]["value"]} - {item["data"]["actions"]["value"]}')
-
+    # Traits
+    _traits = item.get("data", {}).get("traits", {})
+    item["_all_traits"] = []
+    item["_all_traits"].append(_traits.get("rarity", {}).get("value", "unkown rarity"))
+    item["_all_traits"] += _traits.get("value", [])
+    item["_all_traits"] += _traits.get("custom").split(',')
+    item["_all_traits"] = list(filter(lambda x: x != '', item["_all_traits"]))
     return render_template("action.html", action=item)
 
 if __name__ == "__main__":

db_explorer/db_explorer/static/css/base.css

@@ -1,3 +1,6 @@
+body {
+    background: #efece9;
+}
 
 .action-icon {
     height: 26px;
@@ -7,4 +10,21 @@
 .sourcebook {
     text-align: right;
     font-size: 0.8em;
-}
+}
+
+ul.traits {
+    padding-left: 0em;
+}
+
+li.trait {
+    display: inline;
+    font-size: 0.9em;
+    font-variant: small-caps;
+    color: #fefefe;
+    background-color: #5e0000;
+    border-color: #d8ce83;
+    border-style: solid;
+    border-width: 2px;
+    padding: 0.1em 0.25em;
+    margin: 0 0;
+}

db_explorer/db_explorer/templates/_base.html

@@ -5,7 +5,7 @@
         {% block head %}
         <title>{% block title %}PF2 DB{% endblock %}</title>
         {% endblock %}
-        <link rel="stylesheet" href="{{ url_for('static', filename='css/base.css') }}"
+        <link rel="stylesheet" href="{{ url_for('static', filename='css/base.css') }}">
     </head>
     <body>
         {% block body %}

db_explorer/db_explorer/templates/action.html

@@ -2,6 +2,11 @@
 {% block title %}{{action.name}} - PF2 DB{% endblock %}
 {% block body %}
         <h1>{{action["name"]}}{{c.actions[action["_action_icon"]]|safe}}</h1>
-        <p>{{action["data"]["description"]["value"]|filter_vtt|safe}}</p>
+        <ul class="traits">
+        {%- for trait in action["_all_traits"] -%}
+          <li class="trait">{{trait|capitalize}}</li>
+        {%- endfor -%}
+        </ul>
+        {{action["data"]["description"]["value"]|filter_vtt|safe}}
         <p class="sourcebook">{{action["data"]["source"]["value"]}}</p>
 {% endblock %}