add more rilke

thomaswmorris · Jul 27, 2024 · 235f13f · 235f13f
1 parent 01f33ac
commit 235f13f
Show file tree

Hide file tree

Showing 6 changed files with 48,212 additions and 35,288 deletions.
diff --git a/README.rst b/README.rst
@@ -1,4 +1,4 @@
 poems
 -----
 
-All of the poems in here are good, or interesting. There are currently 8,437 poems by 552 poets.
+All of the poems in here are good, or interesting. There are currently 8,438.0 poems by 551 poets.
diff --git a/poems/author.py b/poems/author.py
@@ -9,7 +9,7 @@ class Author():
     birth: dict = field(default_factory=list)
     death: dict = field(default_factory=list)
     gender: str = None
-    college: str = None
+    education: str = None
     movement: str = None
     religion: str = None
     nationality: str = None

diff --git a/poems/catalog.py b/poems/catalog.py
@@ -34,11 +34,13 @@ def __init__(self, filepath: str):
 
                 context_keywords = poem["metadata"].get("context", {})
 
+                poem_tags = [*author_tags, *context_keywords.values(), *poem["metadata"].get("tags", [])]
+
                 entries[index] = {
                                   "author": author, 
                                   "title": title,
                                   "context": context_keywords,
-                                  "tags": [*author_tags, *context_keywords.values()], 
+                                  "tags": poem_tags, 
                                   "date": poem["metadata"].get("date", None),
                                   "translator": poem["metadata"].get("translator", None),
                                   "word_count": len(poem["body"].split()),

diff --git a/poems/data/poems.json b/poems/data/poems.json
diff --git a/poems/poem.py b/poems/poem.py
@@ -126,7 +126,7 @@ def html_footer(self, archive_link=False):
         if self.spacetime:
             parts.append(f'<i>{self.spacetime}.</i>')
         if self.source:
-            parts.append(f'From <i>{self.source}</i>')
+            parts.append(f'from <i>{self.source}</i>')
         if archive_link:
             parts.append('<a href="https://thomaswmorris.com/poems">daily poems archive</a>')
         return "\n<br>".join(parts)

diff --git a/poems/utils.py b/poems/utils.py
@@ -100,7 +100,7 @@ def make_author_stats(history, catalog=None):
 
         for author in stats.index:
 
-            stats.loc[author, "n_poems"] = catalog.data[author]["metadata"]["n_poems"]
+            stats.loc[author, "n_poems"] = sum(catalog.author == author)
             attrition = stats.loc[author, "n_times_sent"] / stats.loc[author, "n_poems"]
             stats.loc[author, "attrition"] = np.round(attrition, 3)