New covers.

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 73a9a0e..cc6b09d 100644 (file)
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -10,7 +10,7 @@ python-slugify==8.0.1
 python-docx==0.8.11
 Wikidata==0.7
 
 python-docx==0.8.11
 Wikidata==0.7
 

-librarian==2.5.1
+librarian==2.6

 
 ## Django
 Django==4.1.9
 
 ## Django
 Django==4.1.9

diff --git a/src/cover/views.py b/src/cover/views.py
index 25663a0..a12dce7 100644 (file)
--- a/src/cover/views.py
+++ b/src/cover/views.py
@@ -32,6 +32,10 @@ def preview(request, book, chunk=None, rev=None):
     If rev is not given, use publishable version.
     """
     chunk = Chunk.get(book, chunk)
     If rev is not given, use publishable version.
     """
     chunk = Chunk.get(book, chunk)

+
+    if chunk.book.cover and rev is None and not request.GET.get('width') and not request.GET.get('height'):
+        return HttpResponseRedirect(chunk.book.cover.url)
+

     if rev is not None:
         try:
             revision = chunk.at_revision(rev)
     if rev is not None:
         try:
             revision = chunk.at_revision(rev)

diff --git a/src/documents/migrations/0009_book_cover.py b/src/documents/migrations/0009_book_cover.py
new file mode 100644 (file)
index 0000000..b74b0f3
--- /dev/null
+++ b/src/documents/migrations/0009_book_cover.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.1.9 on 2023-06-20 09:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("documents", "0008_book_legimi_id"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="book",
+            name="cover",
+            field=models.FileField(blank=True, upload_to=""),
+        ),
+    ]

diff --git a/src/documents/models/book.py b/src/documents/models/book.py
index 23d3344..1b34fb6 100644 (file)
--- a/src/documents/models/book.py
+++ b/src/documents/models/book.py
@@ -2,6 +2,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.apps import apps
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.apps import apps

+from django.core.files.base import ContentFile

 from django.contrib.sites.models import Site
 from django.db import connection, models, transaction
 from django.template.loader import render_to_string
 from django.contrib.sites.models import Site
 from django.db import connection, models, transaction
 from django.template.loader import render_to_string


@@ -9,7 +10,8 @@ from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 from slugify import slugify
 from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 from slugify import slugify

-
+from librarian.cover import make_cover
+from librarian.dcparser import BookInfo

 
 import apiclient
 from documents.helpers import cached_in_field, GalleryMerger
 
 import apiclient
 from documents.helpers import cached_in_field, GalleryMerger


@@ -22,6 +24,7 @@ import os
 import shutil
 import re
 
 import shutil
 import re
 

+

 class Book(models.Model):
     """ A document edited on the wiki """
 
 class Book(models.Model):
     """ A document edited on the wiki """
 


@@ -42,6 +45,7 @@ class Book(models.Model):
     dc_cover_image = models.ForeignKey(Image, blank=True, null=True,
         db_index=True, on_delete=models.SET_NULL, editable=False)
     dc = models.JSONField(null=True, editable=False)
     dc_cover_image = models.ForeignKey(Image, blank=True, null=True,
         db_index=True, on_delete=models.SET_NULL, editable=False)
     dc = models.JSONField(null=True, editable=False)

+    cover = models.FileField(blank=True, upload_to='documents/cover')

     catalogue_book = models.ForeignKey(
         'catalogue.Book',
         models.DO_NOTHING,
     catalogue_book = models.ForeignKey(
         'catalogue.Book',
         models.DO_NOTHING,


@@ -392,6 +396,21 @@ class Book(models.Model):
         }
         Book.objects.filter(pk=self.pk).update(**update)
         self.refresh_dc_cache()
         }
         Book.objects.filter(pk=self.pk).update(**update)
         self.refresh_dc_cache()

+        self.build_cover()
+
+    def build_cover(self):
+        width, height = 216, 300
+        try:
+            xml = self.materialize(publishable=True).encode('utf-8')
+            info = BookInfo.from_bytes(xml)
+            cover = make_cover(info, width=width, height=height)
+            out = BytesIO()
+            ext = cover.ext()
+            cover.save(out)
+            self.cover.save(f'{self.slug}.{ext}', out, save=False)
+            type(self).objects.filter(pk=self.pk).update(cover=self.cover)
+        except:
+            type(self).objects.filter(pk=self.pk).update(cover='')

 
     # Materializing & publishing
     # ==========================
 
     # Materializing & publishing
     # ==========================

diff --git a/src/documents/templates/documents/book_detail.html b/src/documents/templates/documents/book_detail.html
index 5a3734f..ee053d5 100644 (file)
--- a/src/documents/templates/documents/book_detail.html
+++ b/src/documents/templates/documents/book_detail.html
@@ -94,9 +94,9 @@
         Pobierz okładkę:
         <div class="input-group">
           <select class="form-control" name='cover_class'>
         Pobierz okładkę:
         <div class="input-group">
           <select class="form-control" name='cover_class'>

-            <option value="default">tradycyjna</option>
-           <option value="m">nowa</option>
+           <option value="default">nowa</option>

            <option value="m-label">nowa + label</option>
            <option value="m-label">nowa + label</option>

+            <option value="legacy">dawna</option>

           </select><br>
           <input class="form-control" name="width" type="number" required value="600" size="3" placeholder="szer.">
           <input class="form-control" name="height" type="number" size="3" placeholder="wys.">
           </select><br>
           <input class="form-control" name="width" type="number" required value="600" size="3" placeholder="szer.">
           <input class="form-control" name="height" type="number" size="3" placeholder="wys.">