Fix wrong call

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/db_explorer/app.py

@@ -17,10 +17,10 @@ with open("./db_explorer/en.json") as 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):
         # TODO: Actually add links
-        return f"<a>{m.group(2)}</a>"
+        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:
@@ -74,6 +74,7 @@ def show_action(name):
     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;
@@ -8,3 +11,20 @@
     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/action.html

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