From ff95a709a8bfca6a39df8f4cd6c9d6de45ac7241 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:14:21 +0200
Subject: [PATCH 01/25] Update .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index cf88e9878..74eebb96b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,6 @@
 
 #nginx
 nginx/default.conf
+
+#macOS
+.DS_Store

From 77e81c4dbbf9180cad5e62aab05b3674e0d782f2 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:14:51 +0200
Subject: [PATCH 02/25] Add django-imagekit to BookWyrm

---
 bookwyrm/settings.py | 1 +
 bw-dev               | 5 ++++-
 requirements.txt     | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index d694e33fd..b1deed8fb 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -62,6 +62,7 @@ INSTALLED_APPS = [
     "django_rename_app",
     "bookwyrm",
     "celery",
+    "imagekit",
 ]
 
 MIDDLEWARE = [
diff --git a/bw-dev b/bw-dev
index c2b63bc17..1dd4c0ff7 100755
--- a/bw-dev
+++ b/bw-dev
@@ -107,7 +107,10 @@ case "$CMD" in
     populate_streams)
         runweb python manage.py populate_streams
         ;;
+    generateimages)
+        runweb python manage.py generateimages
+        ;;
     *)
-        echo "Unrecognised command. Try: build, clean, up, initdb, resetdb, makemigrations, migrate, bash, shell, dbshell, restart_celery, test, pytest, test_report, black, populate_feeds"
+        echo "Unrecognised command. Try: build, clean, up, initdb, resetdb, makemigrations, migrate, bash, shell, dbshell, restart_celery, test, pytest, test_report, black, populate_feeds, generateimages"
         ;;
 esac
diff --git a/requirements.txt b/requirements.txt
index 289d6fe68..7a458094e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
 celery==4.4.2
 Django==3.2.0
+django-imagekit==4.0.2
 django-model-utils==4.0.0
 environs==7.2.0
 flower==0.9.4

From f60e9d76d264e042bad39cf84025728bf512e919 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:15:08 +0200
Subject: [PATCH 03/25] Generate generators

---
 bookwyrm/imagegenerators.py | 75 +++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 bookwyrm/imagegenerators.py

diff --git a/bookwyrm/imagegenerators.py b/bookwyrm/imagegenerators.py
new file mode 100644
index 000000000..bad9028e5
--- /dev/null
+++ b/bookwyrm/imagegenerators.py
@@ -0,0 +1,75 @@
+from imagekit import ImageSpec, register
+from imagekit.processors import ResizeToFit
+
+class BookXSmallWebp(ImageSpec):
+    processors = [ResizeToFit(80, 80)]
+    format = 'WEBP'
+    options = { 'quality': 95 }
+
+class BookXSmallJpg(ImageSpec):
+    processors = [ResizeToFit(80, 80)]
+    format = 'JPEG'
+    options = { 'quality': 95 }
+
+class BookSmallWebp(ImageSpec):
+    processors = [ResizeToFit(100, 100)]
+    format = 'WEBP'
+    options = { 'quality': 95 }
+
+class BookSmallJpg(ImageSpec):
+    processors = [ResizeToFit(100, 100)]
+    format = 'JPEG'
+    options = { 'quality': 95 }
+
+class BookMediumWebp(ImageSpec):
+    processors = [ResizeToFit(150, 150)]
+    format = 'WEBP'
+    options = { 'quality': 95 }
+
+class BookMediumJpg(ImageSpec):
+    processors = [ResizeToFit(150, 150)]
+    format = 'JPEG'
+    options = { 'quality': 95 }
+
+class BookLargeWebp(ImageSpec):
+    processors = [ResizeToFit(200, 200)]
+    format = 'WEBP'
+    options = { 'quality': 95 }
+
+class BookLargeJpg(ImageSpec):
+    processors = [ResizeToFit(200, 200)]
+    format = 'JPEG'
+    options = { 'quality': 95 }
+
+class BookXLargeWebp(ImageSpec):
+    processors = [ResizeToFit(250, 250)]
+    format = 'WEBP'
+    options = { 'quality': 95 }
+
+class BookXLargeJpg(ImageSpec):
+    processors = [ResizeToFit(250, 250)]
+    format = 'JPEG'
+    options = { 'quality': 95 }
+
+class BookXxLargeWebp(ImageSpec):
+    processors = [ResizeToFit(500, 500)]
+    format = 'WEBP'
+    options = { 'quality': 95 }
+
+class BookXxLargeJpg(ImageSpec):
+    processors = [ResizeToFit(500, 500)]
+    format = 'JPEG'
+    options = { 'quality': 95 }
+
+register.generator('bw:book:xsmall:webp', BookXSmallWebp)
+register.generator('bw:book:xsmall:jpg', BookXSmallJpg)
+register.generator('bw:book:small:webp', BookSmallWebp)
+register.generator('bw:book:small:jpg', BookSmallJpg)
+register.generator('bw:book:medium:webp', BookMediumWebp)
+register.generator('bw:book:medium:jpg', BookMediumJpg)
+register.generator('bw:book:large:webp', BookLargeWebp)
+register.generator('bw:book:large:jpg', BookLargeJpg)
+register.generator('bw:book:xlarge:webp', BookXLargeWebp)
+register.generator('bw:book:xlarge:jpg', BookXLargeJpg)
+register.generator('bw:book:xxlarge:webp', BookXxLargeWebp)
+register.generator('bw:book:xxlarge:jpg', BookXxLargeJpg)

From 4c55f07f2ab17cde6e95fdb699063afcedb0ff50 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:16:09 +0200
Subject: [PATCH 04/25] Update book_cover.html

---
 bookwyrm/templates/snippets/book_cover.html | 153 ++++++++++++++++----
 1 file changed, 128 insertions(+), 25 deletions(-)

diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 16ab305e5..6a15f0fd4 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -1,41 +1,144 @@
 {% spaceless %}
 
 {% load i18n %}
+{% load imagekit %}
 
-<figure
-    class="
-        cover-container
-        {{ cover_class }}
+{% if book.cover %}
+    <picture class="cover-container {{ cover_class }}">
+        {% with external_path|yesno:',/images/' as image_path %}
 
-        {% if not book.cover %}
-            no-cover
+        {% if size_mobile == 'xsmall' %}
+            {% generateimage 'bw:book:xsmall:webp' source=book.cover as th_xsmall_webp %}
+            {% generateimage 'bw:book:xsmall:jpg' source=book.cover as th_xsmall_jpg %}
+            <source
+                media="(max-width: 768px)"
+                type="image/webp"
+                srcset="{{ image_path }}{{ th_xsmall_webp }}"
+            />
+            <source
+                media="(max-width: 768px)"
+                type="image/jpg"
+                srcset="{{ image_path }}{{ th_xsmall_jpg }}"
+            />
+        {% elif size_mobile == 'small' %}
+            {% generateimage 'bw:book:small:webp' source=book.cover as th_small_webp %}
+            {% generateimage 'bw:book:small:jpg' source=book.cover as th_small_jpg %}
+            <source
+                media="(max-width: 768px)"
+                type="image/webp"
+                srcset="{{ image_path }}{{ th_small_webp }}"
+            />
+            <source
+                media="(max-width: 768px)"
+                type="image/jpg"
+                srcset="{{ image_path }}{{ th_small_jpg }}"
+            />
+        {% elif size_mobile == 'medium' %}
+            {% generateimage 'bw:book:medium:webp' source=book.cover as th_medium_webp %}
+            {% generateimage 'bw:book:medium:jpg' source=book.cover as th_medium_jpg %}
+            <source
+                media="(max-width: 768px)"
+                type="image/webp"
+                srcset="{{ image_path }}{{ th_medium_webp }}"
+            />
+            <source
+                media="(max-width: 768px)"
+                type="image/jpg"
+                srcset="{{ image_path }}{{ th_medium_jpg }}"
+            />
+        {% elif size_mobile == 'large' %}
+            {% generateimage 'bw:book:large:webp' source=book.cover as th_large_webp %}
+            {% generateimage 'bw:book:large:jpg' source=book.cover as th_large_jpg %}
+            <source
+                media="(max-width: 768px)"
+                type="image/webp"
+                srcset="{{ image_path }}{{ th_large_webp }}"
+            />
+            <source
+                media="(max-width: 768px)"
+                type="image/jpg"
+                srcset="{{ image_path }}{{ th_large_jpg }}"
+            />
+        {% elif size_mobile == 'xlarge' %}
+            {% generateimage 'bw:book:xlarge:webp' source=book.cover as th_xlarge_webp %}
+            {% generateimage 'bw:book:xlarge:jpg' source=book.cover as th_xlarge_jpg %}
+            <source
+                media="(max-width: 768px)"
+                type="image/webp"
+                srcset="{{ image_path }}{{ th_xlarge_webp }}"
+            />
+            <source
+                media="(max-width: 768px)"
+                type="image/jpg"
+                srcset="{{ image_path }}{{ th_xlarge_jpg }}"
+            />
+        {% elif size_mobile == 'xxlarge' %}
+            {% generateimage 'bw:book:xxlarge:webp' source=book.cover as th_xxlarge_webp %}
+            {% generateimage 'bw:book:xxlarge:jpg' source=book.cover as th_xxlarge_jpg %}
+            <source
+                media="(max-width: 768px)"
+                type="image/webp"
+                srcset="{{ image_path }}{{ th_xxlarge_webp }}"
+            />
+            <source
+                media="(max-width: 768px)"
+                type="image/jpg"
+                srcset="{{ image_path }}{{ th_xxlarge_jpg }}"
+            />
         {% endif %}
-    "
 
-    {% if book.alt_text %}
-        title="{{ book.alt_text }}"
-    {% endif %}
->
-    <img
-        class="book-cover"
+        {% if size == 'xsmall' %}
+            {% generateimage 'bw:book:xsmall:webp' source=book.cover as th_xsmall_webp %}
+            {% generateimage 'bw:book:xsmall:jpg' source=book.cover as th_xsmall_jpg %}
+            <source type="image/webp" srcset="{{ image_path }}{{ th_xsmall_webp }}"/>
+            <source type="image/jpg" srcset="{{ image_path }}{{ th_xsmall_jpg }}"/>
+        {% elif size == 'small' %}
+            {% generateimage 'bw:book:small:webp' source=book.cover as th_small_webp %}
+            {% generateimage 'bw:book:small:jpg' source=book.cover as th_small_jpg %}
+            <source type="image/webp" srcset="{{ image_path }}{{ th_small_webp }}"/>
+            <source type="image/jpg" srcset="{{ image_path }}{{ th_small_jpg }}"/>
+        {% elif size == 'medium' %}
+            {% generateimage 'bw:book:medium:webp' source=book.cover as th_medium_webp %}
+            {% generateimage 'bw:book:medium:jpg' source=book.cover as th_medium_jpg %}
+            <source type="image/webp" srcset="{{ image_path }}{{ th_medium_webp }}"/>
+            <source type="image/jpg" srcset="{{ image_path }}{{ th_medium_jpg }}"/>
+        {% elif size == 'large' %}
+            {% generateimage 'bw:book:large:webp' source=book.cover as th_large_webp %}
+            {% generateimage 'bw:book:large:jpg' source=book.cover as th_large_jpg %}
+            <source type="image/webp" srcset="{{ image_path }}{{ th_large_webp }}"/>
+            <source type="image/jpg" srcset="{{ image_path }}{{ th_large_jpg }}"/>
+        {% elif size == 'xlarge' %}
+            {% generateimage 'bw:book:xlarge:webp' source=book.cover as th_xlarge_webp %}
+            {% generateimage 'bw:book:xlarge:jpg' source=book.cover as th_xlarge_jpg %}
+            <source type="image/webp" srcset="{{ image_path }}{{ th_xlarge_webp }}"/>
+            <source type="image/jpg" srcset="{{ image_path }}{{ th_xlarge_jpg }}"/>
+        {% elif size == 'xxlarge' %}
+            {% generateimage 'bw:book:xxlarge:webp' source=book.cover as th_xxlarge_webp %}
+            {% generateimage 'bw:book:xxlarge:jpg' source=book.cover as th_xxlarge_jpg %}
+            <source type="image/webp" srcset="{{ image_path }}{{ th_xxlarge_webp }}"/>
+            <source type="image/jpg" srcset="{{ image_path }}{{ th_xxlarge_jpg }}"/>
+        {% endif %}
 
-        {% if book.cover %}
-            src="{% if img_path is None %}/images/{% else %}{{ img_path }}{% endif %}{{ book.cover }}"
+        <img
+            class="book-cover"
+            src="{{ image_path }}{{ book.cover }}"
             itemprop="thumbnailUrl"
+            alt="{{ book.alt_text|default:'' }}"
+        >
+        {% endwith %}
+    </picture>
+{% endif %}
 
-            {% if book.alt_text %}
-                alt="{{ book.alt_text }}"
-            {% endif %}
-        {% else %}
+{% if not book.cover and book.alt_text %}
+    <figure class="cover-container no-cover {{ cover_class }}">
+        <img
+            class="book-cover"
             src="/static/images/no_cover.jpg"
             alt="{% trans "No cover" %}"
-        {% endif %}
-    >
-
-    {% if not book.cover and book.alt_text %}
         <figcaption class="cover_caption">
+        >
             <p>{{ book.alt_text }}</p>
         </figcaption>
-    {% endif %}
-</figure>
+    </figure>
+{% endif %}
 {% endspaceless %}

From c1456ce8531d9243ab2d68c430e4a791d374d88a Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:16:33 +0200
Subject: [PATCH 05/25] Update .cover-caption name and styles

---
 bookwyrm/static/css/bookwyrm.css            | 9 +++++++--
 bookwyrm/templates/snippets/book_cover.html | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 3db25d1fe..5a4495c1e 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -219,16 +219,21 @@ body {
 /* Cover caption
  * -------------------------------------------------------------------------- */
 
-.no-cover .cover_caption {
+.no-cover .cover-caption {
     position: absolute;
     top: 0;
     right: 0;
     bottom: 0;
     left: 0;
-    padding: 0.25em;
+    padding: 0.5em;
     font-size: 0.75em;
     color: white;
     background-color: #002549;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    white-space: initial;
+    text-align: center;
 }
 
 /** Avatars
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 6a15f0fd4..fd1fb438a 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -135,8 +135,8 @@
             class="book-cover"
             src="/static/images/no_cover.jpg"
             alt="{% trans "No cover" %}"
-        <figcaption class="cover_caption">
         >
+        <figcaption class="cover-caption">
             <p>{{ book.alt_text }}</p>
         </figcaption>
     </figure>

From dc494323221729d7e06389d1df2f7c6f04ea3325 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:17:39 +0200
Subject: [PATCH 06/25] Change img_path to external_path

---
 bookwyrm/templates/snippets/search_result_text.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/search_result_text.html b/bookwyrm/templates/snippets/search_result_text.html
index e39d34104..a18b125f7 100644
--- a/bookwyrm/templates/snippets/search_result_text.html
+++ b/bookwyrm/templates/snippets/search_result_text.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <div class="columns is-mobile is-gapless">
     <div class="column is-cover">
-        {% include 'snippets/book_cover.html' with book=result cover_class='is-w-xs is-h-xs' img_path=false %}
+        {% include 'snippets/book_cover.html' with book=result cover_class='is-w-xs is-h-xs' external_path=True %}
     </div>
 
     <div class="column is-10 ml-3">

From 36f447210a20e0dde7bb1f86fc27e1f86ec5972e Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:18:05 +0200
Subject: [PATCH 07/25] Specify sizes on all templates

---
 bookwyrm/templates/book/book.html                        | 2 +-
 bookwyrm/templates/book/edit_book.html                   | 2 +-
 bookwyrm/templates/book/editions.html                    | 2 +-
 bookwyrm/templates/discover/large-book.html              | 2 +-
 bookwyrm/templates/discover/small-book.html              | 2 +-
 bookwyrm/templates/get_started/book_preview.html         | 2 +-
 bookwyrm/templates/import_status.html                    | 2 +-
 bookwyrm/templates/lists/curate.html                     | 2 +-
 bookwyrm/templates/lists/list.html                       | 4 ++--
 bookwyrm/templates/lists/list_items.html                 | 2 +-
 bookwyrm/templates/snippets/status/content_status.html   | 2 +-
 bookwyrm/templates/snippets/status/generated_status.html | 2 +-
 bookwyrm/templates/user/shelf/shelf.html                 | 2 +-
 bookwyrm/templates/user/user.html                        | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index df76d8e11..b1b893b7d 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -45,7 +45,7 @@
 
     <div class="columns">
         <div class="column is-one-fifth">
-            {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m-mobile' %}
+            {% include 'snippets/book_cover.html' with size='xxlarge' size_mobile='medium' book=book cover_class='is-h-m-mobile' %}
             {% include 'snippets/rate_action.html' with user=request.user book=book %}
 
             <div class="mb-3">
diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 8dae1d044..0736eabcf 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -183,7 +183,7 @@
             <h2 class="title is-4">{% trans "Cover" %}</h2>
             <div class="columns">
                 <div class="column is-3 is-cover">
-                    {% include 'snippets/book_cover.html' with book=book cover_class='is-h-xl-mobile is-w-auto-tablet' %}
+                    {% include 'snippets/book_cover.html' with book=book cover_class='is-h-xl-mobile is-w-auto-tablet' size_mobile='xlarge' size='large' %}
                 </div>
 
                 <div class="column">
diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index 0d5c10447..d22dd71a7 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -15,7 +15,7 @@
     <div class="columns is-gapless mb-6">
         <div class="column is-cover">
             <a href="{{ book.local_path }}">
-                {% include 'snippets/book_cover.html' with book=book cover_class='is-w-m is-h-m align to-l-mobile' %}
+                {% include 'snippets/book_cover.html' with size='medium' book=book cover_class='is-w-m is-h-m align to-l-mobile' %}
             </a>
         </div>
 
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index 93026991e..2f99a75a1 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -9,7 +9,7 @@
                 <a
                     class="align to-b to-l"
                     href="{{ book.local_path }}"
-                >{% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' %}</a>
+                >{% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' size='xlarge' %}</a>
 
                 {% include 'snippets/stars.html' with rating=book|rating:request.user %}
             </div>
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index 73133de45..82cd4a7ee 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -5,7 +5,7 @@
 {% if book %}
     {% with book=book %}
         <a href="{{ book.local_path }}">
-            {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-h-l-tablet is-w-auto align to-b to-l' %}
+            {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-h-l-tablet is-w-auto align to-b to-l' size='large' %}
         </a>
 
         {% include 'snippets/stars.html' with rating=book|rating:request.user %}
diff --git a/bookwyrm/templates/get_started/book_preview.html b/bookwyrm/templates/get_started/book_preview.html
index d8941ad50..893e7593a 100644
--- a/bookwyrm/templates/get_started/book_preview.html
+++ b/bookwyrm/templates/get_started/book_preview.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <div class="column is-cover">
-    {% include 'snippets/book_cover.html' with book=book cover_class='is-h-l is-h-m-mobile' %}
+    {% include 'snippets/book_cover.html' with book=book cover_class='is-h-l is-h-m-mobile' size_mobile='medium' size='large' %}
 
     <div class="select is-small mt-1 mb-3">
         <select name="{{ book.id }}" aria-label="{% blocktrans with book_title=book.title %}Have you read {{ book_title }}?{% endblocktrans %}">
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index b1145611d..0a7d33961 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -124,7 +124,7 @@
             <td>
                 {% if item.book %}
                 <a href="{{ item.book.local_path }}">
-                {% include 'snippets/book_cover.html' with book=item.book cover_class='is-h-s' %}
+                {% include 'snippets/book_cover.html' with book=item.book cover_class='is-h-s' size='small' %}
                 </a>
                 {% endif %}
             </td>
diff --git a/bookwyrm/templates/lists/curate.html b/bookwyrm/templates/lists/curate.html
index 492b399b6..661410e81 100644
--- a/bookwyrm/templates/lists/curate.html
+++ b/bookwyrm/templates/lists/curate.html
@@ -32,7 +32,7 @@
                                 href="{{ book.local_path }}"
                                 aria-hidden="true"
                             >
-                                {% include 'snippets/book_cover.html' with cover_class='is-w-xs-mobile is-w-s is-h-xs-mobile is-h-s' %}
+                                {% include 'snippets/book_cover.html' with cover_class='is-w-xs-mobile is-w-s is-h-xs-mobile is-h-s' size_mobile='xsmall' size='small' %}
                             </a>
 
                             <div class="column ml-3">
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 4dc9660a3..a2ae0e64d 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -41,7 +41,7 @@
                         >
                             <div class="column is-3-mobile is-2-tablet is-cover align to-t">
                                 <a href="{{ item.book.local_path }}" aria-hidden="true">
-                                    {% include 'snippets/book_cover.html' with cover_class='is-w-auto is-h-m-tablet is-align-items-flex-start' %}
+                                    {% include 'snippets/book_cover.html' with cover_class='is-w-auto is-h-m-tablet is-align-items-flex-start' size='medium' %}
                                 </a>
                             </div>
 
@@ -161,7 +161,7 @@
                         href="{{ book.local_path }}"
                         aria-hidden="true"
                     >
-                        {% include 'snippets/book_cover.html' with book=book cover_class='is-w-auto is-h-s-mobile align to-t' %}
+                        {% include 'snippets/book_cover.html' with book=book cover_class='is-w-auto is-h-s-mobile align to-t' size='small' %}
                     </a>
 
                     <div class="column ml-3">
diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index 913a23f4f..611975b09 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -14,7 +14,7 @@
                     <div class="card-image columns is-mobile is-gapless is-clipped">
                         {% for book in list_books %}
                             <a class="column is-cover" href="{{ book.book.local_path }}">
-                                {% include 'snippets/book_cover.html' with book=book.book cover_class='is-h-s' aria='show' %}
+                                {% include 'snippets/book_cover.html' with book=book.book cover_class='is-h-s' size='small' aria='show' %}
                             </a>
                         {% endfor %}
                     </div>
diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
index 39ef9173c..66dfaae5a 100644
--- a/bookwyrm/templates/snippets/status/content_status.html
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -18,7 +18,7 @@
                     <div class="column is-cover">
                         <div class="columns is-mobile is-gapless">
                             <div class="column is-cover">
-                                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-w-s-mobile is-h-l-tablet' %}</a>
+                                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-w-s-mobile is-h-l-tablet' size_mobile='medium' size='large' %}</a>
 
                                 {% include 'snippets/stars.html' with rating=book|rating:request.user %}
 
diff --git a/bookwyrm/templates/snippets/status/generated_status.html b/bookwyrm/templates/snippets/status/generated_status.html
index 71ce2d99a..e73b9c320 100644
--- a/bookwyrm/templates/snippets/status/generated_status.html
+++ b/bookwyrm/templates/snippets/status/generated_status.html
@@ -8,7 +8,7 @@
     {% with book=status.book|default:status.mention_books.first %}
         <div class="columns is-mobile is-gapless">
             <a class="column is-cover is-narrow" href="{{ book.local_path }}">
-                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-xs is-h-s-tablet' %}
+                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-xs is-h-s-tablet' size='small' size_mobile='xsmall' %}
             </a>
 
             <div class="column ml-3">
diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 2163db8cb..dcc2df39b 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -94,7 +94,7 @@
                 {% spaceless %}
                 <tr class="book-preview">
                     <td class="book-preview-top-row">
-                        <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-w-s-tablet is-h-s' %}</a>
+                        <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-w-s-tablet is-h-s' size='small' %}</a>
                     </td>
                     <td data-title="{% trans "Title" %}">
                         <a href="{{ book.local_path }}">{{ book.title }}</a>
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index d2e9be3e2..b8a5b7bc0 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -35,7 +35,7 @@
             {% for book in shelf.books %}
             <div class="control">
                 <a href="{{ book.local_path }}">
-                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m is-h-s-mobile' %}
+                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m is-h-s-mobile' size_mobile='small' size='medium' %}
                 </a>
             </div>
             {% endfor %}

From ef4961e4e9d1ae00c88403f7e76a6b13a622b387 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:33:40 +0200
Subject: [PATCH 08/25] Apply linter suggestions

---
 bookwyrm/imagegenerators.py | 72 ++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/bookwyrm/imagegenerators.py b/bookwyrm/imagegenerators.py
index bad9028e5..fd1eb4986 100644
--- a/bookwyrm/imagegenerators.py
+++ b/bookwyrm/imagegenerators.py
@@ -3,73 +3,73 @@ from imagekit.processors import ResizeToFit
 
 class BookXSmallWebp(ImageSpec):
     processors = [ResizeToFit(80, 80)]
-    format = 'WEBP'
-    options = { 'quality': 95 }
+    format = "WEBP"
+    options = {"quality": 95}
 
 class BookXSmallJpg(ImageSpec):
     processors = [ResizeToFit(80, 80)]
-    format = 'JPEG'
-    options = { 'quality': 95 }
+    format = "JPEG"
+    options = {"quality": 95}
 
 class BookSmallWebp(ImageSpec):
     processors = [ResizeToFit(100, 100)]
-    format = 'WEBP'
-    options = { 'quality': 95 }
+    format = "WEBP"
+    options = {"quality": 95}
 
 class BookSmallJpg(ImageSpec):
     processors = [ResizeToFit(100, 100)]
-    format = 'JPEG'
-    options = { 'quality': 95 }
+    format = "JPEG"
+    options = {"quality": 95}
 
 class BookMediumWebp(ImageSpec):
     processors = [ResizeToFit(150, 150)]
-    format = 'WEBP'
-    options = { 'quality': 95 }
+    format = "WEBP"
+    options = {"quality": 95}
 
 class BookMediumJpg(ImageSpec):
     processors = [ResizeToFit(150, 150)]
-    format = 'JPEG'
-    options = { 'quality': 95 }
+    format = "JPEG"
+    options = {"quality": 95}
 
 class BookLargeWebp(ImageSpec):
     processors = [ResizeToFit(200, 200)]
-    format = 'WEBP'
-    options = { 'quality': 95 }
+    format = "WEBP"
+    options = {"quality": 95}
 
 class BookLargeJpg(ImageSpec):
     processors = [ResizeToFit(200, 200)]
-    format = 'JPEG'
-    options = { 'quality': 95 }
+    format = "JPEG"
+    options = {"quality": 95}
 
 class BookXLargeWebp(ImageSpec):
     processors = [ResizeToFit(250, 250)]
-    format = 'WEBP'
-    options = { 'quality': 95 }
+    format = "WEBP"
+    options = {"quality": 95}
 
 class BookXLargeJpg(ImageSpec):
     processors = [ResizeToFit(250, 250)]
-    format = 'JPEG'
-    options = { 'quality': 95 }
+    format = "JPEG"
+    options = {"quality": 95}
 
 class BookXxLargeWebp(ImageSpec):
     processors = [ResizeToFit(500, 500)]
-    format = 'WEBP'
-    options = { 'quality': 95 }
+    format = "WEBP"
+    options = {"quality": 95}
 
 class BookXxLargeJpg(ImageSpec):
     processors = [ResizeToFit(500, 500)]
-    format = 'JPEG'
-    options = { 'quality': 95 }
+    format = "JPEG"
+    options = {"quality": 95}
 
-register.generator('bw:book:xsmall:webp', BookXSmallWebp)
-register.generator('bw:book:xsmall:jpg', BookXSmallJpg)
-register.generator('bw:book:small:webp', BookSmallWebp)
-register.generator('bw:book:small:jpg', BookSmallJpg)
-register.generator('bw:book:medium:webp', BookMediumWebp)
-register.generator('bw:book:medium:jpg', BookMediumJpg)
-register.generator('bw:book:large:webp', BookLargeWebp)
-register.generator('bw:book:large:jpg', BookLargeJpg)
-register.generator('bw:book:xlarge:webp', BookXLargeWebp)
-register.generator('bw:book:xlarge:jpg', BookXLargeJpg)
-register.generator('bw:book:xxlarge:webp', BookXxLargeWebp)
-register.generator('bw:book:xxlarge:jpg', BookXxLargeJpg)
+register.generator("bw:book:xsmall:webp", BookXSmallWebp)
+register.generator("bw:book:xsmall:jpg", BookXSmallJpg)
+register.generator("bw:book:small:webp", BookSmallWebp)
+register.generator("bw:book:small:jpg", BookSmallJpg)
+register.generator("bw:book:medium:webp", BookMediumWebp)
+register.generator("bw:book:medium:jpg", BookMediumJpg)
+register.generator("bw:book:large:webp", BookLargeWebp)
+register.generator("bw:book:large:jpg", BookLargeJpg)
+register.generator("bw:book:xlarge:webp", BookXLargeWebp)
+register.generator("bw:book:xlarge:jpg", BookXLargeJpg)
+register.generator("bw:book:xxlarge:webp", BookXxLargeWebp)
+register.generator("bw:book:xxlarge:jpg", BookXxLargeJpg)

From 8b4cb4aeede8ebfc927fbb510a69c3d50bb53a20 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 16:40:25 +0200
Subject: [PATCH 09/25] Thanks, `./bw-dev black`

---
 bookwyrm/imagegenerators.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/bookwyrm/imagegenerators.py b/bookwyrm/imagegenerators.py
index fd1eb4986..31438f74f 100644
--- a/bookwyrm/imagegenerators.py
+++ b/bookwyrm/imagegenerators.py
@@ -1,66 +1,79 @@
 from imagekit import ImageSpec, register
 from imagekit.processors import ResizeToFit
 
+
 class BookXSmallWebp(ImageSpec):
     processors = [ResizeToFit(80, 80)]
     format = "WEBP"
     options = {"quality": 95}
 
+
 class BookXSmallJpg(ImageSpec):
     processors = [ResizeToFit(80, 80)]
     format = "JPEG"
     options = {"quality": 95}
 
+
 class BookSmallWebp(ImageSpec):
     processors = [ResizeToFit(100, 100)]
     format = "WEBP"
     options = {"quality": 95}
 
+
 class BookSmallJpg(ImageSpec):
     processors = [ResizeToFit(100, 100)]
     format = "JPEG"
     options = {"quality": 95}
 
+
 class BookMediumWebp(ImageSpec):
     processors = [ResizeToFit(150, 150)]
     format = "WEBP"
     options = {"quality": 95}
 
+
 class BookMediumJpg(ImageSpec):
     processors = [ResizeToFit(150, 150)]
     format = "JPEG"
     options = {"quality": 95}
 
+
 class BookLargeWebp(ImageSpec):
     processors = [ResizeToFit(200, 200)]
     format = "WEBP"
     options = {"quality": 95}
 
+
 class BookLargeJpg(ImageSpec):
     processors = [ResizeToFit(200, 200)]
     format = "JPEG"
     options = {"quality": 95}
 
+
 class BookXLargeWebp(ImageSpec):
     processors = [ResizeToFit(250, 250)]
     format = "WEBP"
     options = {"quality": 95}
 
+
 class BookXLargeJpg(ImageSpec):
     processors = [ResizeToFit(250, 250)]
     format = "JPEG"
     options = {"quality": 95}
 
+
 class BookXxLargeWebp(ImageSpec):
     processors = [ResizeToFit(500, 500)]
     format = "WEBP"
     options = {"quality": 95}
 
+
 class BookXxLargeJpg(ImageSpec):
     processors = [ResizeToFit(500, 500)]
     format = "JPEG"
     options = {"quality": 95}
 
+
 register.generator("bw:book:xsmall:webp", BookXSmallWebp)
 register.generator("bw:book:xsmall:jpg", BookXSmallJpg)
 register.generator("bw:book:small:webp", BookSmallWebp)

From 1f2c296cfd2c4e0e34f0015f65c558f22b6f07ab Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 6 Jun 2021 21:12:21 +0200
Subject: [PATCH 10/25] This should now work

---
 bookwyrm/models/book.py                     |  52 +++++
 bookwyrm/settings.py                        |   3 +
 bookwyrm/templates/snippets/book_cover.html | 221 +++++++++-----------
 requirements.txt                            |   2 +-
 4 files changed, 158 insertions(+), 120 deletions(-)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 869ff04d2..cdac631d7 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -3,6 +3,7 @@ import re
 
 from django.db import models
 from model_utils.managers import InheritanceManager
+from imagekit.models import ImageSpecField
 
 from bookwyrm import activitypub
 from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE
@@ -87,6 +88,57 @@ class Book(BookDataModel):
 
     objects = InheritanceManager()
 
+    cover_bw_book_xsmall_webp = ImageSpecField(
+        source='cover',
+        id='bw:book:xsmall:webp'
+    )
+    cover_bw_book_xsmall_jpg = ImageSpecField(
+        source='cover',
+        id='bw:book:xsmall:jpg'
+    )
+    cover_bw_book_small_webp = ImageSpecField(
+        source='cover',
+        id='bw:book:small:webp'
+    )
+    cover_bw_book_small_jpg = ImageSpecField(
+        source='cover',
+        id='bw:book:small:jpg'
+    )
+    cover_bw_book_medium_webp = ImageSpecField(
+        source='cover',
+        id='bw:book:medium:webp'
+    )
+    cover_bw_book_medium_jpg = ImageSpecField(
+        source='cover',
+        id='bw:book:medium:jpg'
+    )
+    cover_bw_book_large_webp = ImageSpecField(
+        source='cover',
+        id='bw:book:large:webp'
+    )
+    cover_bw_book_large_jpg = ImageSpecField(
+        source='cover',
+        id='bw:book:large:jpg'
+    )
+    cover_bw_book_xlarge_webp = ImageSpecField(
+        source='cover',
+        id='bw:book:xlarge:webp'
+    )
+    cover_bw_book_xlarge_jpg = ImageSpecField(
+        source='cover',
+        id='bw:book:xlarge:jpg'
+    )
+    cover_bw_book_xxlarge_webp = ImageSpecField(
+        source='cover',
+        id='bw:book:xxlarge:webp'
+    )
+    cover_bw_book_xxlarge_jpg = ImageSpecField(
+        source='cover',
+        id='bw:book:xxlarge:jpg'
+    )
+
+
+
     @property
     def author_text(self):
         """format a list of authors"""
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 332b0c2c3..58f1d2f78 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -185,3 +185,6 @@ USER_AGENT = "%s (BookWyrm/%s; +https://%s/)" % (
     VERSION,
     DOMAIN,
 )
+
+# Imagekit generated thumbnails
+IMAGEKIT_CACHEFILE_DIR = "thumbnails"
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index fd1fb438a..cf133e598 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -5,127 +5,110 @@
 
 {% if book.cover %}
     <picture class="cover-container {{ cover_class }}">
-        {% with external_path|yesno:',/images/' as image_path %}
+        {% if external_path %}
+            <img
+                class="book-cover"
+                src="{{ book.cover }}"
+                itemprop="thumbnailUrl"
+                alt="{{ book.alt_text|default:'' }}"
+            >
+        {% else %}
 
-        {% if size_mobile == 'xsmall' %}
-            {% generateimage 'bw:book:xsmall:webp' source=book.cover as th_xsmall_webp %}
-            {% generateimage 'bw:book:xsmall:jpg' source=book.cover as th_xsmall_jpg %}
-            <source
-                media="(max-width: 768px)"
-                type="image/webp"
-                srcset="{{ image_path }}{{ th_xsmall_webp }}"
-            />
-            <source
-                media="(max-width: 768px)"
-                type="image/jpg"
-                srcset="{{ image_path }}{{ th_xsmall_jpg }}"
-            />
-        {% elif size_mobile == 'small' %}
-            {% generateimage 'bw:book:small:webp' source=book.cover as th_small_webp %}
-            {% generateimage 'bw:book:small:jpg' source=book.cover as th_small_jpg %}
-            <source
-                media="(max-width: 768px)"
-                type="image/webp"
-                srcset="{{ image_path }}{{ th_small_webp }}"
-            />
-            <source
-                media="(max-width: 768px)"
-                type="image/jpg"
-                srcset="{{ image_path }}{{ th_small_jpg }}"
-            />
-        {% elif size_mobile == 'medium' %}
-            {% generateimage 'bw:book:medium:webp' source=book.cover as th_medium_webp %}
-            {% generateimage 'bw:book:medium:jpg' source=book.cover as th_medium_jpg %}
-            <source
-                media="(max-width: 768px)"
-                type="image/webp"
-                srcset="{{ image_path }}{{ th_medium_webp }}"
-            />
-            <source
-                media="(max-width: 768px)"
-                type="image/jpg"
-                srcset="{{ image_path }}{{ th_medium_jpg }}"
-            />
-        {% elif size_mobile == 'large' %}
-            {% generateimage 'bw:book:large:webp' source=book.cover as th_large_webp %}
-            {% generateimage 'bw:book:large:jpg' source=book.cover as th_large_jpg %}
-            <source
-                media="(max-width: 768px)"
-                type="image/webp"
-                srcset="{{ image_path }}{{ th_large_webp }}"
-            />
-            <source
-                media="(max-width: 768px)"
-                type="image/jpg"
-                srcset="{{ image_path }}{{ th_large_jpg }}"
-            />
-        {% elif size_mobile == 'xlarge' %}
-            {% generateimage 'bw:book:xlarge:webp' source=book.cover as th_xlarge_webp %}
-            {% generateimage 'bw:book:xlarge:jpg' source=book.cover as th_xlarge_jpg %}
-            <source
-                media="(max-width: 768px)"
-                type="image/webp"
-                srcset="{{ image_path }}{{ th_xlarge_webp }}"
-            />
-            <source
-                media="(max-width: 768px)"
-                type="image/jpg"
-                srcset="{{ image_path }}{{ th_xlarge_jpg }}"
-            />
-        {% elif size_mobile == 'xxlarge' %}
-            {% generateimage 'bw:book:xxlarge:webp' source=book.cover as th_xxlarge_webp %}
-            {% generateimage 'bw:book:xxlarge:jpg' source=book.cover as th_xxlarge_jpg %}
-            <source
-                media="(max-width: 768px)"
-                type="image/webp"
-                srcset="{{ image_path }}{{ th_xxlarge_webp }}"
-            />
-            <source
-                media="(max-width: 768px)"
-                type="image/jpg"
-                srcset="{{ image_path }}{{ th_xxlarge_jpg }}"
-            />
+            {% if size_mobile == 'xsmall' %}
+                <source
+                    media="(max-width: 768px)"
+                    type="image/webp"
+                    srcset="{{ book.cover_bw_book_xsmall_webp.url }}"
+                />
+                <source
+                    media="(max-width: 768px)"
+                    type="image/jpg"
+                    srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"
+                />
+            {% elif size_mobile == 'small' %}
+                <source
+                    media="(max-width: 768px)"
+                    type="image/webp"
+                    srcset="{{ book.cover_bw_book_small_webp.url }}"
+                />
+                <source
+                    media="(max-width: 768px)"
+                    type="image/jpg"
+                    srcset="{{ book.cover_bw_book_small_jpg.url }}"
+                />
+            {% elif size_mobile == 'medium' %}
+                <source
+                    media="(max-width: 768px)"
+                    type="image/webp"
+                    srcset="{{ book.cover_bw_book_medium_webp.url }}"
+                />
+                <source
+                    media="(max-width: 768px)"
+                    type="image/jpg"
+                    srcset="{{ book.cover_bw_book_medium_jpg.url }}"
+                />
+            {% elif size_mobile == 'large' %}
+                <source
+                    media="(max-width: 768px)"
+                    type="image/webp"
+                    srcset="{{ book.cover_bw_book_large_webp.url }}"
+                />
+                <source
+                    media="(max-width: 768px)"
+                    type="image/jpg"
+                    srcset="{{ book.cover_bw_book_large_jpg.url }}"
+                />
+            {% elif size_mobile == 'xlarge' %}
+                <source
+                    media="(max-width: 768px)"
+                    type="image/webp"
+                    srcset="{{ book.cover_bw_book_xlarge_webp.url }}"
+                />
+                <source
+                    media="(max-width: 768px)"
+                    type="image/jpg"
+                    srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"
+                />
+            {% elif size_mobile == 'xxlarge' %}
+                <source
+                    media="(max-width: 768px)"
+                    type="image/webp"
+                    srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"
+                />
+                <source
+                    media="(max-width: 768px)"
+                    type="image/jpg"
+                    srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"
+                />
+            {% endif %}
+
+            {% if size == 'xsmall' %}
+                <source type="image/webp" srcset="{{ book.cover_bw_book_xsmall_webp.url }}"/>
+                <source type="image/jpg" srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"/>
+            {% elif size == 'small' %}
+                <source type="image/webp" srcset="{{ book.cover_bw_book_small_webp.url }}"/>
+                <source type="image/jpg" srcset="{{ book.cover_bw_book_small_jpg.url }}"/>
+            {% elif size == 'medium' %}
+                <source type="image/webp" srcset="{{ book.cover_bw_book_medium_webp.url }}"/>
+                <source type="image/jpg" srcset="{{ book.cover_bw_book_medium_jpg.url }}"/>
+            {% elif size == 'large' %}
+                <source type="image/webp" srcset="{{ book.cover_bw_book_large_webp.url }}"/>
+                <source type="image/jpg" srcset="{{ book.cover_bw_book_large_jpg.url }}"/>
+            {% elif size == 'xlarge' %}
+                <source type="image/webp" srcset="{{ book.cover_bw_book_xlarge_webp.url }}"/>
+                <source type="image/jpg" srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"/>
+            {% elif size == 'xxlarge' %}
+                <source type="image/webp" srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"/>
+                <source type="image/jpg" srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"/>
+            {% endif %}
+
+            <img
+                class="book-cover"
+                src="/images/{{ book.cover }}"
+                itemprop="thumbnailUrl"
+                alt="{{ book.alt_text|default:'' }}"
+            >
         {% endif %}
-
-        {% if size == 'xsmall' %}
-            {% generateimage 'bw:book:xsmall:webp' source=book.cover as th_xsmall_webp %}
-            {% generateimage 'bw:book:xsmall:jpg' source=book.cover as th_xsmall_jpg %}
-            <source type="image/webp" srcset="{{ image_path }}{{ th_xsmall_webp }}"/>
-            <source type="image/jpg" srcset="{{ image_path }}{{ th_xsmall_jpg }}"/>
-        {% elif size == 'small' %}
-            {% generateimage 'bw:book:small:webp' source=book.cover as th_small_webp %}
-            {% generateimage 'bw:book:small:jpg' source=book.cover as th_small_jpg %}
-            <source type="image/webp" srcset="{{ image_path }}{{ th_small_webp }}"/>
-            <source type="image/jpg" srcset="{{ image_path }}{{ th_small_jpg }}"/>
-        {% elif size == 'medium' %}
-            {% generateimage 'bw:book:medium:webp' source=book.cover as th_medium_webp %}
-            {% generateimage 'bw:book:medium:jpg' source=book.cover as th_medium_jpg %}
-            <source type="image/webp" srcset="{{ image_path }}{{ th_medium_webp }}"/>
-            <source type="image/jpg" srcset="{{ image_path }}{{ th_medium_jpg }}"/>
-        {% elif size == 'large' %}
-            {% generateimage 'bw:book:large:webp' source=book.cover as th_large_webp %}
-            {% generateimage 'bw:book:large:jpg' source=book.cover as th_large_jpg %}
-            <source type="image/webp" srcset="{{ image_path }}{{ th_large_webp }}"/>
-            <source type="image/jpg" srcset="{{ image_path }}{{ th_large_jpg }}"/>
-        {% elif size == 'xlarge' %}
-            {% generateimage 'bw:book:xlarge:webp' source=book.cover as th_xlarge_webp %}
-            {% generateimage 'bw:book:xlarge:jpg' source=book.cover as th_xlarge_jpg %}
-            <source type="image/webp" srcset="{{ image_path }}{{ th_xlarge_webp }}"/>
-            <source type="image/jpg" srcset="{{ image_path }}{{ th_xlarge_jpg }}"/>
-        {% elif size == 'xxlarge' %}
-            {% generateimage 'bw:book:xxlarge:webp' source=book.cover as th_xxlarge_webp %}
-            {% generateimage 'bw:book:xxlarge:jpg' source=book.cover as th_xxlarge_jpg %}
-            <source type="image/webp" srcset="{{ image_path }}{{ th_xxlarge_webp }}"/>
-            <source type="image/jpg" srcset="{{ image_path }}{{ th_xxlarge_jpg }}"/>
-        {% endif %}
-
-        <img
-            class="book-cover"
-            src="{{ image_path }}{{ book.cover }}"
-            itemprop="thumbnailUrl"
-            alt="{{ book.alt_text|default:'' }}"
-        >
-        {% endwith %}
     </picture>
 {% endif %}
 
diff --git a/requirements.txt b/requirements.txt
index 3762f47bb..5f391be7b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ django-model-utils==4.0.0
 environs==7.2.0
 flower==0.9.4
 Markdown==3.3.3
-Pillow>=7.1.0
+Pillow>=8.2.0
 psycopg2==2.8.4
 pycryptodome==3.9.4
 python-dateutil==2.8.1

From 7ed2ed116a157b6d7deb9f94790376e753012403 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 6 Jun 2021 21:13:16 +0200
Subject: [PATCH 11/25] :sparkles: lint :sparkles:

---
 bookwyrm/models/book.py | 60 +++++++++--------------------------------
 1 file changed, 12 insertions(+), 48 deletions(-)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index cdac631d7..4437d6280 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -88,56 +88,20 @@ class Book(BookDataModel):
 
     objects = InheritanceManager()
 
-    cover_bw_book_xsmall_webp = ImageSpecField(
-        source='cover',
-        id='bw:book:xsmall:webp'
-    )
-    cover_bw_book_xsmall_jpg = ImageSpecField(
-        source='cover',
-        id='bw:book:xsmall:jpg'
-    )
-    cover_bw_book_small_webp = ImageSpecField(
-        source='cover',
-        id='bw:book:small:webp'
-    )
-    cover_bw_book_small_jpg = ImageSpecField(
-        source='cover',
-        id='bw:book:small:jpg'
-    )
-    cover_bw_book_medium_webp = ImageSpecField(
-        source='cover',
-        id='bw:book:medium:webp'
-    )
-    cover_bw_book_medium_jpg = ImageSpecField(
-        source='cover',
-        id='bw:book:medium:jpg'
-    )
-    cover_bw_book_large_webp = ImageSpecField(
-        source='cover',
-        id='bw:book:large:webp'
-    )
-    cover_bw_book_large_jpg = ImageSpecField(
-        source='cover',
-        id='bw:book:large:jpg'
-    )
-    cover_bw_book_xlarge_webp = ImageSpecField(
-        source='cover',
-        id='bw:book:xlarge:webp'
-    )
-    cover_bw_book_xlarge_jpg = ImageSpecField(
-        source='cover',
-        id='bw:book:xlarge:jpg'
-    )
+    cover_bw_book_xsmall_webp = ImageSpecField(source="cover", id="bw:book:xsmall:webp")
+    cover_bw_book_xsmall_jpg = ImageSpecField(source="cover", id="bw:book:xsmall:jpg")
+    cover_bw_book_small_webp = ImageSpecField(source="cover", id="bw:book:small:webp")
+    cover_bw_book_small_jpg = ImageSpecField(source="cover", id="bw:book:small:jpg")
+    cover_bw_book_medium_webp = ImageSpecField(source="cover", id="bw:book:medium:webp")
+    cover_bw_book_medium_jpg = ImageSpecField(source="cover", id="bw:book:medium:jpg")
+    cover_bw_book_large_webp = ImageSpecField(source="cover", id="bw:book:large:webp")
+    cover_bw_book_large_jpg = ImageSpecField(source="cover", id="bw:book:large:jpg")
+    cover_bw_book_xlarge_webp = ImageSpecField(source="cover", id="bw:book:xlarge:webp")
+    cover_bw_book_xlarge_jpg = ImageSpecField(source="cover", id="bw:book:xlarge:jpg")
     cover_bw_book_xxlarge_webp = ImageSpecField(
-        source='cover',
-        id='bw:book:xxlarge:webp'
+        source="cover", id="bw:book:xxlarge:webp"
     )
-    cover_bw_book_xxlarge_jpg = ImageSpecField(
-        source='cover',
-        id='bw:book:xxlarge:jpg'
-    )
-
-
+    cover_bw_book_xxlarge_jpg = ImageSpecField(source="cover", id="bw:book:xxlarge:jpg")
 
     @property
     def author_text(self):

From 2731ea9aa9183e75d2ed05c131e1e87ed0483e66 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 7 Jun 2021 19:52:25 +0200
Subject: [PATCH 12/25] Add env var to enable/disable thumbnail generation

---
 .env.dev.example                            |   3 +
 .env.prod.example                           |   3 +
 bookwyrm/context_processors.py              |   3 +-
 bookwyrm/models/book.py                     |  31 ++--
 bookwyrm/settings.py                        |   1 +
 bookwyrm/templates/snippets/book_cover.html | 179 ++++++++++----------
 6 files changed, 117 insertions(+), 103 deletions(-)

diff --git a/.env.dev.example b/.env.dev.example
index 2f24378c6..e2f0999ac 100644
--- a/.env.dev.example
+++ b/.env.dev.example
@@ -50,5 +50,8 @@ EMAIL_HOST_PASSWORD=emailpassword123
 EMAIL_USE_TLS=true
 EMAIL_USE_SSL=false
 
+# Thumbnails Generation
+ENABLE_THUMBNAIL_GENERATION=false
+
 # Set this to true when initializing certbot for domain, false when not
 CERTBOT_INIT=false
diff --git a/.env.prod.example b/.env.prod.example
index a82499a32..8aa1b514a 100644
--- a/.env.prod.example
+++ b/.env.prod.example
@@ -50,5 +50,8 @@ EMAIL_HOST_PASSWORD=emailpassword123
 EMAIL_USE_TLS=true
 EMAIL_USE_SSL=false
 
+# Thumbnails Generation
+ENABLE_THUMBNAIL_GENERATION=false
+
 # Set this to true when initializing certbot for domain, false when not
 CERTBOT_INIT=false
diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py
index b77c62b02..b95e1c236 100644
--- a/bookwyrm/context_processors.py
+++ b/bookwyrm/context_processors.py
@@ -1,5 +1,5 @@
 """ customize the info available in context for rendering templates """
-from bookwyrm import models
+from bookwyrm import models, settings
 
 
 def site_settings(request):  # pylint: disable=unused-argument
@@ -7,4 +7,5 @@ def site_settings(request):  # pylint: disable=unused-argument
     return {
         "site": models.SiteSettings.objects.get(),
         "active_announcements": models.Announcement.active_announcements(),
+        "enable_thumbnail_generation": settings.ENABLE_THUMBNAIL_GENERATION,
     }
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 4437d6280..83884f333 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -6,7 +6,7 @@ from model_utils.managers import InheritanceManager
 from imagekit.models import ImageSpecField
 
 from bookwyrm import activitypub
-from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE
+from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE, ENABLE_THUMBNAIL_GENERATION
 
 from .activitypub_mixin import OrderedCollectionPageMixin, ObjectMixin
 from .base_model import BookWyrmModel
@@ -88,20 +88,21 @@ class Book(BookDataModel):
 
     objects = InheritanceManager()
 
-    cover_bw_book_xsmall_webp = ImageSpecField(source="cover", id="bw:book:xsmall:webp")
-    cover_bw_book_xsmall_jpg = ImageSpecField(source="cover", id="bw:book:xsmall:jpg")
-    cover_bw_book_small_webp = ImageSpecField(source="cover", id="bw:book:small:webp")
-    cover_bw_book_small_jpg = ImageSpecField(source="cover", id="bw:book:small:jpg")
-    cover_bw_book_medium_webp = ImageSpecField(source="cover", id="bw:book:medium:webp")
-    cover_bw_book_medium_jpg = ImageSpecField(source="cover", id="bw:book:medium:jpg")
-    cover_bw_book_large_webp = ImageSpecField(source="cover", id="bw:book:large:webp")
-    cover_bw_book_large_jpg = ImageSpecField(source="cover", id="bw:book:large:jpg")
-    cover_bw_book_xlarge_webp = ImageSpecField(source="cover", id="bw:book:xlarge:webp")
-    cover_bw_book_xlarge_jpg = ImageSpecField(source="cover", id="bw:book:xlarge:jpg")
-    cover_bw_book_xxlarge_webp = ImageSpecField(
-        source="cover", id="bw:book:xxlarge:webp"
-    )
-    cover_bw_book_xxlarge_jpg = ImageSpecField(source="cover", id="bw:book:xxlarge:jpg")
+    if ENABLE_THUMBNAIL_GENERATION:
+        cover_bw_book_xsmall_webp = ImageSpecField(source="cover", id="bw:book:xsmall:webp")
+        cover_bw_book_xsmall_jpg = ImageSpecField(source="cover", id="bw:book:xsmall:jpg")
+        cover_bw_book_small_webp = ImageSpecField(source="cover", id="bw:book:small:webp")
+        cover_bw_book_small_jpg = ImageSpecField(source="cover", id="bw:book:small:jpg")
+        cover_bw_book_medium_webp = ImageSpecField(source="cover", id="bw:book:medium:webp")
+        cover_bw_book_medium_jpg = ImageSpecField(source="cover", id="bw:book:medium:jpg")
+        cover_bw_book_large_webp = ImageSpecField(source="cover", id="bw:book:large:webp")
+        cover_bw_book_large_jpg = ImageSpecField(source="cover", id="bw:book:large:jpg")
+        cover_bw_book_xlarge_webp = ImageSpecField(source="cover", id="bw:book:xlarge:webp")
+        cover_bw_book_xlarge_jpg = ImageSpecField(source="cover", id="bw:book:xlarge:jpg")
+        cover_bw_book_xxlarge_webp = ImageSpecField(
+            source="cover", id="bw:book:xxlarge:webp"
+        )
+        cover_bw_book_xxlarge_jpg = ImageSpecField(source="cover", id="bw:book:xxlarge:jpg")
 
     @property
     def author_text(self):
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 58f1d2f78..76fb079f9 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -187,4 +187,5 @@ USER_AGENT = "%s (BookWyrm/%s; +https://%s/)" % (
 )
 
 # Imagekit generated thumbnails
+ENABLE_THUMBNAIL_GENERATION = env.bool("ENABLE_THUMBNAIL_GENERATION", False)
 IMAGEKIT_CACHEFILE_DIR = "thumbnails"
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index cf133e598..1e2795805 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -1,6 +1,7 @@
 {% spaceless %}
 
 {% load i18n %}
+{% load static %}
 {% load imagekit %}
 
 {% if book.cover %}
@@ -14,97 +15,101 @@
             >
         {% else %}
 
-            {% if size_mobile == 'xsmall' %}
-                <source
-                    media="(max-width: 768px)"
-                    type="image/webp"
-                    srcset="{{ book.cover_bw_book_xsmall_webp.url }}"
-                />
-                <source
-                    media="(max-width: 768px)"
-                    type="image/jpg"
-                    srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"
-                />
-            {% elif size_mobile == 'small' %}
-                <source
-                    media="(max-width: 768px)"
-                    type="image/webp"
-                    srcset="{{ book.cover_bw_book_small_webp.url }}"
-                />
-                <source
-                    media="(max-width: 768px)"
-                    type="image/jpg"
-                    srcset="{{ book.cover_bw_book_small_jpg.url }}"
-                />
-            {% elif size_mobile == 'medium' %}
-                <source
-                    media="(max-width: 768px)"
-                    type="image/webp"
-                    srcset="{{ book.cover_bw_book_medium_webp.url }}"
-                />
-                <source
-                    media="(max-width: 768px)"
-                    type="image/jpg"
-                    srcset="{{ book.cover_bw_book_medium_jpg.url }}"
-                />
-            {% elif size_mobile == 'large' %}
-                <source
-                    media="(max-width: 768px)"
-                    type="image/webp"
-                    srcset="{{ book.cover_bw_book_large_webp.url }}"
-                />
-                <source
-                    media="(max-width: 768px)"
-                    type="image/jpg"
-                    srcset="{{ book.cover_bw_book_large_jpg.url }}"
-                />
-            {% elif size_mobile == 'xlarge' %}
-                <source
-                    media="(max-width: 768px)"
-                    type="image/webp"
-                    srcset="{{ book.cover_bw_book_xlarge_webp.url }}"
-                />
-                <source
-                    media="(max-width: 768px)"
-                    type="image/jpg"
-                    srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"
-                />
-            {% elif size_mobile == 'xxlarge' %}
-                <source
-                    media="(max-width: 768px)"
-                    type="image/webp"
-                    srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"
-                />
-                <source
-                    media="(max-width: 768px)"
-                    type="image/jpg"
-                    srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"
-                />
-            {% endif %}
+            {% if enable_thumbnail_generation %}
+
+                {% if size_mobile == 'xsmall' %}
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/webp"
+                        srcset="{{ book.cover_bw_book_xsmall_webp.url }}"
+                    />
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/jpg"
+                        srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"
+                    />
+                {% elif size_mobile == 'small' %}
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/webp"
+                        srcset="{{ book.cover_bw_book_small_webp.url }}"
+                    />
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/jpg"
+                        srcset="{{ book.cover_bw_book_small_jpg.url }}"
+                    />
+                {% elif size_mobile == 'medium' %}
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/webp"
+                        srcset="{{ book.cover_bw_book_medium_webp.url }}"
+                    />
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/jpg"
+                        srcset="{{ book.cover_bw_book_medium_jpg.url }}"
+                    />
+                {% elif size_mobile == 'large' %}
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/webp"
+                        srcset="{{ book.cover_bw_book_large_webp.url }}"
+                    />
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/jpg"
+                        srcset="{{ book.cover_bw_book_large_jpg.url }}"
+                    />
+                {% elif size_mobile == 'xlarge' %}
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/webp"
+                        srcset="{{ book.cover_bw_book_xlarge_webp.url }}"
+                    />
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/jpg"
+                        srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"
+                    />
+                {% elif size_mobile == 'xxlarge' %}
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/webp"
+                        srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"
+                    />
+                    <source
+                        media="(max-width: 768px)"
+                        type="image/jpg"
+                        srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"
+                    />
+                {% endif %}
+
+                {% if size == 'xsmall' %}
+                    <source type="image/webp" srcset="{{ book.cover_bw_book_xsmall_webp.url }}"/>
+                    <source type="image/jpg" srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"/>
+                {% elif size == 'small' %}
+                    <source type="image/webp" srcset="{{ book.cover_bw_book_small_webp.url }}"/>
+                    <source type="image/jpg" srcset="{{ book.cover_bw_book_small_jpg.url }}"/>
+                {% elif size == 'medium' %}
+                    <source type="image/webp" srcset="{{ book.cover_bw_book_medium_webp.url }}"/>
+                    <source type="image/jpg" srcset="{{ book.cover_bw_book_medium_jpg.url }}"/>
+                {% elif size == 'large' %}
+                    <source type="image/webp" srcset="{{ book.cover_bw_book_large_webp.url }}"/>
+                    <source type="image/jpg" srcset="{{ book.cover_bw_book_large_jpg.url }}"/>
+                {% elif size == 'xlarge' %}
+                    <source type="image/webp" srcset="{{ book.cover_bw_book_xlarge_webp.url }}"/>
+                    <source type="image/jpg" srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"/>
+                {% elif size == 'xxlarge' %}
+                    <source type="image/webp" srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"/>
+                    <source type="image/jpg" srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"/>
+                {% endif %}
 
-            {% if size == 'xsmall' %}
-                <source type="image/webp" srcset="{{ book.cover_bw_book_xsmall_webp.url }}"/>
-                <source type="image/jpg" srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"/>
-            {% elif size == 'small' %}
-                <source type="image/webp" srcset="{{ book.cover_bw_book_small_webp.url }}"/>
-                <source type="image/jpg" srcset="{{ book.cover_bw_book_small_jpg.url }}"/>
-            {% elif size == 'medium' %}
-                <source type="image/webp" srcset="{{ book.cover_bw_book_medium_webp.url }}"/>
-                <source type="image/jpg" srcset="{{ book.cover_bw_book_medium_jpg.url }}"/>
-            {% elif size == 'large' %}
-                <source type="image/webp" srcset="{{ book.cover_bw_book_large_webp.url }}"/>
-                <source type="image/jpg" srcset="{{ book.cover_bw_book_large_jpg.url }}"/>
-            {% elif size == 'xlarge' %}
-                <source type="image/webp" srcset="{{ book.cover_bw_book_xlarge_webp.url }}"/>
-                <source type="image/jpg" srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"/>
-            {% elif size == 'xxlarge' %}
-                <source type="image/webp" srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"/>
-                <source type="image/jpg" srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"/>
             {% endif %}
 
             <img
                 class="book-cover"
-                src="/images/{{ book.cover }}"
+                src="{% get_media_prefix %}{{ book.cover }}"
                 itemprop="thumbnailUrl"
                 alt="{{ book.alt_text|default:'' }}"
             >
@@ -116,7 +121,7 @@
     <figure class="cover-container no-cover {{ cover_class }}">
         <img
             class="book-cover"
-            src="/static/images/no_cover.jpg"
+            src="{% static "images/no_cover.jpg" %}"
             alt="{% trans "No cover" %}"
         >
         <figcaption class="cover-caption">

From 4359505124dcce51689ad2134bf667ce771898d2 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 7 Jun 2021 19:54:16 +0200
Subject: [PATCH 13/25] Update book.py

---
 bookwyrm/models/book.py | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 83884f333..b0d5d476e 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -89,20 +89,38 @@ class Book(BookDataModel):
     objects = InheritanceManager()
 
     if ENABLE_THUMBNAIL_GENERATION:
-        cover_bw_book_xsmall_webp = ImageSpecField(source="cover", id="bw:book:xsmall:webp")
-        cover_bw_book_xsmall_jpg = ImageSpecField(source="cover", id="bw:book:xsmall:jpg")
-        cover_bw_book_small_webp = ImageSpecField(source="cover", id="bw:book:small:webp")
+        cover_bw_book_xsmall_webp = ImageSpecField(
+            source="cover", id="bw:book:xsmall:webp"
+        )
+        cover_bw_book_xsmall_jpg = ImageSpecField(
+            source="cover", id="bw:book:xsmall:jpg"
+        )
+        cover_bw_book_small_webp = ImageSpecField(
+            source="cover", id="bw:book:small:webp"
+        )
         cover_bw_book_small_jpg = ImageSpecField(source="cover", id="bw:book:small:jpg")
-        cover_bw_book_medium_webp = ImageSpecField(source="cover", id="bw:book:medium:webp")
-        cover_bw_book_medium_jpg = ImageSpecField(source="cover", id="bw:book:medium:jpg")
-        cover_bw_book_large_webp = ImageSpecField(source="cover", id="bw:book:large:webp")
+        cover_bw_book_medium_webp = ImageSpecField(
+            source="cover", id="bw:book:medium:webp"
+        )
+        cover_bw_book_medium_jpg = ImageSpecField(
+            source="cover", id="bw:book:medium:jpg"
+        )
+        cover_bw_book_large_webp = ImageSpecField(
+            source="cover", id="bw:book:large:webp"
+        )
         cover_bw_book_large_jpg = ImageSpecField(source="cover", id="bw:book:large:jpg")
-        cover_bw_book_xlarge_webp = ImageSpecField(source="cover", id="bw:book:xlarge:webp")
-        cover_bw_book_xlarge_jpg = ImageSpecField(source="cover", id="bw:book:xlarge:jpg")
+        cover_bw_book_xlarge_webp = ImageSpecField(
+            source="cover", id="bw:book:xlarge:webp"
+        )
+        cover_bw_book_xlarge_jpg = ImageSpecField(
+            source="cover", id="bw:book:xlarge:jpg"
+        )
         cover_bw_book_xxlarge_webp = ImageSpecField(
             source="cover", id="bw:book:xxlarge:webp"
         )
-        cover_bw_book_xxlarge_jpg = ImageSpecField(source="cover", id="bw:book:xxlarge:jpg")
+        cover_bw_book_xxlarge_jpg = ImageSpecField(
+            source="cover", id="bw:book:xxlarge:jpg"
+        )
 
     @property
     def author_text(self):

From 0c83882a118e31c34045d1946ec48e642199b324 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sat, 19 Jun 2021 19:44:14 +0200
Subject: [PATCH 14/25] Fix lint

---
 bookwyrm/imagegenerators.py | 25 +++++++++++++++++++++++++
 bookwyrm/models/book.py     |  7 ++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/imagegenerators.py b/bookwyrm/imagegenerators.py
index 31438f74f..1d065192e 100644
--- a/bookwyrm/imagegenerators.py
+++ b/bookwyrm/imagegenerators.py
@@ -1,74 +1,99 @@
+"""Generators for all the different thumbnail sizes"""
 from imagekit import ImageSpec, register
 from imagekit.processors import ResizeToFit
 
 
 class BookXSmallWebp(ImageSpec):
+    """Handles XSmall size in Webp format"""
+
     processors = [ResizeToFit(80, 80)]
     format = "WEBP"
     options = {"quality": 95}
 
 
 class BookXSmallJpg(ImageSpec):
+    """Handles XSmall size in Jpeg format"""
+
     processors = [ResizeToFit(80, 80)]
     format = "JPEG"
     options = {"quality": 95}
 
 
 class BookSmallWebp(ImageSpec):
+    """Handles Small size in Webp format"""
+
     processors = [ResizeToFit(100, 100)]
     format = "WEBP"
     options = {"quality": 95}
 
 
 class BookSmallJpg(ImageSpec):
+    """Handles Small size in Jpeg format"""
+
     processors = [ResizeToFit(100, 100)]
     format = "JPEG"
     options = {"quality": 95}
 
 
 class BookMediumWebp(ImageSpec):
+    """Handles Medium size in Webp format"""
+
     processors = [ResizeToFit(150, 150)]
     format = "WEBP"
     options = {"quality": 95}
 
 
 class BookMediumJpg(ImageSpec):
+    """Handles Medium size in Jpeg format"""
+
     processors = [ResizeToFit(150, 150)]
     format = "JPEG"
     options = {"quality": 95}
 
 
 class BookLargeWebp(ImageSpec):
+    """Handles Large size in Webp format"""
+
     processors = [ResizeToFit(200, 200)]
     format = "WEBP"
     options = {"quality": 95}
 
 
 class BookLargeJpg(ImageSpec):
+    """Handles Large size in Jpeg format"""
+
     processors = [ResizeToFit(200, 200)]
     format = "JPEG"
     options = {"quality": 95}
 
 
 class BookXLargeWebp(ImageSpec):
+    """Handles XLarge size in Webp format"""
+
     processors = [ResizeToFit(250, 250)]
     format = "WEBP"
     options = {"quality": 95}
 
 
 class BookXLargeJpg(ImageSpec):
+    """Handles XLarge size in Jpeg format"""
+
     processors = [ResizeToFit(250, 250)]
     format = "JPEG"
     options = {"quality": 95}
 
 
 class BookXxLargeWebp(ImageSpec):
+    """Handles XxLarge size in Webp format"""
+
     processors = [ResizeToFit(500, 500)]
     format = "WEBP"
     options = {"quality": 95}
 
 
 class BookXxLargeJpg(ImageSpec):
+    """Handles XxLarge size in Jpeg format"""
+
     processors = [ResizeToFit(500, 500)]
     format = "JPEG"
     options = {"quality": 95}
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 03ff572f6..189cbb897 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -9,7 +9,12 @@ from imagekit.models import ImageSpecField
 
 from bookwyrm import activitypub
 from bookwyrm.preview_images import generate_edition_preview_image_task
-from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE, ENABLE_PREVIEW_IMAGES, ENABLE_THUMBNAIL_GENERATION
+from bookwyrm.settings import (
+    DOMAIN,
+    DEFAULT_LANGUAGE,
+    ENABLE_PREVIEW_IMAGES,
+    ENABLE_THUMBNAIL_GENERATION,
+)
 
 from .activitypub_mixin import OrderedCollectionPageMixin, ObjectMixin
 from .base_model import BookWyrmModel

From 9b97fbc0aea8569c65e0cc6b569938a448fb8e12 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 2 Aug 2021 12:56:11 -0700
Subject: [PATCH 15/25] Fixes error in merge

---
 bookwyrm/templates/snippets/book_cover.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 3837d3ec0..67bc48374 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -115,6 +115,7 @@
                 {% else %}
                 src="{% static "images/no_cover.jpg" %}"
                 alt="{% trans "No cover" %}"
+                {% endif %}
             >
 
         {% endif %}

From 7754b490fa598daab93bd8b8da4f6931e7452dc7 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 2 Aug 2021 22:40:19 +0200
Subject: [PATCH 16/25] Bring consistency to management commands

---
 bw-dev | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bw-dev b/bw-dev
index 834fd316c..88cf99d95 100755
--- a/bw-dev
+++ b/bw-dev
@@ -123,7 +123,7 @@ case "$CMD" in
     populate_streams)
         runweb python manage.py populate_streams
         ;;
-    generateimages)
+    generate_thumbnails)
         runweb python manage.py generateimages
         ;;
     generate_preview_images)
@@ -171,7 +171,7 @@ case "$CMD" in
         echo "    black"
         echo "    populate_streams"
         echo "    generate_preview_images [--all]"
-        echo "    generateimages"
+        echo "    generate_thumbnails"
         echo "    copy_media_to_s3"
         echo "    set_cors_to_s3 [cors file]"
         echo "    runweb [command]"

From 2370f6043628c20b331d2512df3b9b34dcffd5d2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 2 Aug 2021 14:46:56 -0600
Subject: [PATCH 17/25] Update bookwyrm/templates/snippets/book_cover.html

Co-authored-by: Joachim <joachim.robert@protonmail.com>
---
 bookwyrm/templates/snippets/book_cover.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 67bc48374..8068051d1 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -110,12 +110,7 @@
             <img
                 class="book-cover"
                 itemprop="thumbnailUrl"
-                {% if book.cover %}
                 src="{% if img_path is None %}{% get_media_prefix %}{% else %}{{ img_path }}{% endif %}{{ book.cover }}"
-                {% else %}
-                src="{% static "images/no_cover.jpg" %}"
-                alt="{% trans "No cover" %}"
-                {% endif %}
             >
 
         {% endif %}

From ce4553b367beb905fcf81d2efab9e7d265c52402 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Tue, 3 Aug 2021 17:45:52 +0200
Subject: [PATCH 18/25] Add simple tag to provide fallback if original image
 doesn't exist

---
 bookwyrm/templates/snippets/book_cover.html | 86 +++++++++++++++------
 bookwyrm/templatetags/utilities.py          | 11 +++
 2 files changed, 73 insertions(+), 24 deletions(-)

diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 8068051d1..84303015a 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -3,6 +3,7 @@
 {% load i18n %}
 {% load static %}
 {% load imagekit %}
+{% load utilities %}
 
 {% if book.cover %}
     <picture class="cover-container {{ cover_class }}">
@@ -21,93 +22,130 @@
                     <source
                         media="(max-width: 768px)"
                         type="image/webp"
-                        srcset="{{ book.cover_bw_book_xsmall_webp.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='webp' %}"
                     />
                     <source
                         media="(max-width: 768px)"
                         type="image/jpg"
-                        srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='jpg' %}"
                     />
                 {% elif size_mobile == 'small' %}
                     <source
                         media="(max-width: 768px)"
                         type="image/webp"
-                        srcset="{{ book.cover_bw_book_small_webp.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='webp' %}"
                     />
                     <source
                         media="(max-width: 768px)"
                         type="image/jpg"
-                        srcset="{{ book.cover_bw_book_small_jpg.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='jpg' %}"
                     />
                 {% elif size_mobile == 'medium' %}
                     <source
                         media="(max-width: 768px)"
                         type="image/webp"
-                        srcset="{{ book.cover_bw_book_medium_webp.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='webp' %}"
                     />
                     <source
                         media="(max-width: 768px)"
                         type="image/jpg"
-                        srcset="{{ book.cover_bw_book_medium_jpg.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='jpg' %}"
                     />
                 {% elif size_mobile == 'large' %}
                     <source
                         media="(max-width: 768px)"
                         type="image/webp"
-                        srcset="{{ book.cover_bw_book_large_webp.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='webp' %}"
                     />
                     <source
                         media="(max-width: 768px)"
                         type="image/jpg"
-                        srcset="{{ book.cover_bw_book_large_jpg.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='jpg' %}"
                     />
                 {% elif size_mobile == 'xlarge' %}
                     <source
                         media="(max-width: 768px)"
                         type="image/webp"
-                        srcset="{{ book.cover_bw_book_xlarge_webp.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='webp' %}"
                     />
                     <source
                         media="(max-width: 768px)"
                         type="image/jpg"
-                        srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='jpg' %}"
                     />
                 {% elif size_mobile == 'xxlarge' %}
                     <source
                         media="(max-width: 768px)"
                         type="image/webp"
-                        srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='webp' %}"
                     />
                     <source
                         media="(max-width: 768px)"
                         type="image/jpg"
-                        srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"
+                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='jpg' %}"
                     />
                 {% endif %}
 
                 {% if size == 'xsmall' %}
-                    <source type="image/webp" srcset="{{ book.cover_bw_book_xsmall_webp.url }}"/>
-                    <source type="image/jpg" srcset="{{ book.cover_bw_book_xsmall_jpg.url }}"/>
+                    <source
+                        type="image/webp"
+                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='webp' %}"
+                    />
+                    <source
+                        type="image/jpg"
+                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='jpg' %}"
+                    />
                 {% elif size == 'small' %}
-                    <source type="image/webp" srcset="{{ book.cover_bw_book_small_webp.url }}"/>
-                    <source type="image/jpg" srcset="{{ book.cover_bw_book_small_jpg.url }}"/>
+                    <source
+                        type="image/webp"
+                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='webp' %}"
+                    />
+                    <source
+                        type="image/jpg"
+                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='jpg' %}"
+                    />
                 {% elif size == 'medium' %}
-                    <source type="image/webp" srcset="{{ book.cover_bw_book_medium_webp.url }}"/>
-                    <source type="image/jpg" srcset="{{ book.cover_bw_book_medium_jpg.url }}"/>
+                    <source
+                        type="image/webp"
+                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='webp' %}"
+                    />
+                    <source
+                        type="image/jpg"
+                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='jpg' %}"
+                    />
                 {% elif size == 'large' %}
-                    <source type="image/webp" srcset="{{ book.cover_bw_book_large_webp.url }}"/>
-                    <source type="image/jpg" srcset="{{ book.cover_bw_book_large_jpg.url }}"/>
+                    <source
+                        type="image/webp"
+                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='webp' %}"
+                    />
+                    <source
+                        type="image/jpg"
+                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='jpg' %}"
+                    />
                 {% elif size == 'xlarge' %}
-                    <source type="image/webp" srcset="{{ book.cover_bw_book_xlarge_webp.url }}"/>
-                    <source type="image/jpg" srcset="{{ book.cover_bw_book_xlarge_jpg.url }}"/>
+                    <source
+                        type="image/webp"
+                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='webp' %}"
+                    />
+                    <source
+                        type="image/jpg"
+                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='jpg' %}"
+                    />
                 {% elif size == 'xxlarge' %}
-                    <source type="image/webp" srcset="{{ book.cover_bw_book_xxlarge_webp.url }}"/>
-                    <source type="image/jpg" srcset="{{ book.cover_bw_book_xxlarge_jpg.url }}"/>
+                    <source
+                        type="image/webp"
+                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='webp' %}"
+                    />
+                    <source
+                        type="image/jpg"
+                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='jpg' %}"
+                    />
                 {% endif %}
 
             {% endif %}
 
             <img
+                alt="{{ book.alt_text|default:'' }}"
                 class="book-cover"
                 itemprop="thumbnailUrl"
                 src="{% if img_path is None %}{% get_media_prefix %}{% else %}{{ img_path }}{% endif %}{{ book.cover }}"
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
index 23b6685d6..1be660496 100644
--- a/bookwyrm/templatetags/utilities.py
+++ b/bookwyrm/templatetags/utilities.py
@@ -3,6 +3,7 @@ import os
 from uuid import uuid4
 from django import template
 from django.utils.translation import gettext_lazy as _
+from django.templatetags.static import static
 
 
 register = template.Library()
@@ -50,3 +51,13 @@ def truncatepath(value, arg):
     except ValueError:  # invalid literal for int()
         return path_list[-1]  # Fail silently.
     return "%s/…%s" % (path_list[0], path_list[-1][-length:])
+
+
+@register.simple_tag(takes_context=False)
+def get_book_cover_thumbnail(book, size, ext):
+    """Returns a book thumbnail at the specified size and extension, with fallback if needed"""
+    try:
+        cover_thumbnail = getattr(book, "cover_bw_book_%s_%s" % (size, ext))
+        return cover_thumbnail.url
+    except OSError:
+        return static("images/no_cover.jpg")

From 14bf7fca2e973ebd30ff3f95bd77f3d3fbc287db Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Tue, 3 Aug 2021 18:03:34 +0200
Subject: [PATCH 19/25] Update book_cover.html

---
 bookwyrm/templates/snippets/book_cover.html | 124 ++------------------
 1 file changed, 11 insertions(+), 113 deletions(-)

diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 84303015a..0d618072c 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -18,129 +18,27 @@
 
             {% if enable_thumbnail_generation %}
 
-                {% if size_mobile == 'xsmall' %}
+                {% if size_mobile %}
                     <source
                         media="(max-width: 768px)"
                         type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='webp' %}"
+                        srcset="{% get_book_cover_thumbnail book=book size=size_mobile ext='webp' %}"
                     />
                     <source
                         media="(max-width: 768px)"
                         type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='jpg' %}"
-                    />
-                {% elif size_mobile == 'small' %}
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='webp' %}"
-                    />
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='jpg' %}"
-                    />
-                {% elif size_mobile == 'medium' %}
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='webp' %}"
-                    />
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='jpg' %}"
-                    />
-                {% elif size_mobile == 'large' %}
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='webp' %}"
-                    />
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='jpg' %}"
-                    />
-                {% elif size_mobile == 'xlarge' %}
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='webp' %}"
-                    />
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='jpg' %}"
-                    />
-                {% elif size_mobile == 'xxlarge' %}
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='webp' %}"
-                    />
-                    <source
-                        media="(max-width: 768px)"
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='jpg' %}"
+                        srcset="{% get_book_cover_thumbnail book=book size=size_mobile ext='jpg' %}"
                     />
                 {% endif %}
 
-                {% if size == 'xsmall' %}
-                    <source
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='webp' %}"
-                    />
-                    <source
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='xsmall' ext='jpg' %}"
-                    />
-                {% elif size == 'small' %}
-                    <source
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='webp' %}"
-                    />
-                    <source
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='small' ext='jpg' %}"
-                    />
-                {% elif size == 'medium' %}
-                    <source
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='webp' %}"
-                    />
-                    <source
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='medium' ext='jpg' %}"
-                    />
-                {% elif size == 'large' %}
-                    <source
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='webp' %}"
-                    />
-                    <source
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='large' ext='jpg' %}"
-                    />
-                {% elif size == 'xlarge' %}
-                    <source
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='webp' %}"
-                    />
-                    <source
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='xlarge' ext='jpg' %}"
-                    />
-                {% elif size == 'xxlarge' %}
-                    <source
-                        type="image/webp"
-                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='webp' %}"
-                    />
-                    <source
-                        type="image/jpg"
-                        srcset="{% get_book_cover_thumbnail book=book size='xxlarge' ext='jpg' %}"
-                    />
-                {% endif %}
+                <source
+                    type="image/webp"
+                    srcset="{% get_book_cover_thumbnail book=book size=size ext='webp' %}"
+                />
+                <source
+                    type="image/jpg"
+                    srcset="{% get_book_cover_thumbnail book=book size=size ext='jpg' %}"
+                />
 
             {% endif %}
 

From f3274098b5b9ed617e4a0047a8c19895b32788f4 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Tue, 3 Aug 2021 18:10:06 +0200
Subject: [PATCH 20/25] Update bw-dev

---
 bw-dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bw-dev b/bw-dev
index 88cf99d95..f607acfd3 100755
--- a/bw-dev
+++ b/bw-dev
@@ -170,8 +170,8 @@ case "$CMD" in
         echo "    clean"
         echo "    black"
         echo "    populate_streams"
-        echo "    generate_preview_images [--all]"
         echo "    generate_thumbnails"
+        echo "    generate_preview_images [--all]"
         echo "    copy_media_to_s3"
         echo "    set_cors_to_s3 [cors file]"
         echo "    runweb [command]"

From 14c606301c5dc2da6063e14aba20c56415636c2f Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 4 Aug 2021 10:28:59 +0200
Subject: [PATCH 21/25] Fixes "I/O Operation on Closed File error"

https://github.com/matthewwithanm/django-imagekit/issues/391#issuecomment-766708283
---
 bookwyrm/storage_backends.py | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/bookwyrm/storage_backends.py b/bookwyrm/storage_backends.py
index e10dfb841..237d164b0 100644
--- a/bookwyrm/storage_backends.py
+++ b/bookwyrm/storage_backends.py
@@ -1,4 +1,6 @@
 """Handles backends for storages"""
+import os
+from tempfile import SpooledTemporaryFile
 from storages.backends.s3boto3 import S3Boto3Storage
 
 
@@ -15,3 +17,33 @@ class ImagesStorage(S3Boto3Storage):  # pylint: disable=abstract-method
     location = "images"
     default_acl = "public-read"
     file_overwrite = False
+
+    """
+    This is our custom version of S3Boto3Storage that fixes a bug in
+    boto3 where the passed in file is closed upon upload.
+    From:
+    https://github.com/matthewwithanm/django-imagekit/issues/391#issuecomment-275367006
+    https://github.com/boto/boto3/issues/929
+    https://github.com/matthewwithanm/django-imagekit/issues/391
+    """
+
+    def _save(self, name, content):
+        """
+        We create a clone of the content file as when this is passed to
+        boto3 it wrongly closes the file upon upload where as the storage
+        backend expects it to still be open
+        """
+        # Seek our content back to the start
+        content.seek(0, os.SEEK_SET)
+
+        # Create a temporary file that will write to disk after a specified
+        # size. This file will be automatically deleted when closed by
+        # boto3 or after exiting the `with` statement if the boto3 is fixed
+        with SpooledTemporaryFile() as content_autoclose:
+
+            # Write our original content into our copy that will be closed by boto3
+            content_autoclose.write(content.read())
+
+            # Upload the object which will auto close the
+            # content_autoclose instance
+            return super(ImagesStorage, self)._save(name, content_autoclose)
\ No newline at end of file

From 73fd0980683d7927fc5028b5f4de17b44d715c67 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 4 Aug 2021 11:42:18 +0200
Subject: [PATCH 22/25] Better naming of context variable

---
 bookwyrm/context_processors.py              | 2 +-
 bookwyrm/templates/snippets/book_cover.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py
index afda6b260..0610a8b9a 100644
--- a/bookwyrm/context_processors.py
+++ b/bookwyrm/context_processors.py
@@ -11,7 +11,7 @@ def site_settings(request):  # pylint: disable=unused-argument
     return {
         "site": models.SiteSettings.objects.get(),
         "active_announcements": models.Announcement.active_announcements(),
-        "enable_thumbnail_generation": settings.ENABLE_THUMBNAIL_GENERATION,
+        "thumbnail_generation_enabled": settings.ENABLE_THUMBNAIL_GENERATION,
         "media_full_url": settings.MEDIA_FULL_URL,
         "preview_images_enabled": settings.ENABLE_PREVIEW_IMAGES,
         "request_protocol": request_protocol,
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 0d618072c..0f6844822 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -16,7 +16,7 @@
             >
         {% else %}
 
-            {% if enable_thumbnail_generation %}
+            {% if thumbnail_generation_enabled %}
 
                 {% if size_mobile %}
                     <source

From bf3175f8d5a873d0f248ee8d8f8fab3726df59c7 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 4 Aug 2021 11:51:41 +0200
Subject: [PATCH 23/25] lint

---
 bookwyrm/storage_backends.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/storage_backends.py b/bookwyrm/storage_backends.py
index 237d164b0..6e821444e 100644
--- a/bookwyrm/storage_backends.py
+++ b/bookwyrm/storage_backends.py
@@ -46,4 +46,4 @@ class ImagesStorage(S3Boto3Storage):  # pylint: disable=abstract-method
 
             # Upload the object which will auto close the
             # content_autoclose instance
-            return super(ImagesStorage, self)._save(name, content_autoclose)
\ No newline at end of file
+            return super(ImagesStorage, self)._save(name, content_autoclose)

From cd1a1b2e673fdc220a52cc579c94899f70c7e700 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 4 Aug 2021 11:58:53 +0200
Subject: [PATCH 24/25] Fix R1725: Consider using Python 3 style super()
 without arguments

---
 bookwyrm/storage_backends.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/storage_backends.py b/bookwyrm/storage_backends.py
index 6e821444e..4fb0feff0 100644
--- a/bookwyrm/storage_backends.py
+++ b/bookwyrm/storage_backends.py
@@ -46,4 +46,4 @@ class ImagesStorage(S3Boto3Storage):  # pylint: disable=abstract-method
 
             # Upload the object which will auto close the
             # content_autoclose instance
-            return super(ImagesStorage, self)._save(name, content_autoclose)
+            return super()._save(name, content_autoclose)

From 489f97030e67138465aae2548401a77c9e2b042a Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 18 Aug 2021 10:27:17 +0200
Subject: [PATCH 25/25] apply suggested changes

---
 .gitignore                         | 2 +-
 bookwyrm/templatetags/utilities.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 74eebb96b..624ce100c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,4 +29,4 @@
 nginx/default.conf
 
 #macOS
-.DS_Store
+**/.DS_Store
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
index 1be660496..bcb1ec4ec 100644
--- a/bookwyrm/templatetags/utilities.py
+++ b/bookwyrm/templatetags/utilities.py
@@ -54,7 +54,7 @@ def truncatepath(value, arg):
 
 
 @register.simple_tag(takes_context=False)
-def get_book_cover_thumbnail(book, size, ext):
+def get_book_cover_thumbnail(book, size="medium", ext="jpg"):
     """Returns a book thumbnail at the specified size and extension, with fallback if needed"""
     try:
         cover_thumbnail = getattr(book, "cover_bw_book_%s_%s" % (size, ext))