Merge branch 'main' into production

bookwyrm/settings.py

@@ -222,6 +222,7 @@ USER_AGENT = f"{agent} (BookWyrm/{VERSION}; +https://{DOMAIN}/)"
 # Imagekit generated thumbnails
 ENABLE_THUMBNAIL_GENERATION = env.bool("ENABLE_THUMBNAIL_GENERATION", False)
 IMAGEKIT_CACHEFILE_DIR = "thumbnails"
+IMAGEKIT_DEFAULT_CACHEFILE_STRATEGY = "bookwyrm.thumbnail_generation.Strategy"
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.2/howto/static-files/

bookwyrm/thumbnail_generation.py

@@ -0,0 +1,20 @@
+"""thumbnail generation strategy for django-imagekit"""
+
+
+class Strategy:
+    """
+    A strategy that generates the image on source saved (Optimistic),
+    but also on demand, for old images (JustInTime).
+    """
+
+    def on_source_saved(self, file):  # pylint: disable=no-self-use
+        """What happens on source saved"""
+        file.generate()
+
+    def on_existence_required(self, file):  # pylint: disable=no-self-use
+        """What happens on existence required"""
+        file.generate()
+
+    def on_content_required(self, file):  # pylint: disable=no-self-use
+        """What happens on content required"""
+        file.generate()

locale/en_US/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-09 19:01+0000\n"
+"POT-Creation-Date: 2022-01-09 19:19+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"