From d1737b44bdad3ad435721c6363dca18ac3e4f94b Mon Sep 17 00:00:00 2001 From: Joachim Date: Tue, 25 May 2021 00:41:53 +0200 Subject: [PATCH 001/130] First functioning commit TODO - [ ] Delay task (Celery?) - [ ] Store the image in a subfolder unique to the edition, to make cleaning up the image easy - [ ] Clean up the image before replacing it - [ ] Ensure that the image will be cleaned when the edition is deleted ?? - [ ] Use instance custom colors? - [ ] Use book cover color base? --- .gitignore | 3 + .../migrations/0076_book_preview_image.py | 21 +++ bookwyrm/models/book.py | 12 ++ bookwyrm/preview_images.py | 133 ++++++++++++++++++ bookwyrm/settings.py | 5 + bookwyrm/static/fonts/public_sans/OFL.txt | 93 ++++++++++++ .../fonts/public_sans/PublicSans-Bold.ttf | Bin 0 -> 56580 bytes .../fonts/public_sans/PublicSans-Light.ttf | Bin 0 -> 56452 bytes .../fonts/public_sans/PublicSans-Regular.ttf | Bin 0 -> 56424 bytes celerywyrm/celery.py | 1 + 10 files changed, 268 insertions(+) create mode 100644 bookwyrm/migrations/0076_book_preview_image.py create mode 100644 bookwyrm/preview_images.py create mode 100644 bookwyrm/static/fonts/public_sans/OFL.txt create mode 100644 bookwyrm/static/fonts/public_sans/PublicSans-Bold.ttf create mode 100644 bookwyrm/static/fonts/public_sans/PublicSans-Light.ttf create mode 100644 bookwyrm/static/fonts/public_sans/PublicSans-Regular.ttf diff --git a/.gitignore b/.gitignore index cf88e9878..624ce100c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,6 @@ #nginx nginx/default.conf + +#macOS +**/.DS_Store diff --git a/bookwyrm/migrations/0076_book_preview_image.py b/bookwyrm/migrations/0076_book_preview_image.py new file mode 100644 index 000000000..070be663f --- /dev/null +++ b/bookwyrm/migrations/0076_book_preview_image.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2 on 2021-05-24 18:03 + +import bookwyrm.models.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0075_announcement"), + ] + + operations = [ + migrations.AddField( + model_name="edition", + name="preview_image", + field=bookwyrm.models.fields.ImageField( + blank=True, null=True, upload_to="previews/" + ), + ), + ] diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 869ff04d2..72f0547bf 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -2,10 +2,13 @@ import re from django.db import models +from django.dispatch import receiver from model_utils.managers import InheritanceManager from bookwyrm import activitypub +from bookwyrm.preview_images import generate_preview_image_task from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE +from bookwyrm.tasks import app from .activitypub_mixin import OrderedCollectionPageMixin, ObjectMixin from .base_model import BookWyrmModel @@ -204,6 +207,9 @@ class Edition(Book): activitypub_field="work", ) edition_rank = fields.IntegerField(default=0) + preview_image = fields.ImageField( + upload_to="previews/", blank=True, null=True, alt_field="alt_text" + ) activity_serializer = activitypub.Edition name_field = "title" @@ -293,3 +299,9 @@ def isbn_13_to_10(isbn_13): if checkdigit == 10: checkdigit = "X" return converted + str(checkdigit) + + +@receiver(models.signals.post_save, sender=Edition) +# pylint: disable=unused-argument +def preview_image(instance, *args, **kwargs): + generate_preview_image_task(instance, *args, **kwargs) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py new file mode 100644 index 000000000..b659f678b --- /dev/null +++ b/bookwyrm/preview_images.py @@ -0,0 +1,133 @@ +import math +import textwrap + +from io import BytesIO +from PIL import Image, ImageDraw, ImageFont, ImageOps +from pathlib import Path +from uuid import uuid4 + +from django.core.files.base import ContentFile +from django.core.files.uploadedfile import InMemoryUploadedFile + +from bookwyrm import models, settings +from bookwyrm.tasks import app + +# dev +import logging + +IMG_WIDTH = settings.PREVIEW_IMG_WIDTH +IMG_HEIGHT = settings.PREVIEW_IMG_HEIGHT +BG_COLOR = (182, 186, 177) +TRANSPARENT_COLOR = (0, 0, 0, 0) +TEXT_COLOR = (16, 16, 16) + +margin = math.ceil(IMG_HEIGHT / 10) +gutter = math.ceil(margin / 2) +cover_img_limits = math.ceil(IMG_HEIGHT * 0.8) +path = Path(__file__).parent.absolute() +font_path = path.joinpath("static/fonts/public_sans") + + +def generate_texts_layer(edition, text_x): + try: + font_title = ImageFont.truetype("%s/PublicSans-Bold.ttf" % font_path, 48) + font_authors = ImageFont.truetype("%s/PublicSans-Regular.ttf" % font_path, 40) + except OSError: + font_title = ImageFont.load_default() + font_authors = ImageFont.load_default() + + text_layer = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=TRANSPARENT_COLOR) + text_layer_draw = ImageDraw.Draw(text_layer) + + text_y = 0 + + text_y = text_y + 6 + + # title + title = textwrap.fill(edition.title, width=28) + text_layer_draw.multiline_text((0, text_y), title, font=font_title, fill=TEXT_COLOR) + + text_y = text_y + font_title.getsize_multiline(title)[1] + 16 + + # subtitle + authors_text = ", ".join(a.name for a in edition.authors.all()) + authors = textwrap.fill(authors_text, width=36) + text_layer_draw.multiline_text( + (0, text_y), authors, font=font_authors, fill=TEXT_COLOR + ) + + imageBox = text_layer.getbbox() + return text_layer.crop(imageBox) + + +def generate_site_layer(text_x): + try: + font_instance = ImageFont.truetype("%s/PublicSans-Light.ttf" % font_path, 28) + except OSError: + font_instance = ImageFont.load_default() + + site = models.SiteSettings.objects.get() + + if site.logo_small: + logo_img = Image.open(site.logo_small) + else: + static_path = path.joinpath("static/images/logo-small.png") + logo_img = Image.open(static_path) + + site_layer = Image.new("RGBA", (IMG_WIDTH - text_x - margin, 50), color=BG_COLOR) + + logo_img.thumbnail((50, 50), Image.ANTIALIAS) + + site_layer.paste(logo_img, (0, 0)) + + site_layer_draw = ImageDraw.Draw(site_layer) + site_layer_draw.text((60, 10), site.name, font=font_instance, fill=TEXT_COLOR) + + return site_layer + + +def generate_preview_image(edition): + img = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=BG_COLOR) + + cover_img_layer = Image.open(edition.cover) + cover_img_layer.thumbnail((cover_img_limits, cover_img_limits), Image.ANTIALIAS) + + text_x = margin + cover_img_layer.width + gutter + + texts_layer = generate_texts_layer(edition, text_x) + text_y = IMG_HEIGHT - margin - texts_layer.height + + site_layer = generate_site_layer(text_x) + + # Composite all layers + img.paste(cover_img_layer, (margin, margin)) + img.alpha_composite(texts_layer, (text_x, text_y)) + img.alpha_composite(site_layer, (text_x, margin)) + + file_name = "%s.png" % str(uuid4()) + + image_buffer = BytesIO() + try: + img.save(image_buffer, format="png") + edition.preview_image = InMemoryUploadedFile( + ContentFile(image_buffer.getvalue()), + "preview_image", + file_name, + "image/png", + image_buffer.tell(), + None, + ) + + edition.save(update_fields=["preview_image"]) + finally: + image_buffer.close() + + +@app.task +def generate_preview_image_task(instance, *args, **kwargs): + """generate preview_image after save""" + updated_fields = kwargs["update_fields"] + + if not updated_fields or "preview_image" not in updated_fields: + logging.warn("image name to delete", instance.preview_image.name) + generate_preview_image(edition=instance) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index d694e33fd..cee07e913 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -37,6 +37,11 @@ LOCALE_PATHS = [ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" +# preview image + +PREVIEW_IMG_WIDTH = 1200 +PREVIEW_IMG_HEIGHT = 630 + # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ diff --git a/bookwyrm/static/fonts/public_sans/OFL.txt b/bookwyrm/static/fonts/public_sans/OFL.txt new file mode 100644 index 000000000..ac793eaaa --- /dev/null +++ b/bookwyrm/static/fonts/public_sans/OFL.txt @@ -0,0 +1,93 @@ +Copyright (c) 2015, Pablo Impallari, Rodrigo Fuenzalida (Modified by Dan O. Williams and USWDS) (https://github.com/uswds/public-sans) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/bookwyrm/static/fonts/public_sans/PublicSans-Bold.ttf b/bookwyrm/static/fonts/public_sans/PublicSans-Bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..3eb5ac24e2b78297531f6ac6c31255a306af980d GIT binary patch literal 56580 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 G6!ZXGvhhCv literal 0 HcmV?d00001 diff --git a/bookwyrm/static/fonts/public_sans/PublicSans-Light.ttf b/bookwyrm/static/fonts/public_sans/PublicSans-Light.ttf new file mode 100644 index 0000000000000000000000000000000000000000..13fd7edbceff6e379e28d7ca78b17822b1753d0c GIT binary patch literal 56452 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 ^BFW47ceehP-k4oxRAjdJbS9kxR`MB|P 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 E0J)!T)c^nh literal 0 HcmV?d00001 diff --git a/celerywyrm/celery.py b/celerywyrm/celery.py index 4af8e281d..1dad55888 100644 --- a/celerywyrm/celery.py +++ b/celerywyrm/celery.py @@ -24,5 +24,6 @@ app.autodiscover_tasks(["bookwyrm"], related_name="broadcast") app.autodiscover_tasks(["bookwyrm"], related_name="connectors.abstract_connector") app.autodiscover_tasks(["bookwyrm"], related_name="emailing") app.autodiscover_tasks(["bookwyrm"], related_name="goodreads_import") +app.autodiscover_tasks(["bookwyrm"], related_name="preview_images") app.autodiscover_tasks(["bookwyrm"], related_name="models.user") app.autodiscover_tasks(["bookwyrm"], related_name="views.inbox") From fa7334826c2df4dec35419ee9c596898f3b40998 Mon Sep 17 00:00:00 2001 From: Joachim Date: Tue, 25 May 2021 23:04:28 +0200 Subject: [PATCH 002/130] Update --- bookwyrm/activitypub/book.py | 1 + .../migrations/0076_book_preview_image.py | 8 +- bookwyrm/models/book.py | 15 +- bookwyrm/preview_images.py | 225 ++++++++++++++---- bookwyrm/settings.py | 6 +- bookwyrm/static/images/icons/star-empty.png | Bin 0 -> 1200 bytes bookwyrm/static/images/icons/star-full.png | Bin 0 -> 923 bytes bookwyrm/static/images/icons/star-half.png | Bin 0 -> 1153 bytes requirements.txt | 1 + 9 files changed, 195 insertions(+), 61 deletions(-) create mode 100755 bookwyrm/static/images/icons/star-empty.png create mode 100755 bookwyrm/static/images/icons/star-full.png create mode 100755 bookwyrm/static/images/icons/star-half.png diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index 1599b408a..ccb4c0ea3 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -37,6 +37,7 @@ class Book(BookData): publishedDate: str = "" cover: Document = None + preview_image: Document = None type: str = "Book" diff --git a/bookwyrm/migrations/0076_book_preview_image.py b/bookwyrm/migrations/0076_book_preview_image.py index 070be663f..c068e2e27 100644 --- a/bookwyrm/migrations/0076_book_preview_image.py +++ b/bookwyrm/migrations/0076_book_preview_image.py @@ -12,10 +12,8 @@ class Migration(migrations.Migration): operations = [ migrations.AddField( - model_name="edition", - name="preview_image", - field=bookwyrm.models.fields.ImageField( - blank=True, null=True, upload_to="previews/" - ), + model_name='book', + name='preview_image', + field=bookwyrm.models.fields.ImageField(blank=True, null=True, upload_to='cover_previews/'), ), ] diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 72f0547bf..af3005606 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -6,7 +6,7 @@ from django.dispatch import receiver from model_utils.managers import InheritanceManager from bookwyrm import activitypub -from bookwyrm.preview_images import generate_preview_image_task +from bookwyrm.preview_images import generate_preview_image_from_edition_task from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE from bookwyrm.tasks import app @@ -85,6 +85,9 @@ class Book(BookDataModel): cover = fields.ImageField( upload_to="covers/", blank=True, null=True, alt_field="alt_text" ) + preview_image = fields.ImageField( + upload_to="cover_previews/", blank=True, null=True, alt_field="alt_text" + ) first_published_date = fields.DateTimeField(blank=True, null=True) published_date = fields.DateTimeField(blank=True, null=True) @@ -207,9 +210,6 @@ class Edition(Book): activitypub_field="work", ) edition_rank = fields.IntegerField(default=0) - preview_image = fields.ImageField( - upload_to="previews/", blank=True, null=True, alt_field="alt_text" - ) activity_serializer = activitypub.Edition name_field = "title" @@ -302,6 +302,7 @@ def isbn_13_to_10(isbn_13): @receiver(models.signals.post_save, sender=Edition) -# pylint: disable=unused-argument -def preview_image(instance, *args, **kwargs): - generate_preview_image_task(instance, *args, **kwargs) +def preview_image(instance, **kwargs): + updated_fields = kwargs["update_fields"] + + generate_preview_image_from_edition_task.delay(instance.id, updated_fields) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index b659f678b..d0da30839 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -1,13 +1,17 @@ +import colorsys import math +import os import textwrap +from colorthief import ColorThief from io import BytesIO -from PIL import Image, ImageDraw, ImageFont, ImageOps +from PIL import Image, ImageDraw, ImageFont, ImageOps, ImageColor from pathlib import Path from uuid import uuid4 from django.core.files.base import ContentFile from django.core.files.uploadedfile import InMemoryUploadedFile +from django.db.models import Avg from bookwyrm import models, settings from bookwyrm.tasks import app @@ -17,54 +21,64 @@ import logging IMG_WIDTH = settings.PREVIEW_IMG_WIDTH IMG_HEIGHT = settings.PREVIEW_IMG_HEIGHT -BG_COLOR = (182, 186, 177) +BG_COLOR = settings.PREVIEW_BG_COLOR +TEXT_COLOR = settings.PREVIEW_TEXT_COLOR +DEFAULT_COVER_COLOR = settings.PREVIEW_DEFAULT_COVER_COLOR TRANSPARENT_COLOR = (0, 0, 0, 0) -TEXT_COLOR = (16, 16, 16) -margin = math.ceil(IMG_HEIGHT / 10) -gutter = math.ceil(margin / 2) -cover_img_limits = math.ceil(IMG_HEIGHT * 0.8) +margin = math.floor(IMG_HEIGHT / 10) +gutter = math.floor(margin / 2) +cover_img_limits = math.floor(IMG_HEIGHT * 0.8) path = Path(__file__).parent.absolute() -font_path = path.joinpath("static/fonts/public_sans") +font_dir = path.joinpath("static/fonts/public_sans") +icon_font_dir = path.joinpath("static/css/fonts") +def get_font(font_name, size=28): + if font_name == "light": + font_path = "%s/PublicSans-Light.ttf" % font_dir + if font_name == "regular": + font_path = "%s/PublicSans-Regular.ttf" % font_dir + elif font_name == "bold": + font_path = "%s/PublicSans-Bold.ttf" % font_dir + elif font_name == "icomoon": + font_path = "%s/icomoon.ttf" % icon_font_dir -def generate_texts_layer(edition, text_x): try: - font_title = ImageFont.truetype("%s/PublicSans-Bold.ttf" % font_path, 48) - font_authors = ImageFont.truetype("%s/PublicSans-Regular.ttf" % font_path, 40) + font = ImageFont.truetype(font_path, size) except OSError: - font_title = ImageFont.load_default() - font_authors = ImageFont.load_default() + font = ImageFont.load_default() - text_layer = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=TRANSPARENT_COLOR) + return font + + +def generate_texts_layer(book, content_width): + font_title = get_font("bold", size=48) + font_authors = get_font("regular", size=40) + + text_layer = Image.new("RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR) text_layer_draw = ImageDraw.Draw(text_layer) text_y = 0 - text_y = text_y + 6 - # title - title = textwrap.fill(edition.title, width=28) + title = textwrap.fill(book.title, width=28) text_layer_draw.multiline_text((0, text_y), title, font=font_title, fill=TEXT_COLOR) text_y = text_y + font_title.getsize_multiline(title)[1] + 16 # subtitle - authors_text = ", ".join(a.name for a in edition.authors.all()) + authors_text = book.author_text authors = textwrap.fill(authors_text, width=36) text_layer_draw.multiline_text( (0, text_y), authors, font=font_authors, fill=TEXT_COLOR ) - imageBox = text_layer.getbbox() - return text_layer.crop(imageBox) + text_layer_box = text_layer.getbbox() + return text_layer.crop(text_layer_box) -def generate_site_layer(text_x): - try: - font_instance = ImageFont.truetype("%s/PublicSans-Light.ttf" % font_path, 28) - except OSError: - font_instance = ImageFont.load_default() +def generate_instance_layer(content_width): + font_instance = get_font("light", size=28) site = models.SiteSettings.objects.get() @@ -74,42 +88,157 @@ def generate_site_layer(text_x): static_path = path.joinpath("static/images/logo-small.png") logo_img = Image.open(static_path) - site_layer = Image.new("RGBA", (IMG_WIDTH - text_x - margin, 50), color=BG_COLOR) + instance_layer = Image.new("RGBA", (content_width, 62), color=TRANSPARENT_COLOR) logo_img.thumbnail((50, 50), Image.ANTIALIAS) - site_layer.paste(logo_img, (0, 0)) + instance_layer.paste(logo_img, (0, 0)) - site_layer_draw = ImageDraw.Draw(site_layer) - site_layer_draw.text((60, 10), site.name, font=font_instance, fill=TEXT_COLOR) + instance_layer_draw = ImageDraw.Draw(instance_layer) + instance_layer_draw.text((60, 10), site.name, font=font_instance, fill=TEXT_COLOR) - return site_layer + line_width = 50 + 10 + font_instance.getsize(site.name)[0] + + line_layer = Image.new("RGBA", (line_width, 2), color=(*(ImageColor.getrgb(TEXT_COLOR)), 50)) + instance_layer.alpha_composite(line_layer, (0, 60)) + + return instance_layer -def generate_preview_image(edition): - img = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=BG_COLOR) +def generate_rating_layer(rating, content_width): + font_icons = get_font("icomoon", size=60) - cover_img_layer = Image.open(edition.cover) - cover_img_layer.thumbnail((cover_img_limits, cover_img_limits), Image.ANTIALIAS) + icon_star_full = Image.open(path.joinpath("static/images/icons/star-full.png")) + icon_star_empty = Image.open(path.joinpath("static/images/icons/star-empty.png")) + icon_star_half = Image.open(path.joinpath("static/images/icons/star-half.png")) - text_x = margin + cover_img_layer.width + gutter + icon_size = 64 + icon_margin = 10 - texts_layer = generate_texts_layer(edition, text_x) - text_y = IMG_HEIGHT - margin - texts_layer.height + rating_layer_base = Image.new("RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR) + rating_layer_color = Image.new("RGBA", (content_width, icon_size), color=TEXT_COLOR) + rating_layer_mask = Image.new("RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR) - site_layer = generate_site_layer(text_x) + position_x = 0 - # Composite all layers - img.paste(cover_img_layer, (margin, margin)) - img.alpha_composite(texts_layer, (text_x, text_y)) - img.alpha_composite(site_layer, (text_x, margin)) + for r in range(math.floor(rating)): + rating_layer_mask.alpha_composite(icon_star_full, (position_x, 0)) + position_x = position_x + icon_size + icon_margin + + if math.floor(rating) != math.ceil(rating): + rating_layer_mask.alpha_composite(icon_star_half, (position_x, 0)) + position_x = position_x + icon_size + icon_margin + + for r in range(5 - math.ceil(rating)): + rating_layer_mask.alpha_composite(icon_star_empty, (position_x, 0)) + position_x = position_x + icon_size + icon_margin + + rating_layer_mask = rating_layer_mask.getchannel("A") + rating_layer_mask = ImageOps.invert(rating_layer_mask) + + rating_layer_composite = Image.composite(rating_layer_base, rating_layer_color, rating_layer_mask) + + return rating_layer_composite + + +def generate_default_cover(): + font_cover = get_font("light", size=28) + + cover_width = math.floor(cover_img_limits * .7) + default_cover = Image.new("RGB", (cover_width, cover_img_limits), color=DEFAULT_COVER_COLOR) + default_cover_draw = ImageDraw.Draw(default_cover) + + text = "no cover :(" + text_dimensions = font_cover.getsize(text) + text_coords = (math.floor((cover_width - text_dimensions[0]) / 2), + math.floor((cover_img_limits - text_dimensions[1]) / 2)) + default_cover_draw.text(text_coords, text, font=font_cover, fill='white') + + return default_cover + + +def generate_preview_image(book_id, rating=None): + book = models.Book.objects.select_subclasses().get(id=book_id) + + rating = models.Review.objects.filter( + privacy="public", + deleted=False, + book__in=[book_id], + ).aggregate(Avg("rating"))["rating__avg"] + + # Cover + try: + cover_img_layer = Image.open(book.cover) + cover_img_layer.thumbnail((cover_img_limits, cover_img_limits), Image.ANTIALIAS) + color_thief = ColorThief(book.cover) + dominant_color = color_thief.get_color(quality=1) + except: + cover_img_layer = generate_default_cover() + dominant_color = ImageColor.getrgb(DEFAULT_COVER_COLOR) + + # Color + if BG_COLOR == 'use_dominant_color': + image_bg_color = "rgb(%s, %s, %s)" % dominant_color + # Lighten color + image_bg_color_rgb = [x/255.0 for x in ImageColor.getrgb(image_bg_color)] + image_bg_color_hls = colorsys.rgb_to_hls(*image_bg_color_rgb) + image_bg_color_hls = (image_bg_color_hls[0], 0.9, image_bg_color_hls[1]) + image_bg_color = tuple([math.ceil(x * 255) for x in colorsys.hls_to_rgb(*image_bg_color_hls)]) + else: + image_bg_color = BG_COLOR + + # Background (using the color) + img = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=image_bg_color) + + # Contents + content_x = margin + cover_img_layer.width + gutter + content_width = IMG_WIDTH - content_x - margin + + instance_layer = generate_instance_layer(content_width) + texts_layer = generate_texts_layer(book, content_width) + + contents_layer = Image.new("RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR) + contents_composite_y = 0 + contents_layer.alpha_composite(instance_layer, (0, contents_composite_y)) + contents_composite_y = contents_composite_y + instance_layer.height + gutter + contents_layer.alpha_composite(texts_layer, (0, contents_composite_y)) + contents_composite_y = contents_composite_y + texts_layer.height + 30 + + if rating: + # Add some more margin + contents_composite_y = contents_composite_y + 30 + rating_layer = generate_rating_layer(rating, content_width) + contents_layer.alpha_composite(rating_layer, (0, contents_composite_y)) + contents_composite_y = contents_composite_y + rating_layer.height + 30 + + contents_layer_box = contents_layer.getbbox() + contents_layer_height = contents_layer_box[3] - contents_layer_box[1] + + contents_y = math.floor((IMG_HEIGHT - contents_layer_height) / 2) + # Remove Instance Layer from centering calculations + contents_y = contents_y - math.floor((instance_layer.height + gutter) / 2) + + if contents_y < margin: + contents_y = margin + + cover_y = math.floor((IMG_HEIGHT - cover_img_layer.height) / 2) + + # Composite layers + img.paste(cover_img_layer, (margin, cover_y)) + img.alpha_composite(contents_layer, (content_x, contents_y)) file_name = "%s.png" % str(uuid4()) image_buffer = BytesIO() try: + try: + old_path = book.preview_image.path + except ValueError: + old_path = '' + + # Save img.save(image_buffer, format="png") - edition.preview_image = InMemoryUploadedFile( + book.preview_image = InMemoryUploadedFile( ContentFile(image_buffer.getvalue()), "preview_image", file_name, @@ -117,17 +246,17 @@ def generate_preview_image(edition): image_buffer.tell(), None, ) + book.save(update_fields=["preview_image"]) - edition.save(update_fields=["preview_image"]) + # Clean up old file after saving + if os.path.exists(old_path): + os.remove(old_path) finally: image_buffer.close() @app.task -def generate_preview_image_task(instance, *args, **kwargs): +def generate_preview_image_from_edition_task(book_id, updated_fields=None): """generate preview_image after save""" - updated_fields = kwargs["update_fields"] - if not updated_fields or "preview_image" not in updated_fields: - logging.warn("image name to delete", instance.preview_image.name) - generate_preview_image(edition=instance) + generate_preview_image(book_id=book_id) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index cee07e913..cef11630e 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -37,10 +37,14 @@ LOCALE_PATHS = [ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" -# preview image +# Preview image +# Specify RGB tuple or RGB hex strings, or 'use_dominant_color' +PREVIEW_BG_COLOR = 'use_dominant_color' PREVIEW_IMG_WIDTH = 1200 PREVIEW_IMG_HEIGHT = 630 +PREVIEW_TEXT_COLOR = '#363636' +PREVIEW_DEFAULT_COVER_COLOR = '#002549' # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ diff --git a/bookwyrm/static/images/icons/star-empty.png b/bookwyrm/static/images/icons/star-empty.png new file mode 100755 index 0000000000000000000000000000000000000000..896417ef69cb053e349720a11b12d7900154011b GIT binary patch literal 1200 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE1T%)!f9)M#Wl!|>+1fOdA?TL+f8#B3GxAuC8JBEXKa*jt z{>G+AhN4^j)s3oQ2HXyQzoY&K3+iobl4S6@6~4c}x;b-W0$anRZ=p9-!wjSx)_$8F zc`$=v>#g`SR%OO5S@oTwJq!irPfDV0?|8iU)#KuqPt?V^8BWQ>f6o!$%MfycUFlHU z&z^#9M|;2DDta~f6vxMyB|dcxj2HalETS0%o}~%!DGF{=N%6DXdh31{>(;Jt3kOEN z33Y4<)1NUMs8wE)wWaLftk+Rn)_;EJ)Ss=Eze8=?jA9Fh6`6t3*LD=V-0m>X)N5b< z^#ix=v8>+x_^!jleZi%TavU5h>sF{OPuuZ)-_^ez=C3CG`F6Lm*^^mjLbhds`r^z3p8GgLGp!Phk2~OOAZk7I6hPo?VBRrzK5)R?4@Y^~GO@AE{<8Ith!F-Cms)id&m$^t&Q? zFGI(X_?{&uzDGI)ndO(C>^#1A+JbcRtK14tC&x-@26#utggdO@)R zb7oZESy$b6o3HvcYs1RoWh)*Rd$=xcNxv6+{S9lv{69Ts7`U#cHLWxEs$%?Oy6WAh z<6fIRQ<=8QypwKTdAsAzBu0zP-SJahCz~oy<&3(vcY_;$LkQc7nf|QL|5bdDX=n&z zPBK5e`euQj_BHWLmu+&r6J=LCGI$uXOyQ8R{>GHmI~axh*Ou%scI0okl@X)7qcw&p zaCh0orBw_8Ovh*WWHQR%zf_Ug+_2!<0i{QYuld&%@6CP38nEg_#j@jS+hdrfU$kiW ze_Sp1V8W*}-xX^%Mzg+RozQ)RBT(7m`i=0%f?fNsH!#Hcvsp2GWAb>KMySJdpg zoMrp<>kS@jpT2V1%Mess=~wWJd0qa`=@KzKC;r?xUb3?^CUk{(L+_!LzAGPaynlN= z+F{2p0eyzqj5-WPPW=zc>{t`ym-ntOPG#a}P}==(_w2hGfl|TiS3dL7H27+pZCwBE z?8IlAIY5CSp}V7XBJ;&N!W9fhTsi987p$^t|GuL3vD_xUb<5I)&Z=%?Z`k*ry(2Ka ze(jtMUZu9TQ*zHeWo-D_`{`rY!Qgclx0v%c-1CiF`TIX(bh+vKlw%W87#J8BJYD@< J);T3K0RVl4ACdq7 literal 0 HcmV?d00001 diff --git a/bookwyrm/static/images/icons/star-full.png b/bookwyrm/static/images/icons/star-full.png new file mode 100755 index 0000000000000000000000000000000000000000..6d78caf0ce9ad2db1df3df5c9dd9b35efb447606 GIT binary patch literal 923 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEv zekel-7?wD&7l<-IpzMW%j;sz~Xz>16lF_|CH~c%_Jh9naym@Mj5xRNe<%~hwBY-G^`qMvO*)&VF}(OH&Urwa!FSODQHIa|4A}2* z^w%@2Ww2rXU?p6`_n_9KC5*x1TYhR%Jwt*XN3Je|4daJAr_>6OEer}7R2xk9?5`BbVSJ$1ke!)1d;O0qQ{}F6u>4{_5dKvy`ELk=+9yVaysQtl zN7t!Vcq%u3aFw{@^?S*onamD`=94YDmfY}|=q<3!&fKEK$)e?pF{AZMXNK>_6Q2cM zZJ76)SNWL`ALE*tYpTTT({AtNZCuUqu;_l`3}%aC_RDzonfqV6aoX#XhU&S=v59HL zYW&kSDw}mJU;KairHxtzAsp(DUOrrDRAIug_|bEQ51SV|%n;en@_<7i?dWud8^$fJ zAD1$G<5=iX!`oo%s38{5oxm@!P+RhY@&iizd2W5RZRH)Am^iZGQ;<*NpX3r#U1#6bFBN! z631|Oao$>{gQZ8#aW_1jP~D|_`+3Me73n<;*D5|KOWM77Vio>`^~3e-zg~Y+Ws8oB zl!1I1rmty)Xb)}F7Lxs<=x_8s0KPk3aiEBig)S0(m zdfYiXJe-O3Km_ZJsET#vTrQ=m0Sr9mju!7`tmyjwFr1G&?_}YMoAX@0PKjVV@GDm? z!RXCGL#>w**8UMWlbISGZI^m{w9P*zB6l{^f$WsmdK II;Vst0E!=ulK=n! literal 0 HcmV?d00001 diff --git a/bookwyrm/static/images/icons/star-half.png b/bookwyrm/static/images/icons/star-half.png new file mode 100755 index 0000000000000000000000000000000000000000..75e4eadc6ecb530f833d50cb879761ac5716ab85 GIT binary patch literal 1153 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE zUCV)W1%v1UX4wMK1xz6gTo)So0vJJp4L|cH&Atcj<;9A88*KA70C=jH{YJKSLmDTG$*Q>zTFa4%wb<64)pKq=-Cs~|(vMElblj&Lh6yor=AKX0V-v1u{mmNoHA58gkF zD==x8_SLkZK;J^hp&!CvI`DSN<;>jDd3}mT4CbpLCicSIpLavby)l>JpyXH7~{&T`dN}4W2)38DhGd47eL2 ze~L9|a2PY}nDU-cfH6^|A^K+=gS)c?qrs9rtOq6v>|tn|x}C{_tBL(U*i)~|&J!=+ zHL6xy{%1+Vr)djzWo$gPVdAE@zwHlnC|fr~YJSUN5|><*X|lalcS++V6u;%B+;iUsS&o+qOUQ zc*LgkD@F(Z?m2$_b5mqyfg77f>c)l(^PZn$QI-o>eQFKch3~=-E8o9%D{S8W;i?vY zxtau{fiiOrV|L?=X`F5h0Zh*?-&;KGKC|Q6M)xVs*X0?C=bC+InsJf&!fs)Ai8cQ( zEj1O0kz0CyDfiYNk6&@_VaS@e<2rYMOzM}56;mGluXgyrH@7in<^k>n)4HP>wuxLn z|Ft3ExO@G-ya-hJHH_cG{6Hk=Q Date: Tue, 25 May 2021 23:05:38 +0200 Subject: [PATCH 003/130] Thank you Black --- .../migrations/0076_book_preview_image.py | 8 ++- bookwyrm/preview_images.py | 59 ++++++++++++------- bookwyrm/settings.py | 6 +- 3 files changed, 46 insertions(+), 27 deletions(-) diff --git a/bookwyrm/migrations/0076_book_preview_image.py b/bookwyrm/migrations/0076_book_preview_image.py index c068e2e27..bc756f898 100644 --- a/bookwyrm/migrations/0076_book_preview_image.py +++ b/bookwyrm/migrations/0076_book_preview_image.py @@ -12,8 +12,10 @@ class Migration(migrations.Migration): operations = [ migrations.AddField( - model_name='book', - name='preview_image', - field=bookwyrm.models.fields.ImageField(blank=True, null=True, upload_to='cover_previews/'), + model_name="book", + name="preview_image", + field=bookwyrm.models.fields.ImageField( + blank=True, null=True, upload_to="cover_previews/" + ), ), ] diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index d0da30839..960762701 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -33,6 +33,7 @@ path = Path(__file__).parent.absolute() font_dir = path.joinpath("static/fonts/public_sans") icon_font_dir = path.joinpath("static/css/fonts") + def get_font(font_name, size=28): if font_name == "light": font_path = "%s/PublicSans-Light.ttf" % font_dir @@ -99,7 +100,9 @@ def generate_instance_layer(content_width): line_width = 50 + 10 + font_instance.getsize(site.name)[0] - line_layer = Image.new("RGBA", (line_width, 2), color=(*(ImageColor.getrgb(TEXT_COLOR)), 50)) + line_layer = Image.new( + "RGBA", (line_width, 2), color=(*(ImageColor.getrgb(TEXT_COLOR)), 50) + ) instance_layer.alpha_composite(line_layer, (0, 60)) return instance_layer @@ -115,9 +118,13 @@ def generate_rating_layer(rating, content_width): icon_size = 64 icon_margin = 10 - rating_layer_base = Image.new("RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR) + rating_layer_base = Image.new( + "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR + ) rating_layer_color = Image.new("RGBA", (content_width, icon_size), color=TEXT_COLOR) - rating_layer_mask = Image.new("RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR) + rating_layer_mask = Image.new( + "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR + ) position_x = 0 @@ -136,7 +143,9 @@ def generate_rating_layer(rating, content_width): rating_layer_mask = rating_layer_mask.getchannel("A") rating_layer_mask = ImageOps.invert(rating_layer_mask) - rating_layer_composite = Image.composite(rating_layer_base, rating_layer_color, rating_layer_mask) + rating_layer_composite = Image.composite( + rating_layer_base, rating_layer_color, rating_layer_mask + ) return rating_layer_composite @@ -144,15 +153,19 @@ def generate_rating_layer(rating, content_width): def generate_default_cover(): font_cover = get_font("light", size=28) - cover_width = math.floor(cover_img_limits * .7) - default_cover = Image.new("RGB", (cover_width, cover_img_limits), color=DEFAULT_COVER_COLOR) + cover_width = math.floor(cover_img_limits * 0.7) + default_cover = Image.new( + "RGB", (cover_width, cover_img_limits), color=DEFAULT_COVER_COLOR + ) default_cover_draw = ImageDraw.Draw(default_cover) text = "no cover :(" text_dimensions = font_cover.getsize(text) - text_coords = (math.floor((cover_width - text_dimensions[0]) / 2), - math.floor((cover_img_limits - text_dimensions[1]) / 2)) - default_cover_draw.text(text_coords, text, font=font_cover, fill='white') + text_coords = ( + math.floor((cover_width - text_dimensions[0]) / 2), + math.floor((cover_img_limits - text_dimensions[1]) / 2), + ) + default_cover_draw.text(text_coords, text, font=font_cover, fill="white") return default_cover @@ -168,22 +181,24 @@ def generate_preview_image(book_id, rating=None): # Cover try: - cover_img_layer = Image.open(book.cover) - cover_img_layer.thumbnail((cover_img_limits, cover_img_limits), Image.ANTIALIAS) - color_thief = ColorThief(book.cover) - dominant_color = color_thief.get_color(quality=1) + cover_img_layer = Image.open(book.cover) + cover_img_layer.thumbnail((cover_img_limits, cover_img_limits), Image.ANTIALIAS) + color_thief = ColorThief(book.cover) + dominant_color = color_thief.get_color(quality=1) except: - cover_img_layer = generate_default_cover() - dominant_color = ImageColor.getrgb(DEFAULT_COVER_COLOR) + cover_img_layer = generate_default_cover() + dominant_color = ImageColor.getrgb(DEFAULT_COVER_COLOR) # Color - if BG_COLOR == 'use_dominant_color': + if BG_COLOR == "use_dominant_color": image_bg_color = "rgb(%s, %s, %s)" % dominant_color # Lighten color - image_bg_color_rgb = [x/255.0 for x in ImageColor.getrgb(image_bg_color)] + image_bg_color_rgb = [x / 255.0 for x in ImageColor.getrgb(image_bg_color)] image_bg_color_hls = colorsys.rgb_to_hls(*image_bg_color_rgb) image_bg_color_hls = (image_bg_color_hls[0], 0.9, image_bg_color_hls[1]) - image_bg_color = tuple([math.ceil(x * 255) for x in colorsys.hls_to_rgb(*image_bg_color_hls)]) + image_bg_color = tuple( + [math.ceil(x * 255) for x in colorsys.hls_to_rgb(*image_bg_color_hls)] + ) else: image_bg_color = BG_COLOR @@ -197,7 +212,9 @@ def generate_preview_image(book_id, rating=None): instance_layer = generate_instance_layer(content_width) texts_layer = generate_texts_layer(book, content_width) - contents_layer = Image.new("RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR) + contents_layer = Image.new( + "RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR + ) contents_composite_y = 0 contents_layer.alpha_composite(instance_layer, (0, contents_composite_y)) contents_composite_y = contents_composite_y + instance_layer.height + gutter @@ -217,7 +234,7 @@ def generate_preview_image(book_id, rating=None): contents_y = math.floor((IMG_HEIGHT - contents_layer_height) / 2) # Remove Instance Layer from centering calculations contents_y = contents_y - math.floor((instance_layer.height + gutter) / 2) - + if contents_y < margin: contents_y = margin @@ -234,7 +251,7 @@ def generate_preview_image(book_id, rating=None): try: old_path = book.preview_image.path except ValueError: - old_path = '' + old_path = "" # Save img.save(image_buffer, format="png") diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index cef11630e..db15be468 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -40,11 +40,11 @@ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" # Preview image # Specify RGB tuple or RGB hex strings, or 'use_dominant_color' -PREVIEW_BG_COLOR = 'use_dominant_color' +PREVIEW_BG_COLOR = "use_dominant_color" PREVIEW_IMG_WIDTH = 1200 PREVIEW_IMG_HEIGHT = 630 -PREVIEW_TEXT_COLOR = '#363636' -PREVIEW_DEFAULT_COVER_COLOR = '#002549' +PREVIEW_TEXT_COLOR = "#363636" +PREVIEW_DEFAULT_COVER_COLOR = "#002549" # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ From e305c5d73d42aea0ed51d2053d3766d697fe26c0 Mon Sep 17 00:00:00 2001 From: Joachim Date: Tue, 25 May 2021 23:12:54 +0200 Subject: [PATCH 004/130] Fix color --- bookwyrm/preview_images.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 960762701..6372aa540 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -195,7 +195,7 @@ def generate_preview_image(book_id, rating=None): # Lighten color image_bg_color_rgb = [x / 255.0 for x in ImageColor.getrgb(image_bg_color)] image_bg_color_hls = colorsys.rgb_to_hls(*image_bg_color_rgb) - image_bg_color_hls = (image_bg_color_hls[0], 0.9, image_bg_color_hls[1]) + image_bg_color_hls = (image_bg_color_hls[0], 0.9, image_bg_color_hls[2]) image_bg_color = tuple( [math.ceil(x * 255) for x in colorsys.hls_to_rgb(*image_bg_color_hls)] ) From 5b03934ec3e243043906dfbd8b1e5b24acf5bebb Mon Sep 17 00:00:00 2001 From: Joachim Date: Tue, 25 May 2021 23:16:33 +0200 Subject: [PATCH 005/130] Update preview_images.py --- bookwyrm/preview_images.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 6372aa540..31b2dc279 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -195,7 +195,11 @@ def generate_preview_image(book_id, rating=None): # Lighten color image_bg_color_rgb = [x / 255.0 for x in ImageColor.getrgb(image_bg_color)] image_bg_color_hls = colorsys.rgb_to_hls(*image_bg_color_rgb) - image_bg_color_hls = (image_bg_color_hls[0], 0.9, image_bg_color_hls[2]) + image_bg_color_hls = ( + image_bg_color_hls[0], + max(0.9, image_bg_color_hls[1]), + image_bg_color_hls[2], + ) image_bg_color = tuple( [math.ceil(x * 255) for x in colorsys.hls_to_rgb(*image_bg_color_hls)] ) From 8c25272462ccaa440d2e99e13bd22e844ce73082 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 09:09:13 +0200 Subject: [PATCH 006/130] Fix last night's bugs --- bookwyrm/activitypub/book.py | 1 - bookwyrm/migrations/0076_book_preview_image.py | 4 +--- bookwyrm/models/book.py | 10 ++++++---- bookwyrm/preview_images.py | 7 +++---- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index ccb4c0ea3..1599b408a 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -37,7 +37,6 @@ class Book(BookData): publishedDate: str = "" cover: Document = None - preview_image: Document = None type: str = "Book" diff --git a/bookwyrm/migrations/0076_book_preview_image.py b/bookwyrm/migrations/0076_book_preview_image.py index bc756f898..01ff6576c 100644 --- a/bookwyrm/migrations/0076_book_preview_image.py +++ b/bookwyrm/migrations/0076_book_preview_image.py @@ -14,8 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name="book", name="preview_image", - field=bookwyrm.models.fields.ImageField( - blank=True, null=True, upload_to="cover_previews/" - ), + field=models.ImageField(blank=True, null=True, upload_to="cover_previews/"), ), ] diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index af3005606..5298af929 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -85,8 +85,8 @@ class Book(BookDataModel): cover = fields.ImageField( upload_to="covers/", blank=True, null=True, alt_field="alt_text" ) - preview_image = fields.ImageField( - upload_to="cover_previews/", blank=True, null=True, alt_field="alt_text" + preview_image = models.ImageField( + upload_to="cover_previews/", blank=True, null=True ) first_published_date = fields.DateTimeField(blank=True, null=True) published_date = fields.DateTimeField(blank=True, null=True) @@ -302,7 +302,9 @@ def isbn_13_to_10(isbn_13): @receiver(models.signals.post_save, sender=Edition) -def preview_image(instance, **kwargs): +# pylint: disable=unused-argument +def preview_image(instance, *args, **kwargs): updated_fields = kwargs["update_fields"] - generate_preview_image_from_edition_task.delay(instance.id, updated_fields) + if not updated_fields or "preview_image" not in updated_fields: + generate_preview_image_from_edition_task.delay(instance.id) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 31b2dc279..dd4a62141 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -277,7 +277,6 @@ def generate_preview_image(book_id, rating=None): @app.task -def generate_preview_image_from_edition_task(book_id, updated_fields=None): - """generate preview_image after save""" - if not updated_fields or "preview_image" not in updated_fields: - generate_preview_image(book_id=book_id) +def generate_preview_image_from_edition_task(book_id): + """generate preview_image""" + generate_preview_image(book_id=book_id) From a83aa47c9aded79242bc9fa606faf16c0d3a5410 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 09:10:05 +0200 Subject: [PATCH 007/130] Generate on new rating --- bookwyrm/models/status.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index bd21ec563..987261e46 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -5,11 +5,13 @@ import re from django.apps import apps from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models +from django.dispatch import receiver from django.template.loader import get_template from django.utils import timezone from model_utils.managers import InheritanceManager from bookwyrm import activitypub +from bookwyrm.preview_images import generate_preview_image_from_edition_task from .activitypub_mixin import ActivitypubMixin, ActivityMixin from .activitypub_mixin import OrderedCollectionPageMixin from .base_model import BookWyrmModel @@ -398,3 +400,11 @@ class Boost(ActivityMixin, Status): # This constraint can't work as it would cross tables. # class Meta: # unique_together = ('user', 'boosted_status') + + +@receiver(models.signals.post_save) +# pylint: disable=unused-argument +def preview_image(instance, sender, *args, **kwargs): + if sender in (Review, ReviewRating): + edition = instance.book + generate_preview_image_from_edition_task.delay(edition.id) From fd82567cbf28dadf3e784d92de0d3a48c103ba90 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 09:16:15 +0200 Subject: [PATCH 008/130] Update 0076_book_preview_image.py --- bookwyrm/migrations/0076_book_preview_image.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bookwyrm/migrations/0076_book_preview_image.py b/bookwyrm/migrations/0076_book_preview_image.py index 01ff6576c..5db550507 100644 --- a/bookwyrm/migrations/0076_book_preview_image.py +++ b/bookwyrm/migrations/0076_book_preview_image.py @@ -1,7 +1,6 @@ # Generated by Django 3.2 on 2021-05-24 18:03 -import bookwyrm.models.fields -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): From 101ca0ff81ee4410e7fd56fb509197d75db162fa Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 09:44:32 +0200 Subject: [PATCH 009/130] Refactor some --- bookwyrm/models/book.py | 4 +- bookwyrm/models/status.py | 4 +- bookwyrm/preview_images.py | 99 +++++++++++++++++++++++--------------- 3 files changed, 65 insertions(+), 42 deletions(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 5298af929..01dfbba72 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -6,7 +6,7 @@ from django.dispatch import receiver from model_utils.managers import InheritanceManager from bookwyrm import activitypub -from bookwyrm.preview_images import generate_preview_image_from_edition_task +from bookwyrm.preview_images import generate_edition_preview_image_task from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE from bookwyrm.tasks import app @@ -307,4 +307,4 @@ def preview_image(instance, *args, **kwargs): updated_fields = kwargs["update_fields"] if not updated_fields or "preview_image" not in updated_fields: - generate_preview_image_from_edition_task.delay(instance.id) + generate_edition_preview_image_task.delay(instance.id) diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index 987261e46..c55cd8d69 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -11,7 +11,7 @@ from django.utils import timezone from model_utils.managers import InheritanceManager from bookwyrm import activitypub -from bookwyrm.preview_images import generate_preview_image_from_edition_task +from bookwyrm.preview_images import generate_edition_preview_image_task from .activitypub_mixin import ActivitypubMixin, ActivityMixin from .activitypub_mixin import OrderedCollectionPageMixin from .base_model import BookWyrmModel @@ -407,4 +407,4 @@ class Boost(ActivityMixin, Status): def preview_image(instance, sender, *args, **kwargs): if sender in (Review, ReviewRating): edition = instance.book - generate_preview_image_from_edition_task.delay(edition.id) + generate_edition_preview_image_task.delay(edition.id) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index dd4a62141..82e8dc798 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -31,7 +31,6 @@ gutter = math.floor(margin / 2) cover_img_limits = math.floor(IMG_HEIGHT * 0.8) path = Path(__file__).parent.absolute() font_dir = path.joinpath("static/fonts/public_sans") -icon_font_dir = path.joinpath("static/css/fonts") def get_font(font_name, size=28): @@ -41,8 +40,6 @@ def get_font(font_name, size=28): font_path = "%s/PublicSans-Regular.ttf" % font_dir elif font_name == "bold": font_path = "%s/PublicSans-Bold.ttf" % font_dir - elif font_name == "icomoon": - font_path = "%s/icomoon.ttf" % icon_font_dir try: font = ImageFont.truetype(font_path, size) @@ -52,27 +49,44 @@ def get_font(font_name, size=28): return font -def generate_texts_layer(book, content_width): - font_title = get_font("bold", size=48) - font_authors = get_font("regular", size=40) +def generate_texts_layer(texts, content_width): + font_text_zero = get_font("bold", size=20) + font_text_one = get_font("bold", size=48) + font_text_two = get_font("bold", size=40) + font_text_three = get_font("regular", size=40) text_layer = Image.new("RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR) text_layer_draw = ImageDraw.Draw(text_layer) text_y = 0 - # title - title = textwrap.fill(book.title, width=28) - text_layer_draw.multiline_text((0, text_y), title, font=font_title, fill=TEXT_COLOR) + if 'text_zero' in texts: + # Text one (Book title) + text_zero = textwrap.fill(texts['text_zero'], width=72) + text_layer_draw.multiline_text((0, text_y), text_zero, font=font_text_zero, fill=TEXT_COLOR) - text_y = text_y + font_title.getsize_multiline(title)[1] + 16 + text_y = text_y + font_text_zero.getsize_multiline(text_zero)[1] + 16 - # subtitle - authors_text = book.author_text - authors = textwrap.fill(authors_text, width=36) - text_layer_draw.multiline_text( - (0, text_y), authors, font=font_authors, fill=TEXT_COLOR - ) + if 'text_one' in texts: + # Text one (Book title) + text_one = textwrap.fill(texts['text_one'], width=28) + text_layer_draw.multiline_text((0, text_y), text_one, font=font_text_one, fill=TEXT_COLOR) + + text_y = text_y + font_text_one.getsize_multiline(text_one)[1] + 16 + + if 'text_two' in texts: + # Text one (Book subtitle) + text_two = textwrap.fill(texts['text_two'], width=36) + text_layer_draw.multiline_text((0, text_y), text_two, font=font_text_two, fill=TEXT_COLOR) + + text_y = text_y + font_text_one.getsize_multiline(text_two)[1] + 16 + + if 'text_three' in texts: + # Text three (Book authors) + text_three = textwrap.fill(texts['text_three'], width=36) + text_layer_draw.multiline_text( + (0, text_y), text_three, font=font_text_three, fill=TEXT_COLOR + ) text_layer_box = text_layer.getbbox() return text_layer.crop(text_layer_box) @@ -109,8 +123,6 @@ def generate_instance_layer(content_width): def generate_rating_layer(rating, content_width): - font_icons = get_font("icomoon", size=60) - icon_star_full = Image.open(path.joinpath("static/images/icons/star-full.png")) icon_star_empty = Image.open(path.joinpath("static/images/icons/star-empty.png")) icon_star_half = Image.open(path.joinpath("static/images/icons/star-half.png")) @@ -159,7 +171,7 @@ def generate_default_cover(): ) default_cover_draw = ImageDraw.Draw(default_cover) - text = "no cover :(" + text = "no image :(" text_dimensions = font_cover.getsize(text) text_coords = ( math.floor((cover_width - text_dimensions[0]) / 2), @@ -170,20 +182,12 @@ def generate_default_cover(): return default_cover -def generate_preview_image(book_id, rating=None): - book = models.Book.objects.select_subclasses().get(id=book_id) - - rating = models.Review.objects.filter( - privacy="public", - deleted=False, - book__in=[book_id], - ).aggregate(Avg("rating"))["rating__avg"] - +def generate_preview_image(book, texts={}, picture=None, rating=None): # Cover try: - cover_img_layer = Image.open(book.cover) + cover_img_layer = Image.open(picture) cover_img_layer.thumbnail((cover_img_limits, cover_img_limits), Image.ANTIALIAS) - color_thief = ColorThief(book.cover) + color_thief = ColorThief(picture) dominant_color = color_thief.get_color(quality=1) except: cover_img_layer = generate_default_cover() @@ -214,7 +218,7 @@ def generate_preview_image(book_id, rating=None): content_width = IMG_WIDTH - content_x - margin instance_layer = generate_instance_layer(content_width) - texts_layer = generate_texts_layer(book, content_width) + texts_layer = generate_texts_layer(texts, content_width) contents_layer = Image.new( "RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR @@ -248,8 +252,33 @@ def generate_preview_image(book_id, rating=None): img.paste(cover_img_layer, (margin, cover_y)) img.alpha_composite(contents_layer, (content_x, contents_y)) - file_name = "%s.png" % str(uuid4()) + return img + +@app.task +def generate_edition_preview_image_task(book_id): + """generate preview_image""" + book = models.Book.objects.select_subclasses().get(id=book_id) + + rating = models.Review.objects.filter( + privacy="public", + deleted=False, + book__in=[book_id], + ).aggregate(Avg("rating"))["rating__avg"] + + texts = { + 'text_zero': "ADDED A REVIEW", + 'text_one': book.title, + 'text_two': book.subtitle, + 'text_three': book.author_text + } + + img = generate_preview_image(book=book, + texts=texts, + picture=book.cover, + rating=rating) + + file_name = "%s.png" % str(uuid4()) image_buffer = BytesIO() try: try: @@ -274,9 +303,3 @@ def generate_preview_image(book_id, rating=None): os.remove(old_path) finally: image_buffer.close() - - -@app.task -def generate_preview_image_from_edition_task(book_id): - """generate preview_image""" - generate_preview_image(book_id=book_id) From 34caa36ab70baa51bdeea11cc396289be0e0eebd Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 10:19:39 +0200 Subject: [PATCH 010/130] Add site preview task --- bookwyrm/models/book.py | 2 +- bookwyrm/models/site.py | 13 +++++++ bookwyrm/preview_images.py | 80 +++++++++++++++++++++++++++++++------- 3 files changed, 79 insertions(+), 16 deletions(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 01dfbba72..aa9a56017 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -86,7 +86,7 @@ class Book(BookDataModel): upload_to="covers/", blank=True, null=True, alt_field="alt_text" ) preview_image = models.ImageField( - upload_to="cover_previews/", blank=True, null=True + upload_to="previews/covers/", blank=True, null=True ) first_published_date = fields.DateTimeField(blank=True, null=True) published_date = fields.DateTimeField(blank=True, null=True) diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index 2c5a21642..dc226bce4 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -4,9 +4,12 @@ import datetime from Crypto import Random from django.db import models, IntegrityError +from django.dispatch import receiver from django.utils import timezone +from bookwyrm.preview_images import generate_site_preview_image_task from bookwyrm.settings import DOMAIN +from bookwyrm.tasks import app from .base_model import BookWyrmModel from .user import User @@ -35,6 +38,7 @@ class SiteSettings(models.Model): logo = models.ImageField(upload_to="logos/", null=True, blank=True) logo_small = models.ImageField(upload_to="logos/", null=True, blank=True) favicon = models.ImageField(upload_to="logos/", null=True, blank=True) + preview_image = models.ImageField(upload_to="previews/logos/", null=True, blank=True) # footer support_link = models.CharField(max_length=255, null=True, blank=True) @@ -119,3 +123,12 @@ class PasswordReset(models.Model): def link(self): """formats the invite link""" return "https://{}/password-reset/{}".format(DOMAIN, self.code) + + +@receiver(models.signals.post_save, sender=SiteSettings) +# pylint: disable=unused-argument +def preview_image(instance, *args, **kwargs): + updated_fields = kwargs["update_fields"] + + if not updated_fields or "preview_image" not in updated_fields: + generate_site_preview_image_task.delay() diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 82e8dc798..949ffac12 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -14,6 +14,7 @@ from django.core.files.uploadedfile import InMemoryUploadedFile from django.db.models import Avg from bookwyrm import models, settings +from bookwyrm.settings import DOMAIN from bookwyrm.tasks import app # dev @@ -182,7 +183,7 @@ def generate_default_cover(): return default_cover -def generate_preview_image(book, texts={}, picture=None, rating=None): +def generate_preview_image(texts={}, picture=None, rating=None, show_instance_layer=True): # Cover try: cover_img_layer = Image.open(picture) @@ -217,31 +218,35 @@ def generate_preview_image(book, texts={}, picture=None, rating=None): content_x = margin + cover_img_layer.width + gutter content_width = IMG_WIDTH - content_x - margin - instance_layer = generate_instance_layer(content_width) - texts_layer = generate_texts_layer(texts, content_width) - contents_layer = Image.new( "RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR ) contents_composite_y = 0 - contents_layer.alpha_composite(instance_layer, (0, contents_composite_y)) - contents_composite_y = contents_composite_y + instance_layer.height + gutter + + if show_instance_layer: + instance_layer = generate_instance_layer(content_width) + contents_layer.alpha_composite(instance_layer, (0, contents_composite_y)) + contents_composite_y = contents_composite_y + instance_layer.height + gutter + + texts_layer = generate_texts_layer(texts, content_width) contents_layer.alpha_composite(texts_layer, (0, contents_composite_y)) - contents_composite_y = contents_composite_y + texts_layer.height + 30 + contents_composite_y = contents_composite_y + texts_layer.height + gutter if rating: # Add some more margin - contents_composite_y = contents_composite_y + 30 + contents_composite_y = contents_composite_y + gutter rating_layer = generate_rating_layer(rating, content_width) contents_layer.alpha_composite(rating_layer, (0, contents_composite_y)) - contents_composite_y = contents_composite_y + rating_layer.height + 30 + contents_composite_y = contents_composite_y + rating_layer.height + gutter contents_layer_box = contents_layer.getbbox() contents_layer_height = contents_layer_box[3] - contents_layer_box[1] contents_y = math.floor((IMG_HEIGHT - contents_layer_height) / 2) - # Remove Instance Layer from centering calculations - contents_y = contents_y - math.floor((instance_layer.height + gutter) / 2) + + if show_instance_layer: + # Remove Instance Layer from centering calculations + contents_y = contents_y - math.floor((instance_layer.height + gutter) / 2) if contents_y < margin: contents_y = margin @@ -255,9 +260,56 @@ def generate_preview_image(book, texts={}, picture=None, rating=None): return img +@app.task +def generate_site_preview_image_task(): + """generate preview_image for the website""" + site = models.SiteSettings.objects.get() + + if site.logo: + logo = site.logo + else: + logo = path.joinpath("static/images/logo-small.png") + + texts = { + 'text_zero': DOMAIN, + 'text_one': site.name, + 'text_three': site.instance_tagline, + } + + img = generate_preview_image(texts=texts, + picture=logo, + show_instance_layer=False) + + file_name = "%s.png" % str(uuid4()) + image_buffer = BytesIO() + try: + try: + old_path = site.preview_image.path + except ValueError: + old_path = "" + + # Save + img.save(image_buffer, format="png") + site.preview_image = InMemoryUploadedFile( + ContentFile(image_buffer.getvalue()), + "preview_image", + file_name, + "image/png", + image_buffer.tell(), + None, + ) + site.save(update_fields=["preview_image"]) + + # Clean up old file after saving + if os.path.exists(old_path): + os.remove(old_path) + finally: + image_buffer.close() + + @app.task def generate_edition_preview_image_task(book_id): - """generate preview_image""" + """generate preview_image for a book""" book = models.Book.objects.select_subclasses().get(id=book_id) rating = models.Review.objects.filter( @@ -267,14 +319,12 @@ def generate_edition_preview_image_task(book_id): ).aggregate(Avg("rating"))["rating__avg"] texts = { - 'text_zero': "ADDED A REVIEW", 'text_one': book.title, 'text_two': book.subtitle, 'text_three': book.author_text } - img = generate_preview_image(book=book, - texts=texts, + img = generate_preview_image(texts=texts, picture=book.cover, rating=rating) From bf503d370ce05dca92ffe711c5349aab1e3bfce8 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 12:54:57 +0200 Subject: [PATCH 011/130] Add user preview task --- bookwyrm/models/user.py | 14 ++++ bookwyrm/preview_images.py | 135 +++++++++++++++++++------------------ 2 files changed, 83 insertions(+), 66 deletions(-) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index d9f3eba99..2c4851520 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -6,6 +6,7 @@ from django.apps import apps from django.contrib.auth.models import AbstractUser, Group from django.contrib.postgres.fields import CICharField from django.core.validators import MinValueValidator +from django.dispatch import receiver from django.db import models from django.utils import timezone import pytz @@ -14,6 +15,7 @@ from bookwyrm import activitypub from bookwyrm.connectors import get_data, ConnectorException from bookwyrm.models.shelf import Shelf from bookwyrm.models.status import Status, Review +from bookwyrm.preview_images import generate_user_preview_image_task from bookwyrm.settings import DOMAIN from bookwyrm.signatures import create_key_pair from bookwyrm.tasks import app @@ -70,6 +72,9 @@ class User(OrderedCollectionPageMixin, AbstractUser): activitypub_field="icon", alt_field="alt_text", ) + preview_image = models.ImageField( + upload_to="previews/avatars/", blank=True, null=True + ) followers = fields.ManyToManyField( "self", link_only=True, @@ -443,3 +448,12 @@ def get_remote_reviews(outbox): if not activity["type"] == "Review": continue activitypub.Review(**activity).to_model() + + +@receiver(models.signals.post_save, sender=User) +# pylint: disable=unused-argument +def preview_image(instance, *args, **kwargs): + updated_fields = kwargs["update_fields"] + + if not updated_fields or "preview_image" not in updated_fields: + generate_user_preview_image_task.delay(instance.id) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 949ffac12..304250a21 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -29,7 +29,7 @@ TRANSPARENT_COLOR = (0, 0, 0, 0) margin = math.floor(IMG_HEIGHT / 10) gutter = math.floor(margin / 2) -cover_img_limits = math.floor(IMG_HEIGHT * 0.8) +inner_img_limits = math.floor(IMG_HEIGHT * 0.8) path = Path(__file__).parent.absolute() font_dir = path.joinpath("static/fonts/public_sans") @@ -163,12 +163,12 @@ def generate_rating_layer(rating, content_width): return rating_layer_composite -def generate_default_cover(): +def generate_default_inner_img(): font_cover = get_font("light", size=28) - cover_width = math.floor(cover_img_limits * 0.7) + cover_width = math.floor(inner_img_limits * 0.7) default_cover = Image.new( - "RGB", (cover_width, cover_img_limits), color=DEFAULT_COVER_COLOR + "RGB", (cover_width, inner_img_limits), color=DEFAULT_COVER_COLOR ) default_cover_draw = ImageDraw.Draw(default_cover) @@ -176,7 +176,7 @@ def generate_default_cover(): text_dimensions = font_cover.getsize(text) text_coords = ( math.floor((cover_width - text_dimensions[0]) / 2), - math.floor((cover_img_limits - text_dimensions[1]) / 2), + math.floor((inner_img_limits - text_dimensions[1]) / 2), ) default_cover_draw.text(text_coords, text, font=font_cover, fill="white") @@ -186,14 +186,15 @@ def generate_default_cover(): def generate_preview_image(texts={}, picture=None, rating=None, show_instance_layer=True): # Cover try: - cover_img_layer = Image.open(picture) - cover_img_layer.thumbnail((cover_img_limits, cover_img_limits), Image.ANTIALIAS) + inner_img_layer = Image.open(picture) + inner_img_layer.thumbnail((inner_img_limits, inner_img_limits), Image.ANTIALIAS) color_thief = ColorThief(picture) dominant_color = color_thief.get_color(quality=1) except: - cover_img_layer = generate_default_cover() + inner_img_layer = generate_default_inner_img() dominant_color = ImageColor.getrgb(DEFAULT_COVER_COLOR) + # Color if BG_COLOR == "use_dominant_color": image_bg_color = "rgb(%s, %s, %s)" % dominant_color @@ -215,7 +216,7 @@ def generate_preview_image(texts={}, picture=None, rating=None, show_instance_la img = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=image_bg_color) # Contents - content_x = margin + cover_img_layer.width + gutter + content_x = margin + inner_img_layer.width + gutter content_width = IMG_WIDTH - content_x - margin contents_layer = Image.new( @@ -251,15 +252,45 @@ def generate_preview_image(texts={}, picture=None, rating=None, show_instance_la if contents_y < margin: contents_y = margin - cover_y = math.floor((IMG_HEIGHT - cover_img_layer.height) / 2) + cover_y = math.floor((IMG_HEIGHT - inner_img_layer.height) / 2) # Composite layers - img.paste(cover_img_layer, (margin, cover_y)) + img.paste(inner_img_layer, (margin, cover_y), inner_img_layer.convert('RGBA')) img.alpha_composite(contents_layer, (content_x, contents_y)) return img +def save_and_cleanup(image, instance=None): + if instance: + file_name = "%s.png" % str(uuid4()) + image_buffer = BytesIO() + + try: + try: + old_path = instance.preview_image.path + except ValueError: + old_path = "" + + # Save + image.save(image_buffer, format="png") + instance.preview_image = InMemoryUploadedFile( + ContentFile(image_buffer.getvalue()), + "preview_image", + file_name, + "image/png", + image_buffer.tell(), + None, + ) + instance.save(update_fields=["preview_image"]) + + # Clean up old file after saving + if os.path.exists(old_path): + os.remove(old_path) + finally: + image_buffer.close() + + @app.task def generate_site_preview_image_task(): """generate preview_image for the website""" @@ -268,7 +299,7 @@ def generate_site_preview_image_task(): if site.logo: logo = site.logo else: - logo = path.joinpath("static/images/logo-small.png") + logo = path.joinpath("static/images/logo.png") texts = { 'text_zero': DOMAIN, @@ -276,35 +307,11 @@ def generate_site_preview_image_task(): 'text_three': site.instance_tagline, } - img = generate_preview_image(texts=texts, - picture=logo, - show_instance_layer=False) + image = generate_preview_image(texts=texts, + picture=logo, + show_instance_layer=False) - file_name = "%s.png" % str(uuid4()) - image_buffer = BytesIO() - try: - try: - old_path = site.preview_image.path - except ValueError: - old_path = "" - - # Save - img.save(image_buffer, format="png") - site.preview_image = InMemoryUploadedFile( - ContentFile(image_buffer.getvalue()), - "preview_image", - file_name, - "image/png", - image_buffer.tell(), - None, - ) - site.save(update_fields=["preview_image"]) - - # Clean up old file after saving - if os.path.exists(old_path): - os.remove(old_path) - finally: - image_buffer.close() + save_and_cleanup(image, instance=site) @app.task @@ -324,32 +331,28 @@ def generate_edition_preview_image_task(book_id): 'text_three': book.author_text } - img = generate_preview_image(texts=texts, - picture=book.cover, - rating=rating) + image = generate_preview_image(texts=texts, + picture=book.cover, + rating=rating) - file_name = "%s.png" % str(uuid4()) - image_buffer = BytesIO() - try: - try: - old_path = book.preview_image.path - except ValueError: - old_path = "" + save_and_cleanup(image, instance=book) - # Save - img.save(image_buffer, format="png") - book.preview_image = InMemoryUploadedFile( - ContentFile(image_buffer.getvalue()), - "preview_image", - file_name, - "image/png", - image_buffer.tell(), - None, - ) - book.save(update_fields=["preview_image"]) +@app.task +def generate_user_preview_image_task(user_id): + """generate preview_image for a book""" + user = models.User.objects.get(id=user_id) - # Clean up old file after saving - if os.path.exists(old_path): - os.remove(old_path) - finally: - image_buffer.close() + texts = { + 'text_one': user.display_name, + 'text_three': "@{}@{}".format(user.localname, DOMAIN) + } + + if user.avatar: + avatar = user.avatar + else: + avatar = path.joinpath("static/images/default_avi.jpg") + + image = generate_preview_image(texts=texts, + picture=avatar) + + save_and_cleanup(image, instance=user) From b47edc5f0d15945044346791982cdd9fb4803845 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 13:07:33 +0200 Subject: [PATCH 012/130] Add dark mode --- bookwyrm/preview_images.py | 13 ++++++++++--- bookwyrm/settings.py | 7 ++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 304250a21..9539edbaf 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -196,14 +196,21 @@ def generate_preview_image(texts={}, picture=None, rating=None, show_instance_la # Color - if BG_COLOR == "use_dominant_color": + if BG_COLOR in ["use_dominant_color_light", "use_dominant_color_dark"]: image_bg_color = "rgb(%s, %s, %s)" % dominant_color - # Lighten color + + # Adjust color image_bg_color_rgb = [x / 255.0 for x in ImageColor.getrgb(image_bg_color)] image_bg_color_hls = colorsys.rgb_to_hls(*image_bg_color_rgb) + + if BG_COLOR == "use_dominant_color_light": + lightness = max(0.9, image_bg_color_hls[1]) + else: + lightness = min(0.15, image_bg_color_hls[1]) + image_bg_color_hls = ( image_bg_color_hls[0], - max(0.9, image_bg_color_hls[1]), + lightness, image_bg_color_hls[2], ) image_bg_color = tuple( diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index db15be468..ce5c4547d 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -39,11 +39,12 @@ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" # Preview image -# Specify RGB tuple or RGB hex strings, or 'use_dominant_color' -PREVIEW_BG_COLOR = "use_dominant_color" +# Specify RGB tuple or RGB hex strings, +# or "use_dominant_color_light" / "use_dominant_color_dark" +PREVIEW_BG_COLOR = "use_dominant_color_dark" PREVIEW_IMG_WIDTH = 1200 PREVIEW_IMG_HEIGHT = 630 -PREVIEW_TEXT_COLOR = "#363636" +PREVIEW_TEXT_COLOR = "#FFF" PREVIEW_DEFAULT_COVER_COLOR = "#002549" # Quick-start development settings - unsuitable for production From c894f5ef3546e3d6d5bb2a24d52ead1826662a6c Mon Sep 17 00:00:00 2001 From: Fabien Basmaison Date: Wed, 26 May 2021 13:21:06 +0200 Subject: [PATCH 013/130] Update subtitle behaviour: - on Book - Remove problematic punctuation (locale and multiple punctuation if the title ends with `?`, `!` or similar). - Update view. - Use proper semantic to split combined title into `name`, `alternativeHeadline` and series-related microdata. - The author is not a subtitle, just data. - Use parenthesis in the `get_title` filter instead of punctuation. --- bookwyrm/templates/book/book.html | 39 ++++++++++++++++++------------ bookwyrm/templatetags/utilities.py | 2 +- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index af2230200..94f326e65 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -8,28 +8,35 @@
-

- - {{ book.title }}{% if book.subtitle %}: - {{ book.subtitle }} +

+ {{ book.title }} +

+ + {% if book.subtitle or book.series %} +

+ {% if book.subtitle %} + + + {{ book.subtitle }} {% endif %} - - {% if book.series %} - - + {% if book.series %} + + - ({{ book.series }} {% if book.series_number %} #{{ book.series_number }}{% endif %}) - -
- {% endif %} -

+ {% endif %} +

+ {% endif %} + {% if book.authors %} -

- {% trans "by" %} {% include 'snippets/authors.html' with book=book %} -

+
+ {% trans "by" %} {% include 'snippets/authors.html' with book=book %} +
{% endif %}
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index 68befa54a..ae66ca6e1 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -25,7 +25,7 @@ def get_title(book): return "" title = book.title if len(title) < 6 and book.subtitle: - title = "{:s}: {:s}".format(title, book.subtitle) + title = "{:s} ({:s})".format(title, book.subtitle) return title From 65de40a95a8aa64a9bdeb563c25f8e88a1a9fb7a Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 13:52:10 +0200 Subject: [PATCH 014/130] Add `generate_preview_images` command --- .../commands/generate_preview_images.py | 48 +++++++++++++++++++ bookwyrm/preview_images.py | 1 + bookwyrm/settings.py | 4 +- bw-dev | 5 +- 4 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 bookwyrm/management/commands/generate_preview_images.py diff --git a/bookwyrm/management/commands/generate_preview_images.py b/bookwyrm/management/commands/generate_preview_images.py new file mode 100644 index 000000000..13eaf3a68 --- /dev/null +++ b/bookwyrm/management/commands/generate_preview_images.py @@ -0,0 +1,48 @@ +""" Generate preview images """ +import sys + +from django.core.management.base import BaseCommand + +from bookwyrm import activitystreams, models, settings, preview_images + + +def generate_preview_images(): + """generate preview images""" + print(" | Hello! I will be generating preview images for your instance.") + print("🧑‍🎨 ⎨ This might take quite long if your instance has a lot of books and users.") + print(" | ✧ Thank you for your patience ✧") + + # Site + sys.stdout.write(" → Site preview image: ") + preview_images.generate_site_preview_image_task() + sys.stdout.write(" OK 🖼\n") + + + # Users + users = models.User.objects.filter( + local=True, + is_active=True, + ) + sys.stdout.write(" → User preview images ({}): ".format(len(users))) + for user in users: + preview_images.generate_user_preview_image_task(user.id) + sys.stdout.write(".") + sys.stdout.write(" OK 🖼\n") + + # Books + books = models.Book.objects.select_subclasses().filter() + sys.stdout.write(" → Book preview images ({}): ".format(len(books))) + for book in books: + preview_images.generate_edition_preview_image_task(book.id) + sys.stdout.write(".") + sys.stdout.write(" OK 🖼\n") + + print("🧑‍🎨 ⎨ I’m all done! ✧ Enjoy ✧") + + +class Command(BaseCommand): + help = "Generate preview images" + # pylint: disable=no-self-use,unused-argument + def handle(self, *args, **options): + """run feed builder""" + generate_preview_images() diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 9539edbaf..b0f9792d7 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -344,6 +344,7 @@ def generate_edition_preview_image_task(book_id): save_and_cleanup(image, instance=book) + @app.task def generate_user_preview_image_task(user_id): """generate preview_image for a book""" diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index ce5c4547d..b3ba312f9 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -41,10 +41,10 @@ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" # Specify RGB tuple or RGB hex strings, # or "use_dominant_color_light" / "use_dominant_color_dark" -PREVIEW_BG_COLOR = "use_dominant_color_dark" +PREVIEW_BG_COLOR = "use_dominant_color_light" PREVIEW_IMG_WIDTH = 1200 PREVIEW_IMG_HEIGHT = 630 -PREVIEW_TEXT_COLOR = "#FFF" +PREVIEW_TEXT_COLOR = "#363636" # Change to "#FFF" if you use "use_dominant_color_dark" PREVIEW_DEFAULT_COVER_COLOR = "#002549" # Quick-start development settings - unsuitable for production diff --git a/bw-dev b/bw-dev index c2b63bc17..95681b115 100755 --- a/bw-dev +++ b/bw-dev @@ -107,7 +107,10 @@ case "$CMD" in populate_streams) runweb python manage.py populate_streams ;; + generate_preview_images) + runweb python manage.py generate_preview_images + ;; *) - 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, generate_preview_images" ;; esac From e5e549d125660544fae55c81d11e9e4dd6459edc Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 14:44:15 +0200 Subject: [PATCH 015/130] Add opengraph image depending on context --- bookwyrm/templates/book/book.html | 7 ++++++- bookwyrm/templates/layout.html | 6 ++++-- bookwyrm/templates/user/layout.html | 10 ++++++---- bookwyrm/templatetags/layout.py | 7 +++++++ 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index af2230200..09d5634bf 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -1,8 +1,13 @@ {% extends 'layout.html' %} -{% load i18n %}{% load bookwyrm_tags %}{% load humanize %}{% load utilities %} +{% load i18n %}{% load bookwyrm_tags %}{% load humanize %}{% load utilities %}{% load layout %} {% block title %}{{ book|book_title }}{% endblock %} +{% block opengraph_images %} + + +{% endblock %} + {% block content %} {% with user_authenticated=request.user.is_authenticated can_edit_book=perms.bookwyrm.edit_book %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index d899d62cb..bd3dbf7c1 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -16,8 +16,10 @@ - - + {% block opengraph_images %} + + + {% endblock %} diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index 0830a4068..c1503ec6d 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -1,11 +1,13 @@ {% extends 'layout.html' %} -{% load i18n %} -{% load humanize %} -{% load utilities %} -{% load markdown %} +{% load i18n %}{% load humanize %}{% load utilities %}{% load markdown %}{% load layout %} {% block title %}{{ user.display_name }}{% endblock %} +{% block opengraph_images %} + + +{% endblock %} + {% block content %}
{% block header %} diff --git a/bookwyrm/templatetags/layout.py b/bookwyrm/templatetags/layout.py index e0f1d8ba6..f518808c1 100644 --- a/bookwyrm/templatetags/layout.py +++ b/bookwyrm/templatetags/layout.py @@ -1,6 +1,7 @@ """ template filters used for creating the layout""" from django import template, utils +from bookwyrm.settings import DOMAIN register = template.Library() @@ -10,3 +11,9 @@ def get_lang(): """get current language, strip to the first two letters""" language = utils.translation.get_language() return language[0 : language.find("-")] + + +@register.simple_tag(takes_context=False) +def get_path(): + """get protocol and host""" + return "https://%s" % DOMAIN From eb56cced8d19319d622b866f36307cb583fda8ab Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 14:46:34 +0200 Subject: [PATCH 016/130] Lint --- .../commands/generate_preview_images.py | 5 +- bookwyrm/models/site.py | 4 +- bookwyrm/preview_images.py | 62 ++++++++++--------- bookwyrm/settings.py | 2 +- 4 files changed, 39 insertions(+), 34 deletions(-) diff --git a/bookwyrm/management/commands/generate_preview_images.py b/bookwyrm/management/commands/generate_preview_images.py index 13eaf3a68..754f6e9a9 100644 --- a/bookwyrm/management/commands/generate_preview_images.py +++ b/bookwyrm/management/commands/generate_preview_images.py @@ -9,7 +9,9 @@ from bookwyrm import activitystreams, models, settings, preview_images def generate_preview_images(): """generate preview images""" print(" | Hello! I will be generating preview images for your instance.") - print("🧑‍🎨 ⎨ This might take quite long if your instance has a lot of books and users.") + print( + "🧑‍🎨 ⎨ This might take quite long if your instance has a lot of books and users." + ) print(" | ✧ Thank you for your patience ✧") # Site @@ -17,7 +19,6 @@ def generate_preview_images(): preview_images.generate_site_preview_image_task() sys.stdout.write(" OK 🖼\n") - # Users users = models.User.objects.filter( local=True, diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index dc226bce4..d0076dc63 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -38,7 +38,9 @@ class SiteSettings(models.Model): logo = models.ImageField(upload_to="logos/", null=True, blank=True) logo_small = models.ImageField(upload_to="logos/", null=True, blank=True) favicon = models.ImageField(upload_to="logos/", null=True, blank=True) - preview_image = models.ImageField(upload_to="previews/logos/", null=True, blank=True) + preview_image = models.ImageField( + upload_to="previews/logos/", null=True, blank=True + ) # footer support_link = models.CharField(max_length=255, null=True, blank=True) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index b0f9792d7..8b6f90324 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -61,30 +61,36 @@ def generate_texts_layer(texts, content_width): text_y = 0 - if 'text_zero' in texts: + if "text_zero" in texts: # Text one (Book title) - text_zero = textwrap.fill(texts['text_zero'], width=72) - text_layer_draw.multiline_text((0, text_y), text_zero, font=font_text_zero, fill=TEXT_COLOR) + text_zero = textwrap.fill(texts["text_zero"], width=72) + text_layer_draw.multiline_text( + (0, text_y), text_zero, font=font_text_zero, fill=TEXT_COLOR + ) text_y = text_y + font_text_zero.getsize_multiline(text_zero)[1] + 16 - if 'text_one' in texts: + if "text_one" in texts: # Text one (Book title) - text_one = textwrap.fill(texts['text_one'], width=28) - text_layer_draw.multiline_text((0, text_y), text_one, font=font_text_one, fill=TEXT_COLOR) + text_one = textwrap.fill(texts["text_one"], width=28) + text_layer_draw.multiline_text( + (0, text_y), text_one, font=font_text_one, fill=TEXT_COLOR + ) text_y = text_y + font_text_one.getsize_multiline(text_one)[1] + 16 - if 'text_two' in texts: + if "text_two" in texts: # Text one (Book subtitle) - text_two = textwrap.fill(texts['text_two'], width=36) - text_layer_draw.multiline_text((0, text_y), text_two, font=font_text_two, fill=TEXT_COLOR) + text_two = textwrap.fill(texts["text_two"], width=36) + text_layer_draw.multiline_text( + (0, text_y), text_two, font=font_text_two, fill=TEXT_COLOR + ) text_y = text_y + font_text_one.getsize_multiline(text_two)[1] + 16 - if 'text_three' in texts: + if "text_three" in texts: # Text three (Book authors) - text_three = textwrap.fill(texts['text_three'], width=36) + text_three = textwrap.fill(texts["text_three"], width=36) text_layer_draw.multiline_text( (0, text_y), text_three, font=font_text_three, fill=TEXT_COLOR ) @@ -183,7 +189,9 @@ def generate_default_inner_img(): return default_cover -def generate_preview_image(texts={}, picture=None, rating=None, show_instance_layer=True): +def generate_preview_image( + texts={}, picture=None, rating=None, show_instance_layer=True +): # Cover try: inner_img_layer = Image.open(picture) @@ -194,7 +202,6 @@ def generate_preview_image(texts={}, picture=None, rating=None, show_instance_la inner_img_layer = generate_default_inner_img() dominant_color = ImageColor.getrgb(DEFAULT_COVER_COLOR) - # Color if BG_COLOR in ["use_dominant_color_light", "use_dominant_color_dark"]: image_bg_color = "rgb(%s, %s, %s)" % dominant_color @@ -262,7 +269,7 @@ def generate_preview_image(texts={}, picture=None, rating=None, show_instance_la cover_y = math.floor((IMG_HEIGHT - inner_img_layer.height) / 2) # Composite layers - img.paste(inner_img_layer, (margin, cover_y), inner_img_layer.convert('RGBA')) + img.paste(inner_img_layer, (margin, cover_y), inner_img_layer.convert("RGBA")) img.alpha_composite(contents_layer, (content_x, contents_y)) return img @@ -309,14 +316,12 @@ def generate_site_preview_image_task(): logo = path.joinpath("static/images/logo.png") texts = { - 'text_zero': DOMAIN, - 'text_one': site.name, - 'text_three': site.instance_tagline, + "text_zero": DOMAIN, + "text_one": site.name, + "text_three": site.instance_tagline, } - image = generate_preview_image(texts=texts, - picture=logo, - show_instance_layer=False) + image = generate_preview_image(texts=texts, picture=logo, show_instance_layer=False) save_and_cleanup(image, instance=site) @@ -333,14 +338,12 @@ def generate_edition_preview_image_task(book_id): ).aggregate(Avg("rating"))["rating__avg"] texts = { - 'text_one': book.title, - 'text_two': book.subtitle, - 'text_three': book.author_text + "text_one": book.title, + "text_two": book.subtitle, + "text_three": book.author_text, } - image = generate_preview_image(texts=texts, - picture=book.cover, - rating=rating) + image = generate_preview_image(texts=texts, picture=book.cover, rating=rating) save_and_cleanup(image, instance=book) @@ -351,8 +354,8 @@ def generate_user_preview_image_task(user_id): user = models.User.objects.get(id=user_id) texts = { - 'text_one': user.display_name, - 'text_three': "@{}@{}".format(user.localname, DOMAIN) + "text_one": user.display_name, + "text_three": "@{}@{}".format(user.localname, DOMAIN), } if user.avatar: @@ -360,7 +363,6 @@ def generate_user_preview_image_task(user_id): else: avatar = path.joinpath("static/images/default_avi.jpg") - image = generate_preview_image(texts=texts, - picture=avatar) + image = generate_preview_image(texts=texts, picture=avatar) save_and_cleanup(image, instance=user) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index b3ba312f9..86ad5c035 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -44,7 +44,7 @@ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" PREVIEW_BG_COLOR = "use_dominant_color_light" PREVIEW_IMG_WIDTH = 1200 PREVIEW_IMG_HEIGHT = 630 -PREVIEW_TEXT_COLOR = "#363636" # Change to "#FFF" if you use "use_dominant_color_dark" +PREVIEW_TEXT_COLOR = "#363636" # Change to "#FFF" if you use "use_dominant_color_dark" PREVIEW_DEFAULT_COVER_COLOR = "#002549" # Quick-start development settings - unsuitable for production From 4db8aa85f06859d6070a69865a978073e03b0500 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 14:55:55 +0200 Subject: [PATCH 017/130] Fix migration --- .../migrations/0076_book_preview_image.py | 18 ------------ bookwyrm/migrations/0076_preview_images.py | 28 +++++++++++++++++++ 2 files changed, 28 insertions(+), 18 deletions(-) delete mode 100644 bookwyrm/migrations/0076_book_preview_image.py create mode 100644 bookwyrm/migrations/0076_preview_images.py diff --git a/bookwyrm/migrations/0076_book_preview_image.py b/bookwyrm/migrations/0076_book_preview_image.py deleted file mode 100644 index 5db550507..000000000 --- a/bookwyrm/migrations/0076_book_preview_image.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2 on 2021-05-24 18:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0075_announcement"), - ] - - operations = [ - migrations.AddField( - model_name="book", - name="preview_image", - field=models.ImageField(blank=True, null=True, upload_to="cover_previews/"), - ), - ] diff --git a/bookwyrm/migrations/0076_preview_images.py b/bookwyrm/migrations/0076_preview_images.py new file mode 100644 index 000000000..c2f251df0 --- /dev/null +++ b/bookwyrm/migrations/0076_preview_images.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2 on 2021-05-26 12:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0075_announcement'), + ] + + operations = [ + migrations.AddField( + model_name='book', + name='preview_image', + field=models.ImageField(blank=True, null=True, upload_to='previews/covers/'), + ), + migrations.AddField( + model_name='sitesettings', + name='preview_image', + field=models.ImageField(blank=True, null=True, upload_to='previews/logos/'), + ), + migrations.AddField( + model_name='user', + name='preview_image', + field=models.ImageField(blank=True, null=True, upload_to='previews/avatars/'), + ), + ] From d4fc1b0fdfec0b6b0d21e255bf402a28bf1b7e53 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 15:17:28 +0200 Subject: [PATCH 018/130] Fix line endings --- bookwyrm/static/fonts/public_sans/OFL.txt | 186 +++++++++++----------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/bookwyrm/static/fonts/public_sans/OFL.txt b/bookwyrm/static/fonts/public_sans/OFL.txt index ac793eaaa..0916c2309 100644 --- a/bookwyrm/static/fonts/public_sans/OFL.txt +++ b/bookwyrm/static/fonts/public_sans/OFL.txt @@ -1,93 +1,93 @@ -Copyright (c) 2015, Pablo Impallari, Rodrigo Fuenzalida (Modified by Dan O. Williams and USWDS) (https://github.com/uswds/public-sans) - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. +Copyright (c) 2015, Pablo Impallari, Rodrigo Fuenzalida (Modified by Dan O. Williams and USWDS) (https://github.com/uswds/public-sans) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. From 5943e6d79acd955ce78f8a7cb3e755dfafd664a7 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 15:18:05 +0200 Subject: [PATCH 019/130] Black --- bookwyrm/migrations/0076_preview_images.py | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/bookwyrm/migrations/0076_preview_images.py b/bookwyrm/migrations/0076_preview_images.py index c2f251df0..8812e9b22 100644 --- a/bookwyrm/migrations/0076_preview_images.py +++ b/bookwyrm/migrations/0076_preview_images.py @@ -6,23 +6,27 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0075_announcement'), + ("bookwyrm", "0075_announcement"), ] operations = [ migrations.AddField( - model_name='book', - name='preview_image', - field=models.ImageField(blank=True, null=True, upload_to='previews/covers/'), + model_name="book", + name="preview_image", + field=models.ImageField( + blank=True, null=True, upload_to="previews/covers/" + ), ), migrations.AddField( - model_name='sitesettings', - name='preview_image', - field=models.ImageField(blank=True, null=True, upload_to='previews/logos/'), + model_name="sitesettings", + name="preview_image", + field=models.ImageField(blank=True, null=True, upload_to="previews/logos/"), ), migrations.AddField( - model_name='user', - name='preview_image', - field=models.ImageField(blank=True, null=True, upload_to='previews/avatars/'), + model_name="user", + name="preview_image", + field=models.ImageField( + blank=True, null=True, upload_to="previews/avatars/" + ), ), ] From 22c13f639c90d6e0eab9f8292f6f46970b60514b Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 15:18:35 +0200 Subject: [PATCH 020/130] Update layout.html --- bookwyrm/templates/user/layout.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index c1503ec6d..5f09b8c27 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -1,5 +1,9 @@ {% extends 'layout.html' %} -{% load i18n %}{% load humanize %}{% load utilities %}{% load markdown %}{% load layout %} +{% load i18n %} +{% load humanize %} +{% load utilities %} +{% load markdown %} +{% load layout %} {% block title %}{{ user.display_name }}{% endblock %} From a8ae3c995015b8150607f1081c03c73dec832747 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 15:37:09 +0200 Subject: [PATCH 021/130] Modify inner image position --- bookwyrm/preview_images.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 8b6f90324..13b241b1d 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -17,9 +17,6 @@ from bookwyrm import models, settings from bookwyrm.settings import DOMAIN from bookwyrm.tasks import app -# dev -import logging - IMG_WIDTH = settings.PREVIEW_IMG_WIDTH IMG_HEIGHT = settings.PREVIEW_IMG_HEIGHT BG_COLOR = settings.PREVIEW_BG_COLOR @@ -29,7 +26,8 @@ TRANSPARENT_COLOR = (0, 0, 0, 0) margin = math.floor(IMG_HEIGHT / 10) gutter = math.floor(margin / 2) -inner_img_limits = math.floor(IMG_HEIGHT * 0.8) +inner_img_height = math.floor(IMG_HEIGHT * 0.8) +inner_img_width = math.floor(inner_img_height * 0.7) path = Path(__file__).parent.absolute() font_dir = path.joinpath("static/fonts/public_sans") @@ -172,17 +170,16 @@ def generate_rating_layer(rating, content_width): def generate_default_inner_img(): font_cover = get_font("light", size=28) - cover_width = math.floor(inner_img_limits * 0.7) default_cover = Image.new( - "RGB", (cover_width, inner_img_limits), color=DEFAULT_COVER_COLOR + "RGB", (inner_img_width, inner_img_height), color=DEFAULT_COVER_COLOR ) default_cover_draw = ImageDraw.Draw(default_cover) text = "no image :(" text_dimensions = font_cover.getsize(text) text_coords = ( - math.floor((cover_width - text_dimensions[0]) / 2), - math.floor((inner_img_limits - text_dimensions[1]) / 2), + math.floor((inner_img_width - text_dimensions[0]) / 2), + math.floor((inner_img_height - text_dimensions[1]) / 2), ) default_cover_draw.text(text_coords, text, font=font_cover, fill="white") @@ -195,7 +192,7 @@ def generate_preview_image( # Cover try: inner_img_layer = Image.open(picture) - inner_img_layer.thumbnail((inner_img_limits, inner_img_limits), Image.ANTIALIAS) + inner_img_layer.thumbnail((inner_img_width, inner_img_height), Image.ANTIALIAS) color_thief = ColorThief(picture) dominant_color = color_thief.get_color(quality=1) except: @@ -230,7 +227,9 @@ def generate_preview_image( img = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=image_bg_color) # Contents - content_x = margin + inner_img_layer.width + gutter + inner_img_x = margin + inner_img_width - inner_img_layer.width + inner_img_y = math.floor((IMG_HEIGHT - inner_img_layer.height) / 2) + content_x = margin + inner_img_width + gutter content_width = IMG_WIDTH - content_x - margin contents_layer = Image.new( @@ -266,10 +265,8 @@ def generate_preview_image( if contents_y < margin: contents_y = margin - cover_y = math.floor((IMG_HEIGHT - inner_img_layer.height) / 2) - # Composite layers - img.paste(inner_img_layer, (margin, cover_y), inner_img_layer.convert("RGBA")) + img.paste(inner_img_layer, (inner_img_x, inner_img_y), inner_img_layer.convert("RGBA")) img.alpha_composite(contents_layer, (content_x, contents_y)) return img From f7b117e4fb981b081847ffe1eaa346564351af0f Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 15:46:40 +0200 Subject: [PATCH 022/130] Update preview_images.py --- bookwyrm/preview_images.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 13b241b1d..875755547 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -266,7 +266,9 @@ def generate_preview_image( contents_y = margin # Composite layers - img.paste(inner_img_layer, (inner_img_x, inner_img_y), inner_img_layer.convert("RGBA")) + img.paste( + inner_img_layer, (inner_img_x, inner_img_y), inner_img_layer.convert("RGBA") + ) img.alpha_composite(contents_layer, (content_x, contents_y)) return img From 3ea935e7ce6473c1ff9713b86939cf1aa61c4341 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 15:49:08 +0200 Subject: [PATCH 023/130] Update OFL.txt --- bookwyrm/static/fonts/public_sans/OFL.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bookwyrm/static/fonts/public_sans/OFL.txt b/bookwyrm/static/fonts/public_sans/OFL.txt index 0916c2309..ba4ea0b96 100644 --- a/bookwyrm/static/fonts/public_sans/OFL.txt +++ b/bookwyrm/static/fonts/public_sans/OFL.txt @@ -1,4 +1,5 @@ -Copyright (c) 2015, Pablo Impallari, Rodrigo Fuenzalida (Modified by Dan O. Williams and USWDS) (https://github.com/uswds/public-sans) +Copyright (c) 2015, Pablo Impallari, Rodrigo Fuenzalida +(Modified by Dan O. Williams and USWDS) (https://github.com/uswds/public-sans) This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: From 7ea31530269721d7ab2856b3ec5d1186836795da Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 16:57:28 +0200 Subject: [PATCH 024/130] Fix site_path tag --- bookwyrm/context_processors.py | 2 ++ bookwyrm/templates/book/book.html | 4 ++-- bookwyrm/templates/layout.html | 4 ++-- bookwyrm/templates/user/layout.html | 4 ++-- bookwyrm/templatetags/layout.py | 8 -------- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py index b77c62b02..29775a0b5 100644 --- a/bookwyrm/context_processors.py +++ b/bookwyrm/context_processors.py @@ -1,5 +1,6 @@ """ customize the info available in context for rendering templates """ from bookwyrm import models +from bookwyrm.settings import DOMAIN def site_settings(request): # pylint: disable=unused-argument @@ -7,4 +8,5 @@ def site_settings(request): # pylint: disable=unused-argument return { "site": models.SiteSettings.objects.get(), "active_announcements": models.Announcement.active_announcements(), + "site_path": "https://%s" % DOMAIN, } diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 09d5634bf..02409b389 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -4,8 +4,8 @@ {% block title %}{{ book|book_title }}{% endblock %} {% block opengraph_images %} - - + + {% endblock %} {% block content %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index bd3dbf7c1..47bd434e2 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -17,8 +17,8 @@ {% block opengraph_images %} - - + + {% endblock %} diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index 5f09b8c27..45b37f763 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -8,8 +8,8 @@ {% block title %}{{ user.display_name }}{% endblock %} {% block opengraph_images %} - - + + {% endblock %} {% block content %} diff --git a/bookwyrm/templatetags/layout.py b/bookwyrm/templatetags/layout.py index f518808c1..f42f3bda1 100644 --- a/bookwyrm/templatetags/layout.py +++ b/bookwyrm/templatetags/layout.py @@ -1,8 +1,6 @@ """ template filters used for creating the layout""" from django import template, utils -from bookwyrm.settings import DOMAIN - register = template.Library() @@ -11,9 +9,3 @@ def get_lang(): """get current language, strip to the first two letters""" language = utils.translation.get_language() return language[0 : language.find("-")] - - -@register.simple_tag(takes_context=False) -def get_path(): - """get protocol and host""" - return "https://%s" % DOMAIN From e362c8249563c2c2c371b1136481c6b4c8b1a970 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 17:54:59 +0200 Subject: [PATCH 025/130] Expose static & media paths --- bookwyrm/context_processors.py | 8 ++++++-- bookwyrm/settings.py | 4 ++++ bookwyrm/templates/book/book.html | 4 ++-- bookwyrm/templates/layout.html | 8 ++++---- bookwyrm/templates/user/layout.html | 4 ++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py index 29775a0b5..dcdf615d5 100644 --- a/bookwyrm/context_processors.py +++ b/bookwyrm/context_processors.py @@ -1,6 +1,6 @@ """ customize the info available in context for rendering templates """ from bookwyrm import models -from bookwyrm.settings import DOMAIN +from bookwyrm.settings import SITE_PATH, STATIC_URL, STATIC_PATH, MEDIA_URL, MEDIA_PATH def site_settings(request): # pylint: disable=unused-argument @@ -8,5 +8,9 @@ def site_settings(request): # pylint: disable=unused-argument return { "site": models.SiteSettings.objects.get(), "active_announcements": models.Announcement.active_announcements(), - "site_path": "https://%s" % DOMAIN, + "site_path": SITE_PATH, + "static_url": STATIC_URL, + "media_url": MEDIA_URL, + "static_path": STATIC_PATH, + "media_path": MEDIA_PATH, } diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 86ad5c035..47553c65f 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -182,10 +182,14 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.2/howto/static-files/ +SITE_PATH = "https://%s" % DOMAIN + PROJECT_DIR = os.path.dirname(os.path.abspath(__file__)) STATIC_URL = "/static/" +STATIC_PATH = "%s/%s" % (SITE_PATH, env("STATIC_ROOT", "static")) STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static")) MEDIA_URL = "/images/" +MEDIA_PATH = "%s/%s" % (SITE_PATH, env("MEDIA_ROOT", "images")) MEDIA_ROOT = os.path.join(BASE_DIR, env("MEDIA_ROOT", "images")) USER_AGENT = "%s (BookWyrm/%s; +https://%s/)" % ( diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 02409b389..7b47e32b6 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -4,8 +4,8 @@ {% block title %}{{ book|book_title }}{% endblock %} {% block opengraph_images %} - - + + {% endblock %} {% block content %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 47bd434e2..625a224e6 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -8,7 +8,7 @@ - + @@ -17,8 +17,8 @@ {% block opengraph_images %} - - + + {% endblock %} @@ -27,7 +27,7 @@
- +
diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index 45b37f763..b73d47c84 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -8,8 +8,8 @@ {% block title %}{{ user.display_name }}{% endblock %} {% block opengraph_images %} - - + + {% endblock %} {% block content %} From e214d8b87932003e8e87f7249b92dab7426fa581 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 17:55:39 +0200 Subject: [PATCH 026/130] Rationalize paths handling --- bookwyrm/preview_images.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 875755547..1decb36a0 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -6,7 +6,6 @@ import textwrap from colorthief import ColorThief from io import BytesIO from PIL import Image, ImageDraw, ImageFont, ImageOps, ImageColor -from pathlib import Path from uuid import uuid4 from django.core.files.base import ContentFile @@ -14,7 +13,7 @@ from django.core.files.uploadedfile import InMemoryUploadedFile from django.db.models import Avg from bookwyrm import models, settings -from bookwyrm.settings import DOMAIN +from bookwyrm.settings import DOMAIN, STATIC_ROOT from bookwyrm.tasks import app IMG_WIDTH = settings.PREVIEW_IMG_WIDTH @@ -28,17 +27,16 @@ margin = math.floor(IMG_HEIGHT / 10) gutter = math.floor(margin / 2) inner_img_height = math.floor(IMG_HEIGHT * 0.8) inner_img_width = math.floor(inner_img_height * 0.7) -path = Path(__file__).parent.absolute() -font_dir = path.joinpath("static/fonts/public_sans") +font_dir = os.path.join(STATIC_ROOT, "fonts/public_sans") def get_font(font_name, size=28): if font_name == "light": - font_path = "%s/PublicSans-Light.ttf" % font_dir + font_path = os.path.join(font_dir, "PublicSans-Light.ttf") if font_name == "regular": - font_path = "%s/PublicSans-Regular.ttf" % font_dir + font_path = os.path.join(font_dir, "PublicSans-Regular.ttf") elif font_name == "bold": - font_path = "%s/PublicSans-Bold.ttf" % font_dir + font_path = os.path.join(font_dir, "PublicSans-Bold.ttf") try: font = ImageFont.truetype(font_path, size) @@ -105,7 +103,7 @@ def generate_instance_layer(content_width): if site.logo_small: logo_img = Image.open(site.logo_small) else: - static_path = path.joinpath("static/images/logo-small.png") + static_path = os.path.join(STATIC_ROOT, "images/logo-small.png") logo_img = Image.open(static_path) instance_layer = Image.new("RGBA", (content_width, 62), color=TRANSPARENT_COLOR) @@ -128,9 +126,11 @@ def generate_instance_layer(content_width): def generate_rating_layer(rating, content_width): - icon_star_full = Image.open(path.joinpath("static/images/icons/star-full.png")) - icon_star_empty = Image.open(path.joinpath("static/images/icons/star-empty.png")) - icon_star_half = Image.open(path.joinpath("static/images/icons/star-half.png")) + icon_star_full = Image.open(os.path.join(STATIC_ROOT, "images/icons/star-full.png")) + icon_star_empty = Image.open( + os.path.join(STATIC_ROOT, "images/icons/star-empty.png") + ) + icon_star_half = Image.open(os.path.join(STATIC_ROOT, "images/icons/star-half.png")) icon_size = 64 icon_margin = 10 @@ -312,7 +312,7 @@ def generate_site_preview_image_task(): if site.logo: logo = site.logo else: - logo = path.joinpath("static/images/logo.png") + logo = os.path.join(STATIC_ROOT, "images/logo.png") texts = { "text_zero": DOMAIN, @@ -360,7 +360,7 @@ def generate_user_preview_image_task(user_id): if user.avatar: avatar = user.avatar else: - avatar = path.joinpath("static/images/default_avi.jpg") + avatar = os.path.join(STATIC_ROOT, "images/default_avi.jpg") image = generate_preview_image(texts=texts, picture=avatar) From f848dcd756972f41589687a0d9ce81735a7439c9 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 18:20:22 +0200 Subject: [PATCH 027/130] Fix issue with protocol --- bookwyrm/context_processors.py | 6 ++++-- bookwyrm/settings.py | 6 ++---- bookwyrm/templates/book/book.html | 4 ++-- bookwyrm/templates/layout.html | 4 ++-- bookwyrm/templates/user/layout.html | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py index dcdf615d5..a6c535c2b 100644 --- a/bookwyrm/context_processors.py +++ b/bookwyrm/context_processors.py @@ -1,16 +1,18 @@ """ customize the info available in context for rendering templates """ from bookwyrm import models -from bookwyrm.settings import SITE_PATH, STATIC_URL, STATIC_PATH, MEDIA_URL, MEDIA_PATH +from bookwyrm.settings import STATIC_URL, STATIC_PATH, MEDIA_URL, MEDIA_PATH def site_settings(request): # pylint: disable=unused-argument """include the custom info about the site""" + request_protocol = "https://" if request.is_secure() else "http://" + return { "site": models.SiteSettings.objects.get(), "active_announcements": models.Announcement.active_announcements(), - "site_path": SITE_PATH, "static_url": STATIC_URL, "media_url": MEDIA_URL, "static_path": STATIC_PATH, "media_path": MEDIA_PATH, + "request_protocol": request_protocol, } diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 47553c65f..b0ff5a72c 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -182,14 +182,12 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.2/howto/static-files/ -SITE_PATH = "https://%s" % DOMAIN - PROJECT_DIR = os.path.dirname(os.path.abspath(__file__)) STATIC_URL = "/static/" -STATIC_PATH = "%s/%s" % (SITE_PATH, env("STATIC_ROOT", "static")) +STATIC_PATH = "%s/%s" % (DOMAIN, env("STATIC_ROOT", "static")) STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static")) MEDIA_URL = "/images/" -MEDIA_PATH = "%s/%s" % (SITE_PATH, env("MEDIA_ROOT", "images")) +MEDIA_PATH = "%s/%s" % (DOMAIN, env("MEDIA_ROOT", "images")) MEDIA_ROOT = os.path.join(BASE_DIR, env("MEDIA_ROOT", "images")) USER_AGENT = "%s (BookWyrm/%s; +https://%s/)" % ( diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 7b47e32b6..c40209964 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -4,8 +4,8 @@ {% block title %}{{ book|book_title }}{% endblock %} {% block opengraph_images %} - - + + {% endblock %} {% block content %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 625a224e6..c06294d9c 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -17,8 +17,8 @@ {% block opengraph_images %} - - + + {% endblock %} diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index b73d47c84..a645b07bb 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -8,8 +8,8 @@ {% block title %}{{ user.display_name }}{% endblock %} {% block opengraph_images %} - - + + {% endblock %} {% block content %} From 2ea1cd8319132726c4158ace675bea49d7ea350d Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 23:57:29 +0200 Subject: [PATCH 028/130] Tests --- bookwyrm/tests/activitypub/test_author.py | 10 +- .../tests/activitypub/test_base_activity.py | 45 ++++--- bookwyrm/tests/activitypub/test_quotation.py | 9 +- .../connectors/test_abstract_connector.py | 11 +- .../connectors/test_bookwyrm_connector.py | 6 +- .../connectors/test_connector_manager.py | 16 ++- .../connectors/test_openlibrary_connector.py | 22 ++-- .../tests/connectors/test_self_connector.py | 84 ++++++------ .../tests/importers/test_goodreads_import.py | 74 ++++++----- .../importers/test_librarything_import.py | 74 ++++++----- .../tests/management/test_populate_streams.py | 20 ++- .../tests/models/test_activitypub_mixin.py | 27 ++-- bookwyrm/tests/models/test_base_model.py | 7 +- bookwyrm/tests/models/test_book_model.py | 27 ++-- bookwyrm/tests/models/test_fields.py | 73 ++++++----- bookwyrm/tests/models/test_import_model.py | 7 +- bookwyrm/tests/models/test_list.py | 12 +- .../tests/models/test_readthrough_model.py | 18 +-- .../tests/models/test_relationship_models.py | 11 +- bookwyrm/tests/models/test_shelf_model.py | 14 +- bookwyrm/tests/models/test_status_model.py | 102 +++++++------- bookwyrm/tests/models/test_user_model.py | 19 +-- bookwyrm/tests/test_activitystreams.py | 20 ++- bookwyrm/tests/test_emailing.py | 18 +-- bookwyrm/tests/test_signing.py | 26 ++-- bookwyrm/tests/test_templatetags.py | 58 +++++--- bookwyrm/tests/views/inbox/test_inbox.py | 23 ++-- bookwyrm/tests/views/inbox/test_inbox_add.py | 36 ++--- .../tests/views/inbox/test_inbox_announce.py | 50 +++---- .../tests/views/inbox/test_inbox_block.py | 23 ++-- .../tests/views/inbox/test_inbox_create.py | 37 +++--- .../tests/views/inbox/test_inbox_delete.py | 22 ++-- .../tests/views/inbox/test_inbox_follow.py | 24 ++-- bookwyrm/tests/views/inbox/test_inbox_like.py | 24 ++-- .../tests/views/inbox/test_inbox_remove.py | 36 ++--- .../tests/views/inbox/test_inbox_update.py | 42 +++--- bookwyrm/tests/views/test_announcements.py | 19 +-- bookwyrm/tests/views/test_authentication.py | 33 +++-- bookwyrm/tests/views/test_author.py | 33 ++--- bookwyrm/tests/views/test_block.py | 18 +-- bookwyrm/tests/views/test_book.py | 79 ++++++----- bookwyrm/tests/views/test_directory.py | 39 +++--- bookwyrm/tests/views/test_federation.py | 18 +-- bookwyrm/tests/views/test_feed.py | 55 ++++---- bookwyrm/tests/views/test_follow.py | 66 +++++----- bookwyrm/tests/views/test_get_started.py | 29 ++-- bookwyrm/tests/views/test_goal.py | 45 ++++--- bookwyrm/tests/views/test_helpers.py | 124 +++++++++--------- bookwyrm/tests/views/test_import.py | 18 +-- bookwyrm/tests/views/test_interaction.py | 30 +++-- bookwyrm/tests/views/test_invite.py | 18 +-- bookwyrm/tests/views/test_isbn.py | 35 ++--- bookwyrm/tests/views/test_landing.py | 18 +-- bookwyrm/tests/views/test_list.py | 85 ++++++------ bookwyrm/tests/views/test_list_actions.py | 86 ++++++------ bookwyrm/tests/views/test_notifications.py | 19 +-- bookwyrm/tests/views/test_outbox.py | 81 +++++++----- bookwyrm/tests/views/test_password.py | 18 +-- bookwyrm/tests/views/test_reading.py | 30 +++-- bookwyrm/tests/views/test_readthrough.py | 16 ++- bookwyrm/tests/views/test_reports.py | 33 ++--- bookwyrm/tests/views/test_rss_feed.py | 62 +++++---- bookwyrm/tests/views/test_search.py | 33 ++--- bookwyrm/tests/views/test_shelf.py | 33 ++--- bookwyrm/tests/views/test_status.py | 82 +++++++----- bookwyrm/tests/views/test_updates.py | 20 +-- bookwyrm/tests/views/test_user.py | 29 ++-- bookwyrm/tests/views/test_user_admin.py | 18 +-- bookwyrm/tests/views/test_wellknown.py | 26 ++-- 69 files changed, 1370 insertions(+), 1105 deletions(-) diff --git a/bookwyrm/tests/activitypub/test_author.py b/bookwyrm/tests/activitypub/test_author.py index e65f86b76..fbb38da26 100644 --- a/bookwyrm/tests/activitypub/test_author.py +++ b/bookwyrm/tests/activitypub/test_author.py @@ -1,15 +1,17 @@ import datetime +from unittest.mock import patch from django.test import TestCase from bookwyrm import models class Author(TestCase): def setUp(self): - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + ) self.author = models.Author.objects.create( name="Author fullname", aliases=["One", "Two"], diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py index 77844a222..54fbb49e6 100644 --- a/bookwyrm/tests/activitypub/test_base_activity.py +++ b/bookwyrm/tests/activitypub/test_base_activity.py @@ -25,24 +25,25 @@ class BaseActivity(TestCase): def setUp(self): """we're probably going to re-use this so why copy/paste""" - self.user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - self.user.remote_id = "http://example.com/a/b" - self.user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + self.user.remote_id = "http://example.com/a/b" + self.user.save(broadcast=False) - datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") - self.userdata = json.loads(datafile.read_bytes()) - # don't try to load the user icon - del self.userdata["icon"] + datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") + self.userdata = json.loads(datafile.read_bytes()) + # don't try to load the user icon + del self.userdata["icon"] - image_file = pathlib.Path(__file__).parent.joinpath( - "../../static/images/default_avi.jpg" - ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) - self.image_data = output.getvalue() + image_file = pathlib.Path(__file__).parent.joinpath( + "../../static/images/default_avi.jpg" + ) + image = Image.open(image_file) + output = BytesIO() + image.save(output, format=image.format) + self.image_data = output.getvalue() def test_init(self, _): """simple successfuly init""" @@ -139,8 +140,9 @@ class BaseActivity(TestCase): self.user.avatar.file # pylint: disable=pointless-statement # this would trigger a broadcast because it's a local user - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - activity.to_model(model=models.User, instance=self.user) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + activity.to_model(model=models.User, instance=self.user) self.assertIsNotNone(self.user.avatar.file) self.assertEqual(self.user.name, "New Name") self.assertEqual(self.user.key_pair.public_key, "hi") @@ -152,9 +154,10 @@ class BaseActivity(TestCase): content="test status", user=self.user, ) - book = models.Edition.objects.create( - title="Test Edition", remote_id="http://book.com/book" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Edition.objects.create( + title="Test Edition", remote_id="http://book.com/book" + ) update_data = activitypub.Note( id=status.remote_id, content=status.content, diff --git a/bookwyrm/tests/activitypub/test_quotation.py b/bookwyrm/tests/activitypub/test_quotation.py index c90348bc3..7d1b28698 100644 --- a/bookwyrm/tests/activitypub/test_quotation.py +++ b/bookwyrm/tests/activitypub/test_quotation.py @@ -22,10 +22,11 @@ class Quotation(TestCase): outbox="https://example.com/user/mouse/outbox", remote_id="https://example.com/user/mouse", ) - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + ) datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_quotation.json") self.status_data = json.loads(datafile.read_bytes()) diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index 5c50e4b73..9ca3c8f2f 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -74,11 +74,12 @@ class AbstractConnector(TestCase): Mapping("openlibraryKey"), ] - self.book = models.Edition.objects.create( - title="Test Book", - remote_id="https://example.com/book/1234", - openlibrary_key="OL1234M", - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create( + title="Test Book", + remote_id="https://example.com/book/1234", + openlibrary_key="OL1234M", + ) def test_abstract_connector_init(self): """barebones connector for search with defaults""" diff --git a/bookwyrm/tests/connectors/test_bookwyrm_connector.py b/bookwyrm/tests/connectors/test_bookwyrm_connector.py index 46ea54a91..3a2480de4 100644 --- a/bookwyrm/tests/connectors/test_bookwyrm_connector.py +++ b/bookwyrm/tests/connectors/test_bookwyrm_connector.py @@ -1,4 +1,5 @@ """ testing book data connectors """ +from unittest.mock import patch import json import pathlib from django.test import TestCase @@ -25,8 +26,9 @@ class BookWyrmConnector(TestCase): def test_get_or_create_book_existing(self): """load book activity""" - work = models.Work.objects.create(title="Test Work") - book = models.Edition.objects.create(title="Test Edition", parent_work=work) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + book = models.Edition.objects.create(title="Test Edition", parent_work=work) result = self.connector.get_or_create_book(book.remote_id) self.assertEqual(book, result) diff --git a/bookwyrm/tests/connectors/test_connector_manager.py b/bookwyrm/tests/connectors/test_connector_manager.py index 67b108dd1..95920f072 100644 --- a/bookwyrm/tests/connectors/test_connector_manager.py +++ b/bookwyrm/tests/connectors/test_connector_manager.py @@ -1,4 +1,5 @@ """ interface between the app and various connectors """ +from unittest.mock import patch from django.test import TestCase import responses @@ -13,14 +14,15 @@ class ConnectorManager(TestCase): def setUp(self): """we'll need some books and a connector info entry""" - self.work = models.Work.objects.create(title="Example Work") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Example Work") - self.edition = models.Edition.objects.create( - title="Example Edition", parent_work=self.work, isbn_10="0000000000" - ) - self.edition = models.Edition.objects.create( - title="Another Edition", parent_work=self.work, isbn_10="1111111111" - ) + self.edition = models.Edition.objects.create( + title="Example Edition", parent_work=self.work, isbn_10="0000000000" + ) + self.edition = models.Edition.objects.create( + title="Another Edition", parent_work=self.work, isbn_10="1111111111" + ) self.connector = models.Connector.objects.create( identifier="test_connector", diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py index 699b26ed4..8c00061a4 100644 --- a/bookwyrm/tests/connectors/test_openlibrary_connector.py +++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py @@ -178,20 +178,26 @@ class Openlibrary(TestCase): @responses.activate def test_expand_book_data(self): """given a book, get more editions""" - work = models.Work.objects.create(title="Test Work", openlibrary_key="OL1234W") - edition = models.Edition.objects.create(title="Test Edition", parent_work=work) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create( + title="Test Work", openlibrary_key="OL1234W" + ) + edition = models.Edition.objects.create( + title="Test Edition", parent_work=work + ) responses.add( responses.GET, "https://openlibrary.org/works/OL1234W/editions", json={"entries": []}, ) - with patch( - "bookwyrm.connectors.abstract_connector.AbstractConnector." - "create_edition_from_data" - ): - self.connector.expand_book_data(edition) - self.connector.expand_book_data(work) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch( + "bookwyrm.connectors.abstract_connector.AbstractConnector." + "create_edition_from_data" + ): + self.connector.expand_book_data(edition) + self.connector.expand_book_data(work) def test_get_description(self): """should do some cleanup on the description data""" diff --git a/bookwyrm/tests/connectors/test_self_connector.py b/bookwyrm/tests/connectors/test_self_connector.py index db97b65a0..e49d9671f 100644 --- a/bookwyrm/tests/connectors/test_self_connector.py +++ b/bookwyrm/tests/connectors/test_self_connector.py @@ -1,4 +1,5 @@ """ testing book data connectors """ +from unittest.mock import patch import datetime from django.test import TestCase from django.utils import timezone @@ -29,11 +30,12 @@ class SelfConnector(TestCase): def test_format_search_result(self): """create a SearchResult""" author = models.Author.objects.create(name="Anonymous") - edition = models.Edition.objects.create( - title="Edition of Example Work", - published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc), - ) - edition.authors.add(author) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + edition = models.Edition.objects.create( + title="Edition of Example Work", + published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc), + ) + edition.authors.add(author) result = self.connector.search("Edition of Example")[0] self.assertEqual(result.title, "Edition of Example Work") self.assertEqual(result.key, edition.remote_id) @@ -44,32 +46,33 @@ class SelfConnector(TestCase): def test_search_rank(self): """prioritize certain results""" author = models.Author.objects.create(name="Anonymous") - edition = models.Edition.objects.create( - title="Edition of Example Work", - published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc), - parent_work=models.Work.objects.create(title=""), - ) - # author text is rank C - edition.authors.add(author) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + edition = models.Edition.objects.create( + title="Edition of Example Work", + published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc), + parent_work=models.Work.objects.create(title=""), + ) + # author text is rank C + edition.authors.add(author) - # series is rank D - models.Edition.objects.create( - title="Another Edition", - series="Anonymous", - parent_work=models.Work.objects.create(title=""), - ) - # subtitle is rank B - models.Edition.objects.create( - title="More Editions", - subtitle="The Anonymous Edition", - parent_work=models.Work.objects.create(title=""), - ) - # title is rank A - models.Edition.objects.create(title="Anonymous") - # doesn't rank in this search - edition = models.Edition.objects.create( - title="An Edition", parent_work=models.Work.objects.create(title="") - ) + # series is rank D + models.Edition.objects.create( + title="Another Edition", + series="Anonymous", + parent_work=models.Work.objects.create(title=""), + ) + # subtitle is rank B + models.Edition.objects.create( + title="More Editions", + subtitle="The Anonymous Edition", + parent_work=models.Work.objects.create(title=""), + ) + # title is rank A + models.Edition.objects.create(title="Anonymous") + # doesn't rank in this search + edition = models.Edition.objects.create( + title="An Edition", parent_work=models.Work.objects.create(title="") + ) results = self.connector.search("Anonymous") self.assertEqual(len(results), 3) @@ -79,16 +82,17 @@ class SelfConnector(TestCase): def test_search_multiple_editions(self): """it should get rid of duplicate editions for the same work""" - work = models.Work.objects.create(title="Work Title") - edition_1 = models.Edition.objects.create( - title="Edition 1 Title", parent_work=work - ) - edition_2 = models.Edition.objects.create( - title="Edition 2 Title", - parent_work=work, - edition_rank=20, # that's default babey - ) - edition_3 = models.Edition.objects.create(title="Fish", parent_work=work) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + work = models.Work.objects.create(title="Work Title") + edition_1 = models.Edition.objects.create( + title="Edition 1 Title", parent_work=work + ) + edition_2 = models.Edition.objects.create( + title="Edition 2 Title", + parent_work=work, + edition_rank=20, # that's default babey + ) + edition_3 = models.Edition.objects.create(title="Fish", parent_work=work) # pick the best edition results = self.connector.search("Edition 1 Title") diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py index 655567d05..81f47e6f5 100644 --- a/bookwyrm/tests/importers/test_goodreads_import.py +++ b/bookwyrm/tests/importers/test_goodreads_import.py @@ -21,9 +21,10 @@ class GoodreadsImport(TestCase): self.importer = GoodreadsImporter() datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv") self.csv = open(datafile, "r", encoding=self.importer.encoding) - self.user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "password", local=True - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "password", local=True + ) models.Connector.objects.create( identifier=DOMAIN, @@ -36,12 +37,13 @@ class GoodreadsImport(TestCase): search_url="https://%s/search?q=" % DOMAIN, priority=1, ) - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) def test_create_job(self): """creates the import job entry and checks csv""" @@ -92,7 +94,8 @@ class GoodreadsImport(TestCase): def test_import_data(self): """resolve entry""" import_job = self.importer.create_job(self.user, self.csv, False, "unlisted") - book = models.Edition.objects.create(title="Test Book") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Edition.objects.create(title="Test Book") with patch( "bookwyrm.models.import_job.ImportItem.get_book_from_isbn" @@ -119,10 +122,11 @@ class GoodreadsImport(TestCase): ) break - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -183,13 +187,14 @@ class GoodreadsImport(TestCase): ) break - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -216,10 +221,11 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, True, "unlisted" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, True, "unlisted" + ) review = models.Review.objects.get(book=self.book, user=self.user) self.assertEqual(review.content, "mixed feelings") self.assertEqual(review.rating, 2) @@ -242,10 +248,11 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, True, "unlisted" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, True, "unlisted" + ) review = models.ReviewRating.objects.get(book=self.book, user=self.user) self.assertIsInstance(review, models.ReviewRating) self.assertEqual(review.rating, 2) @@ -265,10 +272,11 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "unlisted" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "unlisted" + ) self.assertFalse( models.Review.objects.filter(book=self.book, user=self.user).exists() ) diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py index 5ae0944c0..8e299d567 100644 --- a/bookwyrm/tests/importers/test_librarything_import.py +++ b/bookwyrm/tests/importers/test_librarything_import.py @@ -22,9 +22,10 @@ class LibrarythingImport(TestCase): # Librarything generates latin encoded exports... self.csv = open(datafile, "r", encoding=self.importer.encoding) - self.user = models.User.objects.create_user( - "mmai", "mmai@mmai.mmai", "password", local=True - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "mmai", "mmai@mmai.mmai", "password", local=True + ) models.Connector.objects.create( identifier=DOMAIN, @@ -37,12 +38,13 @@ class LibrarythingImport(TestCase): search_url="https://%s/search?q=" % DOMAIN, priority=1, ) - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) def test_create_job(self): """creates the import job entry and checks csv""" @@ -82,7 +84,8 @@ class LibrarythingImport(TestCase): def test_import_data(self): """resolve entry""" import_job = self.importer.create_job(self.user, self.csv, False, "unlisted") - book = models.Edition.objects.create(title="Test Book") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Edition.objects.create(title="Test Book") with patch( "bookwyrm.models.import_job.ImportItem.get_book_from_isbn" @@ -111,10 +114,11 @@ class LibrarythingImport(TestCase): ) break - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -147,10 +151,11 @@ class LibrarythingImport(TestCase): ) break - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -179,13 +184,14 @@ class LibrarythingImport(TestCase): ) break - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -212,10 +218,11 @@ class LibrarythingImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, True, "unlisted" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, True, "unlisted" + ) review = models.Review.objects.get(book=self.book, user=self.user) self.assertEqual(review.content, "chef d'oeuvre") self.assertEqual(review.rating, 5) @@ -235,10 +242,11 @@ class LibrarythingImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "unlisted" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "unlisted" + ) self.assertFalse( models.Review.objects.filter(book=self.book, user=self.user).exists() ) diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py index d187c054b..f6d24c53a 100644 --- a/bookwyrm/tests/management/test_populate_streams.py +++ b/bookwyrm/tests/management/test_populate_streams.py @@ -12,12 +12,17 @@ class Activitystreams(TestCase): def setUp(self): """we need some stuff""" - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" - ) - self.another_user = models.User.objects.create_user( - "nutria", "nutria@nutria.nutria", "password", local=True, localname="nutria" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" + ) + self.another_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.nutria", + "password", + local=True, + localname="nutria", + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -28,7 +33,8 @@ class Activitystreams(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - self.book = models.Edition.objects.create(title="test book") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create(title="test book") def test_populate_streams(self, _): """make sure the function on the redis manager gets called""" diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py index 1c0975c44..348270edf 100644 --- a/bookwyrm/tests/models/test_activitypub_mixin.py +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -19,11 +19,12 @@ class ActivitypubMixins(TestCase): def setUp(self): """shared data""" - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" - ) - self.local_user.remote_id = "http://example.com/a/b" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" + ) + self.local_user.remote_id = "http://example.com/a/b" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -70,9 +71,10 @@ class ActivitypubMixins(TestCase): """attempt to match a remote id to an object in the db""" # uses a different remote id scheme # this isn't really part of this test directly but it's helpful to state - book = models.Edition.objects.create( - title="Test Edition", remote_id="http://book.com/book" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Edition.objects.create( + title="Test Edition", remote_id="http://book.com/book" + ) self.assertEqual(book.origin_id, "http://book.com/book") self.assertNotEqual(book.remote_id, "http://book.com/book") @@ -101,10 +103,11 @@ class ActivitypubMixins(TestCase): def test_find_existing(self, _): """match a blob of data to a model""" - book = models.Edition.objects.create( - title="Test edition", - openlibrary_key="OL1234", - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Edition.objects.create( + title="Test edition", + openlibrary_key="OL1234", + ) result = models.Edition.find_existing({"openlibraryKey": "OL1234"}) self.assertEqual(result, book) diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index 75d0444c1..8b0e55b7f 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -12,9 +12,10 @@ class BaseModel(TestCase): def setUp(self): """shared data""" - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py index cad00d43a..df61514c1 100644 --- a/bookwyrm/tests/models/test_book_model.py +++ b/bookwyrm/tests/models/test_book_model.py @@ -2,6 +2,7 @@ from dateutil.parser import parse from django.test import TestCase from django.utils import timezone +from unittest.mock import patch from bookwyrm import models, settings from bookwyrm.models.book import isbn_10_to_13, isbn_13_to_10 @@ -12,17 +13,18 @@ class Book(TestCase): def setUp(self): """we'll need some books""" - self.work = models.Work.objects.create( - title="Example Work", remote_id="https://example.com/book/1" - ) - self.first_edition = models.Edition.objects.create( - title="Example Edition", - parent_work=self.work, - ) - self.second_edition = models.Edition.objects.create( - title="Another Example Edition", - parent_work=self.work, - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create( + title="Example Work", remote_id="https://example.com/book/1" + ) + self.first_edition = models.Edition.objects.create( + title="Example Edition", + parent_work=self.work, + ) + self.second_edition = models.Edition.objects.create( + title="Another Example Edition", + parent_work=self.work, + ) def test_remote_id(self): """fanciness with remote/origin ids""" @@ -56,7 +58,8 @@ class Book(TestCase): def test_get_edition_info(self): """text slug about an edition""" - book = models.Edition.objects.create(title="Test Edition") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Edition.objects.create(title="Test Edition") self.assertEqual(book.edition_info, "") book.physical_format = "worm" diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index ea692b625..e8c48b0bb 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -188,9 +188,10 @@ class ActivitypubFields(TestCase): @patch("bookwyrm.activitystreams.ActivityStream.add_status") def test_privacy_field_set_activity_from_field(self, *_): """translate between to/cc fields and privacy""" - user = User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) public = "https://www.w3.org/ns/activitystreams#Public" followers = "%s/followers" % user.remote_id @@ -248,9 +249,10 @@ class ActivitypubFields(TestCase): del userdata["icon"] # it shouldn't match with this unrelated user: - unrelated_user = User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + unrelated_user = User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) # test receiving an unknown remote id and loading data responses.add( @@ -272,9 +274,10 @@ class ActivitypubFields(TestCase): del userdata["icon"] # it shouldn't match with this unrelated user: - unrelated_user = User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + unrelated_user = User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) with patch("bookwyrm.models.user.set_remote_server.delay"): value = instance.field_from_activity(activitypub.Person(**userdata)) self.assertIsInstance(value, User) @@ -288,14 +291,16 @@ class ActivitypubFields(TestCase): instance = fields.ForeignKey(User, on_delete=models.CASCADE) datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") userdata = json.loads(datafile.read_bytes()) - user = User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - user.remote_id = "https://example.com/user/mouse" - user.save(broadcast=False) - User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + user.remote_id = "https://example.com/user/mouse" + user.save(broadcast=False) + + User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) with patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast"): value = instance.field_from_activity(activitypub.Person(**userdata)) @@ -304,12 +309,13 @@ class ActivitypubFields(TestCase): def test_foreign_key_from_activity_str_existing(self): """test receiving a remote id of an existing object in the db""" instance = fields.ForeignKey(User, on_delete=models.CASCADE) - user = User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) value = instance.field_from_activity(user.remote_id) self.assertEqual(value, user) @@ -386,16 +392,17 @@ class ActivitypubFields(TestCase): @patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast") def test_image_field(self, _): """storing images""" - user = User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - image_file = pathlib.Path(__file__).parent.joinpath( - "../../static/images/default_avi.jpg" - ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) - user.avatar.save("test.jpg", ContentFile(output.getvalue())) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + image_file = pathlib.Path(__file__).parent.joinpath( + "../../static/images/default_avi.jpg" + ) + image = Image.open(image_file) + output = BytesIO() + image.save(output, format=image.format) + user.avatar.save("test.jpg", ContentFile(output.getvalue())) output = fields.image_serializer(user.avatar, alt="alt text") self.assertIsNotNone( diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py index 76a914d1b..02263e0e4 100644 --- a/bookwyrm/tests/models/test_import_model.py +++ b/bookwyrm/tests/models/test_import_model.py @@ -59,9 +59,10 @@ class ImportJob(TestCase): unknown_read_data["Exclusive Shelf"] = "read" unknown_read_data["Date Read"] = "" - user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) job = models.ImportJob.objects.create(user=user) self.item_1 = models.ImportItem.objects.create( job=job, index=1, data=currently_reading_data diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py index 8f5bd4976..34517ddcd 100644 --- a/bookwyrm/tests/models/test_list.py +++ b/bookwyrm/tests/models/test_list.py @@ -11,11 +11,13 @@ class List(TestCase): def setUp(self): """look, a list""" - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - work = models.Work.objects.create(title="hello") - self.book = models.Edition.objects.create(title="hi", parent_work=work) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="hello") + self.book = models.Edition.objects.create(title="hi", parent_work=work) def test_remote_id(self, _): """shelves use custom remote ids""" diff --git a/bookwyrm/tests/models/test_readthrough_model.py b/bookwyrm/tests/models/test_readthrough_model.py index 986b739b6..186e7ad05 100644 --- a/bookwyrm/tests/models/test_readthrough_model.py +++ b/bookwyrm/tests/models/test_readthrough_model.py @@ -1,6 +1,7 @@ """ testing models """ from django.test import TestCase from django.core.exceptions import ValidationError +from unittest.mock import patch from bookwyrm import models @@ -10,15 +11,16 @@ class ReadThrough(TestCase): def setUp(self): """look, a shelf""" - self.user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) - self.work = models.Work.objects.create(title="Example Work") - - self.edition = models.Edition.objects.create( - title="Example Edition", parent_work=self.work - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Example Work") + self.edition = models.Edition.objects.create( + title="Example Edition", parent_work=self.work + ) self.readthrough = models.ReadThrough.objects.create( user=self.user, book=self.edition diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py index d629b5c7a..516bfeb12 100644 --- a/bookwyrm/tests/models/test_relationship_models.py +++ b/bookwyrm/tests/models/test_relationship_models.py @@ -20,11 +20,12 @@ class Relationship(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" - ) - self.local_user.remote_id = "http://local.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" + ) + self.local_user.remote_id = "http://local.com/user/mouse" + self.local_user.save(broadcast=False) def test_user_follows_from_request(self): """convert a follow request into a follow""" diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py index 911df059d..f5c255a63 100644 --- a/bookwyrm/tests/models/test_shelf_model.py +++ b/bookwyrm/tests/models/test_shelf_model.py @@ -12,11 +12,15 @@ class Shelf(TestCase): def setUp(self): """look, a shelf""" - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create(title="test book", parent_work=work) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="test book", parent_work=work + ) def test_remote_id(self): """shelves use custom remote ids""" diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index 4c8930bc4..0005c507e 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -21,9 +21,10 @@ class Status(TestCase): def setUp(self): """useful things for creating a status""" - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -34,16 +35,17 @@ class Status(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - self.book = models.Edition.objects.create(title="Test Edition") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create(title="Test Edition") - image_file = pathlib.Path(__file__).parent.joinpath( - "../../static/images/default_avi.jpg" - ) - image = Image.open(image_file) - output = BytesIO() - with patch("bookwyrm.models.Status.broadcast"): - image.save(output, format=image.format) - self.book.cover.save("test.jpg", ContentFile(output.getvalue())) + image_file = pathlib.Path(__file__).parent.joinpath( + "../../static/images/default_avi.jpg" + ) + image = Image.open(image_file) + output = BytesIO() + with patch("bookwyrm.models.Status.broadcast"): + image.save(output, format=image.format) + self.book.cover.save("test.jpg", ContentFile(output.getvalue())) def test_status_generated_fields(self, *_): """setting remote id""" @@ -58,9 +60,10 @@ class Status(TestCase): child = models.Status.objects.create( content="hello", reply_parent=parent, user=self.local_user ) - models.Review.objects.create( - content="hey", reply_parent=parent, user=self.local_user, book=self.book - ) + with patch("bookwyrm.preview_images.generate_edition_image_task.delay"): + models.Review.objects.create( + content="hey", reply_parent=parent, user=self.local_user, book=self.book + ) models.Status.objects.create( content="hi hello", reply_parent=child, user=self.local_user ) @@ -92,9 +95,10 @@ class Status(TestCase): child = models.Status.objects.create( content="hello", reply_parent=parent, user=self.local_user ) - models.Review.objects.create( - content="hey", reply_parent=parent, user=self.local_user, book=self.book - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + models.Review.objects.create( + content="hey", reply_parent=parent, user=self.local_user, book=self.book + ) models.Status.objects.create( content="hi hello", reply_parent=child, user=self.local_user ) @@ -251,14 +255,15 @@ class Status(TestCase): def test_review_to_activity(self, *_): """subclass of the base model version with a "pure" serializer""" - status = models.Review.objects.create( - name="Review name", - content="test content", - rating=3.0, - user=self.local_user, - book=self.book, - ) - activity = status.to_activity() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + status = models.Review.objects.create( + name="Review name", + content="test content", + rating=3.0, + user=self.local_user, + book=self.book, + ) + activity = status.to_activity() self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["type"], "Review") self.assertEqual(activity["rating"], 3) @@ -268,14 +273,15 @@ class Status(TestCase): def test_review_to_pure_activity(self, *_): """subclass of the base model version with a "pure" serializer""" - status = models.Review.objects.create( - name="Review's name", - content="test content", - rating=3.0, - user=self.local_user, - book=self.book, - ) - activity = status.to_activity(pure=True) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + status = models.Review.objects.create( + name="Review's name", + content="test content", + rating=3.0, + user=self.local_user, + book=self.book, + ) + activity = status.to_activity(pure=True) self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["type"], "Article") self.assertEqual( @@ -292,13 +298,14 @@ class Status(TestCase): def test_review_to_pure_activity_no_rating(self, *_): """subclass of the base model version with a "pure" serializer""" - status = models.Review.objects.create( - name="Review name", - content="test content", - user=self.local_user, - book=self.book, - ) - activity = status.to_activity(pure=True) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + status = models.Review.objects.create( + name="Review name", + content="test content", + user=self.local_user, + book=self.book, + ) + activity = status.to_activity(pure=True) self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["type"], "Article") self.assertEqual( @@ -314,12 +321,13 @@ class Status(TestCase): def test_reviewrating_to_pure_activity(self, *_): """subclass of the base model version with a "pure" serializer""" - status = models.ReviewRating.objects.create( - rating=3.0, - user=self.local_user, - book=self.book, - ) - activity = status.to_activity(pure=True) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + status = models.ReviewRating.objects.create( + rating=3.0, + user=self.local_user, + book=self.book, + ) + activity = status.to_activity(pure=True) self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["type"], "Note") self.assertEqual( diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index b2791379d..96ec955a3 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -11,15 +11,16 @@ from bookwyrm.settings import DOMAIN # pylint: disable=missing-function-docstring class User(TestCase): def setUp(self): - self.user = models.User.objects.create_user( - "mouse@%s" % DOMAIN, - "mouse@mouse.mouse", - "mouseword", - local=True, - localname="mouse", - name="hi", - bookwyrm_user=False, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "mouse@%s" % DOMAIN, + "mouse@mouse.mouse", + "mouseword", + local=True, + localname="mouse", + name="hi", + bookwyrm_user=False, + ) def test_computed_fields(self): """username instead of id here""" diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py index 59266383f..bbd6dff9f 100644 --- a/bookwyrm/tests/test_activitystreams.py +++ b/bookwyrm/tests/test_activitystreams.py @@ -11,12 +11,17 @@ class Activitystreams(TestCase): def setUp(self): """use a test csv""" - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" - ) - self.another_user = models.User.objects.create_user( - "nutria", "nutria@nutria.nutria", "password", local=True, localname="nutria" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" + ) + self.another_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.nutria", + "password", + local=True, + localname="nutria", + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -27,7 +32,8 @@ class Activitystreams(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - self.book = models.Edition.objects.create(title="test book") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create(title="test book") class TestStream(activitystreams.ActivityStream): """test stream, don't have to do anything here""" diff --git a/bookwyrm/tests/test_emailing.py b/bookwyrm/tests/test_emailing.py index 0f9cc3659..e7b1bb1ca 100644 --- a/bookwyrm/tests/test_emailing.py +++ b/bookwyrm/tests/test_emailing.py @@ -15,14 +15,16 @@ class Emailing(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_invite_email(self, email_mock): """load the invite email""" diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py index 758ba9bbc..5a2f1b748 100644 --- a/bookwyrm/tests/test_signing.py +++ b/bookwyrm/tests/test_signing.py @@ -37,15 +37,20 @@ class Signature(TestCase): def setUp(self): """create users and test data""" - self.mouse = models.User.objects.create_user( - "mouse@%s" % DOMAIN, "mouse@example.com", "", local=True, localname="mouse" - ) - self.rat = models.User.objects.create_user( - "rat@%s" % DOMAIN, "rat@example.com", "", local=True, localname="rat" - ) - self.cat = models.User.objects.create_user( - "cat@%s" % DOMAIN, "cat@example.com", "", local=True, localname="cat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.mouse = models.User.objects.create_user( + "mouse@%s" % DOMAIN, + "mouse@example.com", + "", + local=True, + localname="mouse", + ) + self.rat = models.User.objects.create_user( + "rat@%s" % DOMAIN, "rat@example.com", "", local=True, localname="rat" + ) + self.cat = models.User.objects.create_user( + "cat@%s" % DOMAIN, "cat@example.com", "", local=True, localname="cat" + ) private_key, public_key = create_key_pair() @@ -53,7 +58,8 @@ class Signature(TestCase): "http://localhost/user/remote", KeyPair(private_key, public_key) ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def send(self, signature, now, data, digest): """test request""" diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py index 4b1aa5946..a472ac74b 100644 --- a/bookwyrm/tests/test_templatetags.py +++ b/bookwyrm/tests/test_templatetags.py @@ -21,13 +21,14 @@ class TemplateTags(TestCase): def setUp(self): """create some filler objects""" - self.user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.mouse", - "mouseword", - local=True, - localname="mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.mouse", + "mouseword", + local=True, + localname="mouse", + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -36,12 +37,14 @@ class TemplateTags(TestCase): remote_id="http://example.com/rat", local=False, ) - self.book = models.Edition.objects.create(title="Test Book") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create(title="Test Book") def test_get_user_rating(self, _): """get a user's most recent rating of a book""" - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - models.Review.objects.create(user=self.user, book=self.book, rating=3) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + models.Review.objects.create(user=self.user, book=self.book, rating=3) self.assertEqual(bookwyrm_tags.get_user_rating(self.book, self.user), 3) def test_get_user_rating_doesnt_exist(self, _): @@ -62,9 +65,12 @@ class TemplateTags(TestCase): def test_get_replies(self, _): """direct replies to a status""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - parent = models.Review.objects.create( - user=self.user, book=self.book, content="hi" - ) + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): + parent = models.Review.objects.create( + user=self.user, book=self.book, content="hi" + ) first_child = models.Status.objects.create( reply_parent=parent, user=self.user, content="hi" ) @@ -90,9 +96,12 @@ class TemplateTags(TestCase): def test_get_parent(self, _): """get the reply parent of a status""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - parent = models.Review.objects.create( - user=self.user, book=self.book, content="hi" - ) + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): + parent = models.Review.objects.create( + user=self.user, book=self.book, content="hi" + ) child = models.Status.objects.create( reply_parent=parent, user=self.user, content="hi" ) @@ -103,7 +112,8 @@ class TemplateTags(TestCase): def test_get_user_liked(self, _): """did a user like a status""" - status = models.Review.objects.create(user=self.remote_user, book=self.book) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + status = models.Review.objects.create(user=self.remote_user, book=self.book) self.assertFalse(interaction.get_user_liked(self.user, status)) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): @@ -112,7 +122,8 @@ class TemplateTags(TestCase): def test_get_user_boosted(self, _): """did a user boost a status""" - status = models.Review.objects.create(user=self.remote_user, book=self.book) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + status = models.Review.objects.create(user=self.remote_user, book=self.book) self.assertFalse(interaction.get_user_boosted(self.user, status)) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): @@ -121,9 +132,14 @@ class TemplateTags(TestCase): def test_get_boosted(self, _): """load a boosted status""" - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - status = models.Review.objects.create(user=self.remote_user, book=self.book) - boost = models.Boost.objects.create(user=self.user, boosted_status=status) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + status = models.Review.objects.create( + user=self.remote_user, book=self.book + ) + boost = models.Boost.objects.create( + user=self.user, boosted_status=status + ) boosted = status_display.get_boosted(boost) self.assertIsInstance(boosted, models.Review) self.assertEqual(boosted, status) diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py index 697f40100..ccd3a5e5e 100644 --- a/bookwyrm/tests/views/inbox/test_inbox.py +++ b/bookwyrm/tests/views/inbox/test_inbox.py @@ -18,15 +18,17 @@ class Inbox(TestCase): """basic user and book data""" self.client = Client() self.factory = RequestFactory() - local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - local_user.remote_id = "https://example.com/user/mouse" - local_user.save(broadcast=False) + + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + local_user.remote_id = "https://example.com/user/mouse" + local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -45,7 +47,8 @@ class Inbox(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_inbox_invalid_get(self): """shouldn't try to handle if the user is not found""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py index 5f86b1215..c1fd90fea 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_add.py +++ b/bookwyrm/tests/views/inbox/test_inbox_add.py @@ -13,15 +13,16 @@ class InboxAdd(TestCase): def setUp(self): """basic user and book data""" - local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - local_user.remote_id = "https://example.com/user/mouse" - local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + local_user.remote_id = "https://example.com/user/mouse" + local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -32,14 +33,15 @@ class InboxAdd(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - work = models.Work.objects.create(title="work title") - self.book = models.Edition.objects.create( - title="Test", - remote_id="https://example.com/book/37292", - parent_work=work, - ) - - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="work title") + self.book = models.Edition.objects.create( + title="Test", + remote_id="https://example.com/book/37292", + parent_work=work, + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() @responses.activate def test_handle_add_book_to_shelf(self): diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py index 4243dc78e..853266ed1 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_announce.py +++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py @@ -13,15 +13,16 @@ class InboxActivities(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -32,13 +33,14 @@ class InboxActivities(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - self.status = models.Status.objects.create( - user=self.local_user, - content="Test status", - remote_id="https://example.com/status/1", - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + with patch("bookwyrm.activitystreams.ActivityStream.add_status"): + self.status = models.Status.objects.create( + user=self.local_user, + content="Test status", + remote_id="https://example.com/status/1", + ) self.create_json = { "id": "hi", @@ -48,7 +50,8 @@ class InboxActivities(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() @patch("bookwyrm.activitystreams.ActivityStream.add_status") def test_boost(self, redis_mock): @@ -83,12 +86,13 @@ class InboxActivities(TestCase): @patch("bookwyrm.activitystreams.ActivityStream.add_status") def test_boost_remote_status(self, redis_mock): """boost a status from a remote server""" - work = models.Work.objects.create(title="work title") - book = models.Edition.objects.create( - title="Test", - remote_id="https://bookwyrm.social/book/37292", - parent_work=work, - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="work title") + book = models.Edition.objects.create( + title="Test", + remote_id="https://bookwyrm.social/book/37292", + parent_work=work, + ) self.assertEqual(models.Notification.objects.count(), 0) activity = { "type": "Announce", diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py index 956cf538a..310a6fa67 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_block.py +++ b/bookwyrm/tests/views/inbox/test_inbox_block.py @@ -12,15 +12,16 @@ class InboxBlock(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -31,8 +32,8 @@ class InboxBlock(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_handle_blocks(self): """create a "block" database entry from an activity""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py index 958dfee8c..3f677bd2e 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_create.py +++ b/bookwyrm/tests/views/inbox/test_inbox_create.py @@ -15,15 +15,16 @@ class InboxCreate(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): self.status = models.Status.objects.create( @@ -50,7 +51,8 @@ class InboxCreate(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_create_status(self): """the "it justs works" mode""" @@ -60,9 +62,11 @@ class InboxCreate(TestCase): "../../data/ap_quotation.json" ) status_data = json.loads(datafile.read_bytes()) - models.Edition.objects.create( - title="Test Book", remote_id="https://example.com/book/1" - ) + + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + models.Edition.objects.create( + title="Test Book", remote_id="https://example.com/book/1" + ) activity = self.create_json activity["object"] = status_data @@ -129,9 +133,10 @@ class InboxCreate(TestCase): def test_create_rating(self): """a remote rating activity""" - book = models.Edition.objects.create( - title="Test Book", remote_id="https://example.com/book/1" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Edition.objects.create( + title="Test Book", remote_id="https://example.com/book/1" + ) activity = self.create_json activity["object"] = { "id": "https://example.com/user/mouse/reviewrating/12", diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py index 617dcf6f5..07b286a54 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_delete.py +++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py @@ -13,15 +13,16 @@ class InboxActivities(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -47,7 +48,8 @@ class InboxActivities(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_delete_status(self): """remove a status""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py index f5332b7a3..5d5dcd4ea 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_follow.py +++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py @@ -13,15 +13,17 @@ class InboxRelationships(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) + with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -32,8 +34,8 @@ class InboxRelationships(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_follow(self): """remote user wants to follow local user""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py index a5f3a9f09..aa10f93fe 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_like.py +++ b/bookwyrm/tests/views/inbox/test_inbox_like.py @@ -12,15 +12,16 @@ class InboxActivities(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -31,6 +32,7 @@ class InboxActivities(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): self.status = models.Status.objects.create( @@ -47,7 +49,9 @@ class InboxActivities(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - models.SiteSettings.objects.create() + + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_handle_favorite(self): """fav a status""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py index a0c4cdcf9..3c2e72d64 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_remove.py +++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py @@ -12,15 +12,16 @@ class InboxRemove(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -31,14 +32,17 @@ class InboxRemove(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - self.work = models.Work.objects.create(title="work title") - self.book = models.Edition.objects.create( - title="Test", - remote_id="https://bookwyrm.social/book/37292", - parent_work=self.work, - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="work title") + self.book = models.Edition.objects.create( + title="Test", + remote_id="https://bookwyrm.social/book/37292", + parent_work=self.work, + ) + + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_handle_unshelve_book(self): """remove a book from a shelf""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py index 9fdc97922..78d694a2a 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_update.py +++ b/bookwyrm/tests/views/inbox/test_inbox_update.py @@ -14,15 +14,16 @@ class InboxUpdate(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -42,7 +43,8 @@ class InboxUpdate(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_update_list(self): """a new list""" @@ -120,12 +122,13 @@ class InboxUpdate(TestCase): datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_edition.json") bookdata = json.loads(datafile.read_bytes()) - models.Work.objects.create( - title="Test Work", remote_id="https://bookwyrm.social/book/5988" - ) - book = models.Edition.objects.create( - title="Test Book", remote_id="https://bookwyrm.social/book/5989" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + models.Work.objects.create( + title="Test Work", remote_id="https://bookwyrm.social/book/5988" + ) + book = models.Edition.objects.create( + title="Test Book", remote_id="https://bookwyrm.social/book/5989" + ) del bookdata["authors"] self.assertEqual(book.title, "Test Book") @@ -150,9 +153,10 @@ class InboxUpdate(TestCase): datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_work.json") bookdata = json.loads(datafile.read_bytes()) - book = models.Work.objects.create( - title="Test Book", remote_id="https://bookwyrm.social/book/5988" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Work.objects.create( + title="Test Book", remote_id="https://bookwyrm.social/book/5988" + ) del bookdata["authors"] self.assertEqual(book.title, "Test Book") diff --git a/bookwyrm/tests/views/test_announcements.py b/bookwyrm/tests/views/test_announcements.py index 0f17d3b9a..e25923949 100644 --- a/bookwyrm/tests/views/test_announcements.py +++ b/bookwyrm/tests/views/test_announcements.py @@ -2,6 +2,7 @@ from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory +from unittest.mock import patch from bookwyrm import forms, models, views @@ -12,14 +13,16 @@ class AnnouncementViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_announcements_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py index c310b0a26..94213c610 100644 --- a/bookwyrm/tests/views/test_authentication.py +++ b/bookwyrm/tests/views/test_authentication.py @@ -19,16 +19,18 @@ class AuthenticationViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "password", - local=True, - localname="mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "password", + local=True, + localname="mouse", + ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - self.settings = models.SiteSettings.objects.create(id=1) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + self.settings = models.SiteSettings.objects.create(id=1) def test_login_get(self): """there are so many views, this just makes sure it LOADS""" @@ -58,8 +60,9 @@ class AuthenticationViews(TestCase): "email": "aa@bb.cccc", }, ) - with patch("bookwyrm.views.authentication.login"): - response = view(request) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.views.authentication.login"): + response = view(request) self.assertEqual(models.User.objects.count(), 2) self.assertEqual(response.status_code, 302) nutria = models.User.objects.last() @@ -74,8 +77,9 @@ class AuthenticationViews(TestCase): "register/", {"localname": "nutria ", "password": "mouseword", "email": "aa@bb.ccc"}, ) - with patch("bookwyrm.views.authentication.login"): - response = view(request) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.views.authentication.login"): + response = view(request) self.assertEqual(models.User.objects.count(), 2) self.assertEqual(response.status_code, 302) nutria = models.User.objects.last() @@ -153,8 +157,9 @@ class AuthenticationViews(TestCase): "invite_code": "testcode", }, ) - with patch("bookwyrm.views.authentication.login"): - response = view(request) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.views.authentication.login"): + response = view(request) self.assertEqual(models.User.objects.count(), 2) self.assertEqual(response.status_code, 302) self.assertEqual(models.SiteInvite.objects.get().times_used, 1) diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py index 5dfbc3504..06080bb25 100644 --- a/bookwyrm/tests/views/test_author.py +++ b/bookwyrm/tests/views/test_author.py @@ -17,14 +17,15 @@ class AuthorViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) self.group = Group.objects.create(name="editor") self.group.permissions.add( Permission.objects.create( @@ -33,13 +34,15 @@ class AuthorViews(TestCase): content_type=ContentType.objects.get_for_model(models.User), ).id ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_author_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_block.py b/bookwyrm/tests/views/test_block.py index 0b754689d..80d20f11b 100644 --- a/bookwyrm/tests/views/test_block.py +++ b/bookwyrm/tests/views/test_block.py @@ -14,13 +14,14 @@ class BlockViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -31,7 +32,8 @@ class BlockViews(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_block_get(self, _): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py index 909718ec3..37bf3e9ee 100644 --- a/bookwyrm/tests/views/test_book.py +++ b/bookwyrm/tests/views/test_book.py @@ -23,14 +23,15 @@ class BookViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) self.group = Group.objects.create(name="editor") self.group.permissions.add( Permission.objects.create( @@ -39,13 +40,15 @@ class BookViews(TestCase): content_type=ContentType.objects.get_for_model(models.User), ).id ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_book_page(self): """there are so many views, this just makes sure it LOADS""" @@ -85,8 +88,11 @@ class BookViews(TestCase): form.data["last_edited_by"] = self.local_user.id request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - view(request, self.book.id) + + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + view(request, self.book.id) + self.book.refresh_from_db() self.assertEqual(self.book.title, "New Title") @@ -101,8 +107,9 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - result = view(request, self.book.id) - result.render() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + result = view(request, self.book.id) + result.render() # the changes haven't been saved yet self.book.refresh_from_db() @@ -120,8 +127,9 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - view(request, self.book.id) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + view(request, self.book.id) self.book.refresh_from_db() self.assertEqual(self.book.title, "New Title") @@ -197,8 +205,11 @@ class BookViews(TestCase): def test_switch_edition(self): """updates user's relationships to a book""" work = models.Work.objects.create(title="test work") - edition1 = models.Edition.objects.create(title="first ed", parent_work=work) - edition2 = models.Edition.objects.create(title="second ed", parent_work=work) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + edition1 = models.Edition.objects.create(title="first ed", parent_work=work) + edition2 = models.Edition.objects.create( + title="second ed", parent_work=work + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): shelf = models.Shelf.objects.create(name="Test Shelf", user=self.local_user) models.ShelfBook.objects.create( @@ -251,11 +262,12 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - views.upload_cover(request, self.book.id) - self.assertEqual(delay_mock.call_count, 1) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + views.upload_cover(request, self.book.id) + self.assertEqual(delay_mock.call_count, 1) self.book.refresh_from_db() self.assertTrue(self.book.cover) @@ -283,11 +295,12 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - views.upload_cover(request, self.book.id) - self.assertEqual(delay_mock.call_count, 1) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + views.upload_cover(request, self.book.id) + self.assertEqual(delay_mock.call_count, 1) self.book.refresh_from_db() self.assertTrue(self.book.cover) diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py index cada50bce..79dbd2a23 100644 --- a/bookwyrm/tests/views/test_directory.py +++ b/bookwyrm/tests/views/test_directory.py @@ -2,6 +2,7 @@ from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory +from unittest.mock import patch from bookwyrm import models, views @@ -12,24 +13,26 @@ class DirectoryViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", - "rat@rat.com", - "ratword", - local=True, - localname="rat", - remote_id="https://example.com/users/rat", - discoverable=True, - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + discoverable=True, + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_directory_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py index 4469040ee..b4d81d54c 100644 --- a/bookwyrm/tests/views/test_federation.py +++ b/bookwyrm/tests/views/test_federation.py @@ -15,13 +15,14 @@ class FederationViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -32,7 +33,8 @@ class FederationViews(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_federation_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py index a6a3d9677..81087cd1e 100644 --- a/bookwyrm/tests/views/test_feed.py +++ b/bookwyrm/tests/views/test_feed.py @@ -22,19 +22,22 @@ class FeedViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - self.book = models.Edition.objects.create( - parent_work=models.Work.objects.create(title="hi"), - title="Example Edition", - remote_id="https://example.com/book/1", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create( + parent_work=models.Work.objects.create(title="hi"), + title="Example Edition", + remote_id="https://example.com/book/1", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_feed(self, *_): """there are so many views, this just makes sure it LOADS""" @@ -89,11 +92,14 @@ class FeedViews(TestCase): output = BytesIO() image.save(output, format=image.format) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - status = models.Review.objects.create( - content="hi", - user=self.local_user, - book=self.book, - ) + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): + status = models.Review.objects.create( + content="hi", + user=self.local_user, + book=self.book, + ) attachment = models.Image.objects.create( status=status, caption="alt text here" ) @@ -146,12 +152,13 @@ class FeedViews(TestCase): def test_get_suggested_book(self, *_): """gets books the ~*~ algorithm ~*~ thinks you want to post about""" - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - models.ShelfBook.objects.create( - book=self.book, - user=self.local_user, - shelf=self.local_user.shelf_set.get(identifier="reading"), - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + models.ShelfBook.objects.create( + book=self.book, + user=self.local_user, + shelf=self.local_user.shelf_set.get(identifier="reading"), + ) suggestions = views.feed.get_suggested_books(self.local_user) self.assertEqual(suggestions[0]["name"], "Currently Reading") self.assertEqual(suggestions[0]["books"][0], self.book) diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py index 45e60d3cb..8ea8accc5 100644 --- a/bookwyrm/tests/views/test_follow.py +++ b/bookwyrm/tests/views/test_follow.py @@ -16,14 +16,15 @@ class BookViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) with patch("bookwyrm.models.user.set_remote_server"): self.remote_user = models.User.objects.create_user( "rat", @@ -42,12 +43,13 @@ class BookViews(TestCase): content_type=ContentType.objects.get_for_model(models.User), ).id ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) def test_handle_follow_remote(self): """send a follow request""" @@ -66,15 +68,16 @@ class BookViews(TestCase): def test_handle_follow_local_manually_approves(self): """send a follow request""" - rat = models.User.objects.create_user( - "rat@local.com", - "rat@rat.com", - "ratword", - local=True, - localname="rat", - remote_id="https://example.com/users/rat", - manually_approves_followers=True, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + rat = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + manually_approves_followers=True, + ) request = self.factory.post("", {"user": rat}) request.user = self.local_user self.assertEqual(models.UserFollowRequest.objects.count(), 0) @@ -89,14 +92,15 @@ class BookViews(TestCase): def test_handle_follow_local(self): """send a follow request""" - rat = models.User.objects.create_user( - "rat@local.com", - "rat@rat.com", - "ratword", - local=True, - localname="rat", - remote_id="https://example.com/users/rat", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + rat = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + ) request = self.factory.post("", {"user": rat}) request.user = self.local_user self.assertEqual(models.UserFollowRequest.objects.count(), 0) diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py index 1c55da086..2eb89f10c 100644 --- a/bookwyrm/tests/views/test_get_started.py +++ b/bookwyrm/tests/views/test_get_started.py @@ -13,22 +13,25 @@ class GetStartedViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - self.book = models.Edition.objects.create( - parent_work=models.Work.objects.create(title="hi"), - title="Example Edition", - remote_id="https://example.com/book/1", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create( + parent_work=models.Work.objects.create(title="hi"), + title="Example Edition", + remote_id="https://example.com/book/1", + ) models.Connector.objects.create( identifier="self", connector_file="self_connector", local=True ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_profile_view(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py index 4e8f6ee23..013d15950 100644 --- a/bookwyrm/tests/views/test_goal.py +++ b/bookwyrm/tests/views/test_goal.py @@ -16,29 +16,32 @@ class GoalViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", - "rat@rat.com", - "ratword", - local=True, - localname="rat", - remote_id="https://example.com/users/rat", - ) - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_goal_page_no_goal(self): """view a reading goal page for another's unset goal""" diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index ab5abed0b..bc99e69fd 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -19,21 +19,23 @@ class ViewsHelpers(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - discoverable=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Test Book", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + discoverable=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Test Book", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -202,21 +204,22 @@ class ViewsHelpers(TestCase): def test_get_annotated_users(self, _): """list of people you might know""" - user_1 = models.User.objects.create_user( - "nutria@local.com", - "nutria@nutria.com", - "nutriaword", - local=True, - localname="nutria", - discoverable=True, - ) - user_2 = models.User.objects.create_user( - "fish@local.com", - "fish@fish.com", - "fishword", - local=True, - localname="fish", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user_1 = models.User.objects.create_user( + "nutria@local.com", + "nutria@nutria.com", + "nutriaword", + local=True, + localname="nutria", + discoverable=True, + ) + user_2 = models.User.objects.create_user( + "fish@local.com", + "fish@fish.com", + "fishword", + local=True, + localname="fish", + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): # 1 shared follow self.local_user.following.add(user_2) @@ -249,39 +252,42 @@ class ViewsHelpers(TestCase): def test_get_annotated_users_counts(self, _): """correct counting for multiple shared attributed""" - user_1 = models.User.objects.create_user( - "nutria@local.com", - "nutria@nutria.com", - "nutriaword", - local=True, - localname="nutria", - discoverable=True, - ) - for i in range(3): - user = models.User.objects.create_user( - "{:d}@local.com".format(i), - "{:d}@nutria.com".format(i), - "password", + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user_1 = models.User.objects.create_user( + "nutria@local.com", + "nutria@nutria.com", + "nutriaword", local=True, - localname=i, + localname="nutria", + discoverable=True, ) - user.following.add(user_1) - user.followers.add(self.local_user) - - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): for i in range(3): - book = models.Edition.objects.create( - title=i, - parent_work=models.Work.objects.create(title=i), - ) - models.ShelfBook.objects.create( - user=self.local_user, - book=book, - shelf=self.local_user.shelf_set.first(), - ) - models.ShelfBook.objects.create( - user=user_1, book=book, shelf=user_1.shelf_set.first() + user = models.User.objects.create_user( + "{:d}@local.com".format(i), + "{:d}@nutria.com".format(i), + "password", + local=True, + localname=i, ) + user.following.add(user_1) + user.followers.add(self.local_user) + + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + for i in range(3): + book = models.Edition.objects.create( + title=i, + parent_work=models.Work.objects.create(title=i), + ) + models.ShelfBook.objects.create( + user=self.local_user, + book=book, + shelf=self.local_user.shelf_set.first(), + ) + models.ShelfBook.objects.create( + user=user_1, book=book, shelf=user_1.shelf_set.first() + ) result = views.helpers.get_annotated_users( self.local_user, diff --git a/bookwyrm/tests/views/test_import.py b/bookwyrm/tests/views/test_import.py index 22694623a..da8ade989 100644 --- a/bookwyrm/tests/views/test_import.py +++ b/bookwyrm/tests/views/test_import.py @@ -14,14 +14,16 @@ class ImportViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_import_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py index 876d6053c..208d270ce 100644 --- a/bookwyrm/tests/views/test_interaction.py +++ b/bookwyrm/tests/views/test_interaction.py @@ -14,14 +14,15 @@ class InteractionViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) with patch("bookwyrm.models.user.set_remote_server"): self.remote_user = models.User.objects.create_user( "rat", @@ -33,12 +34,13 @@ class InteractionViews(TestCase): outbox="https://example.com/users/rat/outbox", ) - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) def test_favorite(self, _): """create and broadcast faving a status""" diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/test_invite.py index 7b5071b36..0743c65e1 100644 --- a/bookwyrm/tests/views/test_invite.py +++ b/bookwyrm/tests/views/test_invite.py @@ -16,14 +16,16 @@ class InviteViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_invite_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py index 2aedd3cea..f26a08e53 100644 --- a/bookwyrm/tests/views/test_isbn.py +++ b/bookwyrm/tests/views/test_isbn.py @@ -16,25 +16,28 @@ class IsbnViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Test Book", - isbn_13="1234567890123", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Test Book", + isbn_13="1234567890123", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) models.Connector.objects.create( identifier="self", connector_file="self_connector", local=True ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_isbn_json_response(self): """searches local data only and returns book data in json format""" diff --git a/bookwyrm/tests/views/test_landing.py b/bookwyrm/tests/views/test_landing.py index 864e48f7f..7def39585 100644 --- a/bookwyrm/tests/views/test_landing.py +++ b/bookwyrm/tests/views/test_landing.py @@ -15,16 +15,18 @@ class LandingViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_home_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py index d6ad0e865..3783b9b69 100644 --- a/bookwyrm/tests/views/test_list.py +++ b/bookwyrm/tests/views/test_list.py @@ -17,46 +17,48 @@ class ListViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", - "rat@rat.com", - "ratword", - local=True, - localname="rat", - remote_id="https://example.com/users/rat", - ) - work = models.Work.objects.create(title="Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) - work_two = models.Work.objects.create(title="Labori") - self.book_two = models.Edition.objects.create( - title="Example Edition 2", - remote_id="https://example.com/book/2", - parent_work=work_two, - ) - work_three = models.Work.objects.create(title="Trabajar") - self.book_three = models.Edition.objects.create( - title="Example Edition 3", - remote_id="https://example.com/book/3", - parent_work=work_three, - ) - work_four = models.Work.objects.create(title="Travailler") - self.book_four = models.Edition.objects.create( - title="Example Edition 4", - remote_id="https://example.com/book/4", - parent_work=work_four, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) + work_two = models.Work.objects.create(title="Labori") + self.book_two = models.Edition.objects.create( + title="Example Edition 2", + remote_id="https://example.com/book/2", + parent_work=work_two, + ) + work_three = models.Work.objects.create(title="Trabajar") + self.book_three = models.Edition.objects.create( + title="Example Edition 3", + remote_id="https://example.com/book/3", + parent_work=work_three, + ) + work_four = models.Work.objects.create(title="Travailler") + self.book_four = models.Edition.objects.create( + title="Example Edition 4", + remote_id="https://example.com/book/4", + parent_work=work_four, + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): self.list = models.List.objects.create( @@ -64,7 +66,8 @@ class ListViews(TestCase): ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_lists_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_list_actions.py b/bookwyrm/tests/views/test_list_actions.py index 30c44a2cb..cbe00d27a 100644 --- a/bookwyrm/tests/views/test_list_actions.py +++ b/bookwyrm/tests/views/test_list_actions.py @@ -15,46 +15,49 @@ class ListActionViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", - "rat@rat.com", - "ratword", - local=True, - localname="rat", - remote_id="https://example.com/users/rat", - ) - work = models.Work.objects.create(title="Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) - work_two = models.Work.objects.create(title="Labori") - self.book_two = models.Edition.objects.create( - title="Example Edition 2", - remote_id="https://example.com/book/2", - parent_work=work_two, - ) - work_three = models.Work.objects.create(title="Trabajar") - self.book_three = models.Edition.objects.create( - title="Example Edition 3", - remote_id="https://example.com/book/3", - parent_work=work_three, - ) - work_four = models.Work.objects.create(title="Travailler") - self.book_four = models.Edition.objects.create( - title="Example Edition 4", - remote_id="https://example.com/book/4", - parent_work=work_four, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + ) + + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) + work_two = models.Work.objects.create(title="Labori") + self.book_two = models.Edition.objects.create( + title="Example Edition 2", + remote_id="https://example.com/book/2", + parent_work=work_two, + ) + work_three = models.Work.objects.create(title="Trabajar") + self.book_three = models.Edition.objects.create( + title="Example Edition 3", + remote_id="https://example.com/book/3", + parent_work=work_three, + ) + work_four = models.Work.objects.create(title="Travailler") + self.book_four = models.Edition.objects.create( + title="Example Edition 4", + remote_id="https://example.com/book/4", + parent_work=work_four, + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): self.list = models.List.objects.create( @@ -62,7 +65,8 @@ class ListActionViews(TestCase): ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_curate_approve(self): """approve a pending item""" diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py index 182753f91..1de196c56 100644 --- a/bookwyrm/tests/views/test_notifications.py +++ b/bookwyrm/tests/views/test_notifications.py @@ -2,6 +2,7 @@ from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory +from unittest.mock import patch from bookwyrm import models from bookwyrm import views @@ -13,14 +14,16 @@ class NotificationViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_notifications_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_outbox.py b/bookwyrm/tests/views/test_outbox.py index f89258e5f..8877a2441 100644 --- a/bookwyrm/tests/views/test_outbox.py +++ b/bookwyrm/tests/views/test_outbox.py @@ -18,20 +18,22 @@ class OutboxView(TestCase): def setUp(self): """we'll need some data""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) def test_outbox(self, _): """returns user's statuses""" @@ -79,13 +81,16 @@ class OutboxView(TestCase): def test_outbox_filter(self, _): """if we only care about reviews, only get reviews""" with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - models.Review.objects.create( - content="look at this", - name="hi", - rating=1, - book=self.book, - user=self.local_user, - ) + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): + models.Review.objects.create( + content="look at this", + name="hi", + rating=1, + book=self.book, + user=self.local_user, + ) models.Status.objects.create(content="look at this", user=self.local_user) request = self.factory.get("", {"type": "bleh"}) @@ -105,13 +110,16 @@ class OutboxView(TestCase): def test_outbox_bookwyrm_request_true(self, _): """should differentiate between bookwyrm and outside requests""" with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - models.Review.objects.create( - name="hi", - content="look at this", - user=self.local_user, - book=self.book, - privacy="public", - ) + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): + models.Review.objects.create( + name="hi", + content="look at this", + user=self.local_user, + book=self.book, + privacy="public", + ) request = self.factory.get("", {"page": 1}, HTTP_USER_AGENT=USER_AGENT) result = views.Outbox.as_view()(request, "mouse") @@ -123,13 +131,16 @@ class OutboxView(TestCase): def test_outbox_bookwyrm_request_false(self, _): """should differentiate between bookwyrm and outside requests""" with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - models.Review.objects.create( - name="hi", - content="look at this", - user=self.local_user, - book=self.book, - privacy="public", - ) + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): + models.Review.objects.create( + name="hi", + content="look at this", + user=self.local_user, + book=self.book, + privacy="public", + ) request = self.factory.get("", {"page": 1}) result = views.Outbox.as_view()(request, "mouse") diff --git a/bookwyrm/tests/views/test_password.py b/bookwyrm/tests/views/test_password.py index ec686db74..982056b5a 100644 --- a/bookwyrm/tests/views/test_password.py +++ b/bookwyrm/tests/views/test_password.py @@ -15,16 +15,18 @@ class PasswordViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "password", - local=True, - localname="mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "password", + local=True, + localname="mouse", + ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - models.SiteSettings.objects.create(id=1) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create(id=1) def test_password_reset_request(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py index c591aa604..5a59ab992 100644 --- a/bookwyrm/tests/views/test_reading.py +++ b/bookwyrm/tests/views/test_reading.py @@ -15,20 +15,22 @@ class ReadingViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Test Book", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Test Book", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py index 882c79291..a0050a82d 100644 --- a/bookwyrm/tests/views/test_readthrough.py +++ b/bookwyrm/tests/views/test_readthrough.py @@ -15,15 +15,17 @@ class ReadThrough(TestCase): """basic user and book data""" self.client = Client() - self.work = models.Work.objects.create(title="Example Work") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Example Work") - self.edition = models.Edition.objects.create( - title="Example Edition", parent_work=self.work - ) + self.edition = models.Edition.objects.create( + title="Example Edition", parent_work=self.work + ) - self.user = models.User.objects.create_user( - "cinco", "cinco@example.com", "seissiete", local=True, localname="cinco" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "cinco", "cinco@example.com", "seissiete", local=True, localname="cinco" + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): self.client.force_login(self.user) diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py index 84539489d..7944d8b45 100644 --- a/bookwyrm/tests/views/test_reports.py +++ b/bookwyrm/tests/views/test_reports.py @@ -2,6 +2,7 @@ from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory +from unittest.mock import patch from bookwyrm import forms, models, views @@ -12,21 +13,23 @@ class ReportViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", - "rat@mouse.mouse", - "password", - local=True, - localname="rat", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", + "rat@mouse.mouse", + "password", + local=True, + localname="rat", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_reports_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py index eacb3c936..57961a316 100644 --- a/bookwyrm/tests/views/test_rss_feed.py +++ b/bookwyrm/tests/views/test_rss_feed.py @@ -12,39 +12,45 @@ class RssFeedView(TestCase): def setUp(self): """test data""" - self.site = models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + self.site = models.SiteSettings.objects.create() - self.user = models.User.objects.create_user( - "rss_user", "rss@test.rss", "password", local=True - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "rss_user", "rss@test.rss", "password", local=True + ) - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - self.review = models.Review.objects.create( - name="Review name", - content="test content", - rating=3, - user=self.user, - book=self.book, - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + with patch("bookwyrm.activitystreams.ActivityStream.add_status"): + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): + self.review = models.Review.objects.create( + name="Review name", + content="test content", + rating=3, + user=self.user, + book=self.book, + ) - self.quote = models.Quotation.objects.create( - quote="a sickening sense", - content="test content", - user=self.user, - book=self.book, - ) + self.quote = models.Quotation.objects.create( + quote="a sickening sense", + content="test content", + user=self.user, + book=self.book, + ) - self.generatednote = models.GeneratedNote.objects.create( - content="test content", user=self.user - ) + self.generatednote = models.GeneratedNote.objects.create( + content="test content", user=self.user + ) self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py index ab2c910d4..56413de63 100644 --- a/bookwyrm/tests/views/test_search.py +++ b/bookwyrm/tests/views/test_search.py @@ -19,24 +19,27 @@ class Views(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Test Book", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Test Book", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) models.Connector.objects.create( identifier="self", connector_file="self_connector", local=True ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_search_json_response(self): """searches local data only and returns book data in json format""" diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py index 239b3318f..21a305444 100644 --- a/bookwyrm/tests/views/test_shelf.py +++ b/bookwyrm/tests/views/test_shelf.py @@ -16,25 +16,28 @@ class ShelfViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): self.shelf = models.Shelf.objects.create( name="Test Shelf", identifier="test-shelf", user=self.local_user ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_shelf_page(self, _): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index 6f2fd30d4..c12fd0c43 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -15,14 +15,15 @@ class StatusViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) with patch("bookwyrm.models.user.set_remote_server"): self.remote_user = models.User.objects.create_user( "rat", @@ -34,13 +35,15 @@ class StatusViews(TestCase): outbox="https://example.com/users/rat/outbox", ) - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_handle_status(self, _): """create a status""" @@ -68,9 +71,10 @@ class StatusViews(TestCase): def test_handle_status_reply(self, _): """create a status in reply to an existing status""" view = views.CreateStatus.as_view() - user = models.User.objects.create_user( - "rat", "rat@rat.com", "password", local=True - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = models.User.objects.create_user( + "rat", "rat@rat.com", "password", local=True + ) with patch("bookwyrm.activitystreams.ActivityStream.add_status"): parent = models.Status.objects.create( content="parent status", user=self.local_user @@ -98,9 +102,14 @@ class StatusViews(TestCase): def test_handle_status_mentions(self, _): """@mention a user in a post""" view = views.CreateStatus.as_view() - user = models.User.objects.create_user( - "rat@%s" % DOMAIN, "rat@rat.com", "password", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = models.User.objects.create_user( + "rat@%s" % DOMAIN, + "rat@rat.com", + "password", + local=True, + localname="rat", + ) form = forms.CommentForm( { "content": "hi @rat", @@ -126,9 +135,10 @@ class StatusViews(TestCase): def test_handle_status_reply_with_mentions(self, _): """reply to a post with an @mention'ed user""" view = views.CreateStatus.as_view() - user = models.User.objects.create_user( - "rat", "rat@rat.com", "password", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = models.User.objects.create_user( + "rat", "rat@rat.com", "password", local=True, localname="rat" + ) form = forms.CommentForm( { "content": "hi @rat@example.com", @@ -193,10 +203,11 @@ class StatusViews(TestCase): view = views.DeleteAndRedraft.as_view() request = self.factory.post("") request.user = self.local_user - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - status = models.ReviewRating.objects.create( - book=self.book, rating=2.0, user=self.local_user - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.activitystreams.ActivityStream.add_status"): + status = models.ReviewRating.objects.create( + book=self.book, rating=2.0, user=self.local_user + ) with patch( "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" @@ -230,13 +241,14 @@ class StatusViews(TestCase): def test_find_mentions(self, _): """detect and look up @ mentions of users""" - user = models.User.objects.create_user( - "nutria@%s" % DOMAIN, - "nutria@nutria.com", - "password", - local=True, - localname="nutria", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = models.User.objects.create_user( + "nutria@%s" % DOMAIN, + "nutria@nutria.com", + "password", + local=True, + localname="nutria", + ) self.assertEqual(user.username, "nutria@%s" % DOMAIN) self.assertEqual( diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py index fb003f8de..07800e2f7 100644 --- a/bookwyrm/tests/views/test_updates.py +++ b/bookwyrm/tests/views/test_updates.py @@ -14,15 +14,17 @@ class UpdateViews(TestCase): def setUp(self): """we need basic test data and mocks""" - self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.factory = RequestFactory() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_get_notification_count(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index 3fa78e355..1badf142a 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -20,18 +20,20 @@ class UserViews(TestCase): def setUp(self): """we need basic test data and mocks""" - self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" - ) - self.book = models.Edition.objects.create(title="test") + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.factory = RequestFactory() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create(title="test") with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): models.ShelfBook.objects.create( book=self.book, @@ -39,7 +41,8 @@ class UserViews(TestCase): shelf=self.local_user.shelf_set.first(), ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False diff --git a/bookwyrm/tests/views/test_user_admin.py b/bookwyrm/tests/views/test_user_admin.py index a044a22c5..ac750be00 100644 --- a/bookwyrm/tests/views/test_user_admin.py +++ b/bookwyrm/tests/views/test_user_admin.py @@ -14,14 +14,16 @@ class UserAdminViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_user_admin_list_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py index 244921d47..bd291d04b 100644 --- a/bookwyrm/tests/views/test_wellknown.py +++ b/bookwyrm/tests/views/test_wellknown.py @@ -15,17 +15,18 @@ class UserViews(TestCase): def setUp(self): """we need basic test data and mocks""" - self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.User.objects.create_user( - "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.factory = RequestFactory() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + models.User.objects.create_user( + "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" + ) with patch("bookwyrm.models.user.set_remote_server.delay"): models.User.objects.create_user( "rat", @@ -36,7 +37,8 @@ class UserViews(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False From b8bff8a882a3f7d62ee7677a4a008a2823053c18 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 27 May 2021 21:09:57 +0200 Subject: [PATCH 029/130] Use field tracker to launch task on field change --- bookwyrm/models/book.py | 8 ++++++-- bookwyrm/models/site.py | 7 +++++-- bookwyrm/models/status.py | 10 ++++++++-- bookwyrm/models/user.py | 6 ++++-- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index aa9a56017..398517bab 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -3,6 +3,7 @@ import re from django.db import models from django.dispatch import receiver +from model_utils import FieldTracker from model_utils.managers import InheritanceManager from bookwyrm import activitypub @@ -92,6 +93,7 @@ class Book(BookDataModel): published_date = fields.DateTimeField(blank=True, null=True) objects = InheritanceManager() + field_tracker = FieldTracker(fields=['authors', 'title', 'subtitle', 'cover']) @property def author_text(self): @@ -304,7 +306,9 @@ def isbn_13_to_10(isbn_13): @receiver(models.signals.post_save, sender=Edition) # pylint: disable=unused-argument def preview_image(instance, *args, **kwargs): - updated_fields = kwargs["update_fields"] + changed_fields = {} + if instance.field_tracker: + changed_fields = instance.field_tracker.changed() - if not updated_fields or "preview_image" not in updated_fields: + if len(changed_fields) > 0: generate_edition_preview_image_task.delay(instance.id) diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index d0076dc63..c9c015e1e 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -6,6 +6,7 @@ from Crypto import Random from django.db import models, IntegrityError from django.dispatch import receiver from django.utils import timezone +from model_utils import FieldTracker from bookwyrm.preview_images import generate_site_preview_image_task from bookwyrm.settings import DOMAIN @@ -48,6 +49,8 @@ class SiteSettings(models.Model): admin_email = models.EmailField(max_length=255, null=True, blank=True) footer_item = models.TextField(null=True, blank=True) + field_tracker = FieldTracker(fields=['name', 'instance_tagline', 'logo']) + @classmethod def get(cls): """gets the site settings db entry or defaults""" @@ -130,7 +133,7 @@ class PasswordReset(models.Model): @receiver(models.signals.post_save, sender=SiteSettings) # pylint: disable=unused-argument def preview_image(instance, *args, **kwargs): - updated_fields = kwargs["update_fields"] + changed_fields = instance.field_tracker.changed() - if not updated_fields or "preview_image" not in updated_fields: + if len(changed_fields) > 0: generate_site_preview_image_task.delay() diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index c55cd8d69..feedc02a5 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -8,6 +8,7 @@ from django.db import models from django.dispatch import receiver from django.template.loader import get_template from django.utils import timezone +from model_utils import FieldTracker from model_utils.managers import InheritanceManager from bookwyrm import activitypub @@ -306,6 +307,8 @@ class Review(Status): max_digits=3, ) + field_tracker = FieldTracker(fields=['rating']) + @property def pure_name(self): """clarify review names for mastodon serialization""" @@ -406,5 +409,8 @@ class Boost(ActivityMixin, Status): # pylint: disable=unused-argument def preview_image(instance, sender, *args, **kwargs): if sender in (Review, ReviewRating): - edition = instance.book - generate_edition_preview_image_task.delay(edition.id) + changed_fields = instance.field_tracker.changed() + + if len(changed_fields) > 0: + edition = instance.book + generate_edition_preview_image_task.delay(edition.id) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index 2c4851520..f2c700b6c 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -9,6 +9,7 @@ from django.core.validators import MinValueValidator from django.dispatch import receiver from django.db import models from django.utils import timezone +from model_utils import FieldTracker import pytz from bookwyrm import activitypub @@ -122,6 +123,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): name_field = "username" property_fields = [("following_link", "following")] + field_tracker = FieldTracker(fields=['name', 'avatar']) @property def following_link(self): @@ -453,7 +455,7 @@ def get_remote_reviews(outbox): @receiver(models.signals.post_save, sender=User) # pylint: disable=unused-argument def preview_image(instance, *args, **kwargs): - updated_fields = kwargs["update_fields"] + changed_fields = instance.field_tracker.changed() - if not updated_fields or "preview_image" not in updated_fields: + if len(changed_fields) > 0: generate_user_preview_image_task.delay(instance.id) From b7965ce2aef2e4984154c00696ab5d45d4de3206 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 27 May 2021 21:37:27 +0200 Subject: [PATCH 030/130] Fix tests --- bookwyrm/tests/activitypub/test_person.py | 5 +- bookwyrm/tests/activitypub/test_quotation.py | 21 ++-- .../tests/connectors/test_self_connector.py | 2 +- .../tests/management/test_populate_streams.py | 20 ++-- .../tests/models/test_activitypub_mixin.py | 108 +++++++++--------- bookwyrm/tests/models/test_base_model.py | 20 ++-- .../tests/models/test_federated_server.py | 47 ++++---- .../tests/models/test_relationship_models.py | 20 ++-- bookwyrm/tests/models/test_status_model.py | 29 ++--- bookwyrm/tests/models/test_user_model.py | 19 +-- bookwyrm/tests/test_activitystreams.py | 20 ++-- bookwyrm/tests/test_signing.py | 34 +++--- bookwyrm/tests/test_templatetags.py | 37 +++--- bookwyrm/tests/views/inbox/test_inbox.py | 20 ++-- bookwyrm/tests/views/inbox/test_inbox_add.py | 20 ++-- .../tests/views/inbox/test_inbox_announce.py | 20 ++-- .../tests/views/inbox/test_inbox_block.py | 20 ++-- .../tests/views/inbox/test_inbox_create.py | 20 ++-- .../tests/views/inbox/test_inbox_delete.py | 23 ++-- .../tests/views/inbox/test_inbox_follow.py | 20 ++-- bookwyrm/tests/views/inbox/test_inbox_like.py | 20 ++-- .../tests/views/inbox/test_inbox_remove.py | 20 ++-- .../tests/views/inbox/test_inbox_update.py | 20 ++-- bookwyrm/tests/views/test_block.py | 20 ++-- bookwyrm/tests/views/test_federation.py | 20 ++-- bookwyrm/tests/views/test_follow.py | 20 ++-- bookwyrm/tests/views/test_helpers.py | 22 ++-- bookwyrm/tests/views/test_interaction.py | 20 ++-- bookwyrm/tests/views/test_reading.py | 20 ++-- bookwyrm/tests/views/test_status.py | 20 ++-- bookwyrm/tests/views/test_wellknown.py | 20 ++-- 31 files changed, 380 insertions(+), 367 deletions(-) diff --git a/bookwyrm/tests/activitypub/test_person.py b/bookwyrm/tests/activitypub/test_person.py index 67aaf891e..20dbcdfb5 100644 --- a/bookwyrm/tests/activitypub/test_person.py +++ b/bookwyrm/tests/activitypub/test_person.py @@ -20,8 +20,9 @@ class Person(TestCase): def test_user_to_model(self): activity = activitypub.Person(**self.user_data) - with patch("bookwyrm.models.user.set_remote_server.delay"): - user = activity.to_model(model=models.User) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + user = activity.to_model(model=models.User) self.assertEqual(user.username, "mouse@example.com") self.assertEqual(user.remote_id, "https://example.com/user/mouse") self.assertFalse(user.local) diff --git a/bookwyrm/tests/activitypub/test_quotation.py b/bookwyrm/tests/activitypub/test_quotation.py index 7d1b28698..59d4b1b61 100644 --- a/bookwyrm/tests/activitypub/test_quotation.py +++ b/bookwyrm/tests/activitypub/test_quotation.py @@ -12,16 +12,17 @@ class Quotation(TestCase): def setUp(self): """model objects we'll need""" - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.user = models.User.objects.create_user( - "mouse", - "mouse@mouse.mouse", - "mouseword", - local=False, - inbox="https://example.com/user/mouse/inbox", - outbox="https://example.com/user/mouse/outbox", - remote_id="https://example.com/user/mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.user = models.User.objects.create_user( + "mouse", + "mouse@mouse.mouse", + "mouseword", + local=False, + inbox="https://example.com/user/mouse/inbox", + outbox="https://example.com/user/mouse/outbox", + remote_id="https://example.com/user/mouse", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.book = models.Edition.objects.create( title="Example Edition", diff --git a/bookwyrm/tests/connectors/test_self_connector.py b/bookwyrm/tests/connectors/test_self_connector.py index e49d9671f..e6e64a7dc 100644 --- a/bookwyrm/tests/connectors/test_self_connector.py +++ b/bookwyrm/tests/connectors/test_self_connector.py @@ -82,7 +82,7 @@ class SelfConnector(TestCase): def test_search_multiple_editions(self): """it should get rid of duplicate editions for the same work""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): work = models.Work.objects.create(title="Work Title") edition_1 = models.Edition.objects.create( title="Edition 1 Title", parent_work=work diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py index f6d24c53a..1705cd348 100644 --- a/bookwyrm/tests/management/test_populate_streams.py +++ b/bookwyrm/tests/management/test_populate_streams.py @@ -23,16 +23,16 @@ class Activitystreams(TestCase): local=True, localname="nutria", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.book = models.Edition.objects.create(title="test book") diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py index 348270edf..020d031d2 100644 --- a/bookwyrm/tests/models/test_activitypub_mixin.py +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -25,16 +25,16 @@ class ActivitypubMixins(TestCase): ) self.local_user.remote_id = "http://example.com/a/b" self.local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) self.object_mock = { "to": "to field", @@ -143,16 +143,17 @@ class ActivitypubMixins(TestCase): MockSelf = namedtuple("Self", ("privacy", "user")) mock_self = MockSelf("public", self.local_user) self.local_user.followers.add(self.remote_user) - with patch("bookwyrm.models.user.set_remote_server.delay"): - another_remote_user = models.User.objects.create_user( - "nutria", - "nutria@nutria.com", - "nutriaword", - local=False, - remote_id="https://example.com/users/nutria", - inbox="https://example.com/users/nutria/inbox", - outbox="https://example.com/users/nutria/outbox", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + another_remote_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.com", + "nutriaword", + local=False, + remote_id="https://example.com/users/nutria", + inbox="https://example.com/users/nutria/inbox", + outbox="https://example.com/users/nutria/outbox", + ) MockSelf = namedtuple("Self", ("privacy", "user", "recipients")) mock_self = MockSelf("public", self.local_user, [another_remote_user]) @@ -166,16 +167,17 @@ class ActivitypubMixins(TestCase): MockSelf = namedtuple("Self", ("privacy", "user")) mock_self = MockSelf("public", self.local_user) self.local_user.followers.add(self.remote_user) - with patch("bookwyrm.models.user.set_remote_server.delay"): - another_remote_user = models.User.objects.create_user( - "nutria", - "nutria@nutria.com", - "nutriaword", - local=False, - remote_id="https://example.com/users/nutria", - inbox="https://example.com/users/nutria/inbox", - outbox="https://example.com/users/nutria/outbox", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + another_remote_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.com", + "nutriaword", + local=False, + remote_id="https://example.com/users/nutria", + inbox="https://example.com/users/nutria/inbox", + outbox="https://example.com/users/nutria/outbox", + ) MockSelf = namedtuple("Self", ("privacy", "user", "recipients")) mock_self = MockSelf("direct", self.local_user, [another_remote_user]) @@ -187,17 +189,18 @@ class ActivitypubMixins(TestCase): """should combine users with the same shared_inbox""" self.remote_user.shared_inbox = "http://example.com/inbox" self.remote_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - another_remote_user = models.User.objects.create_user( - "nutria", - "nutria@nutria.com", - "nutriaword", - local=False, - remote_id="https://example.com/users/nutria", - inbox="https://example.com/users/nutria/inbox", - shared_inbox="http://example.com/inbox", - outbox="https://example.com/users/nutria/outbox", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + another_remote_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.com", + "nutriaword", + local=False, + remote_id="https://example.com/users/nutria", + inbox="https://example.com/users/nutria/inbox", + shared_inbox="http://example.com/inbox", + outbox="https://example.com/users/nutria/outbox", + ) MockSelf = namedtuple("Self", ("privacy", "user")) mock_self = MockSelf("public", self.local_user) self.local_user.followers.add(self.remote_user) @@ -209,17 +212,18 @@ class ActivitypubMixins(TestCase): def test_get_recipients_software(self, _): """should differentiate between bookwyrm and other remote users""" - with patch("bookwyrm.models.user.set_remote_server.delay"): - another_remote_user = models.User.objects.create_user( - "nutria", - "nutria@nutria.com", - "nutriaword", - local=False, - remote_id="https://example.com/users/nutria", - inbox="https://example.com/users/nutria/inbox", - outbox="https://example.com/users/nutria/outbox", - bookwyrm_user=False, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + another_remote_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.com", + "nutriaword", + local=False, + remote_id="https://example.com/users/nutria", + inbox="https://example.com/users/nutria/inbox", + outbox="https://example.com/users/nutria/outbox", + bookwyrm_user=False, + ) MockSelf = namedtuple("Self", ("privacy", "user")) mock_self = MockSelf("public", self.local_user) self.local_user.followers.add(self.remote_user) diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index 8b0e55b7f..496a86104 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -16,16 +16,16 @@ class BaseModel(TestCase): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) class BookWyrmTestModel(base_model.BookWyrmModel): """just making it not abstract""" diff --git a/bookwyrm/tests/models/test_federated_server.py b/bookwyrm/tests/models/test_federated_server.py index 43724568d..fabd69eea 100644 --- a/bookwyrm/tests/models/test_federated_server.py +++ b/bookwyrm/tests/models/test_federated_server.py @@ -11,29 +11,30 @@ class FederatedServer(TestCase): def setUp(self): """we'll need a user""" self.server = models.FederatedServer.objects.create(server_name="test.server") - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - federated_server=self.server, - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - self.inactive_remote_user = models.User.objects.create_user( - "nutria", - "nutria@nutria.com", - "nutriaword", - federated_server=self.server, - local=False, - remote_id="https://example.com/users/nutria", - inbox="https://example.com/users/nutria/inbox", - outbox="https://example.com/users/nutria/outbox", - is_active=False, - deactivation_reason="self_deletion", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + federated_server=self.server, + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) + self.inactive_remote_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.com", + "nutriaword", + federated_server=self.server, + local=False, + remote_id="https://example.com/users/nutria", + inbox="https://example.com/users/nutria/inbox", + outbox="https://example.com/users/nutria/outbox", + is_active=False, + deactivation_reason="self_deletion", + ) def test_block_unblock(self): """block a server and all users on it""" diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py index 516bfeb12..0a630dd12 100644 --- a/bookwyrm/tests/models/test_relationship_models.py +++ b/bookwyrm/tests/models/test_relationship_models.py @@ -10,17 +10,17 @@ class Relationship(TestCase): def setUp(self): """we need some users for this""" - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index 0005c507e..db4475c78 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -25,16 +25,16 @@ class Status(TestCase): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.book = models.Edition.objects.create(title="Test Edition") @@ -356,11 +356,12 @@ class Status(TestCase): status = models.Status.objects.create( content="test content", user=self.local_user ) - fav = models.Favorite.objects.create(status=status, user=self.local_user) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + fav = models.Favorite.objects.create(status=status, user=self.local_user) - # can't fav a status twice - with self.assertRaises(IntegrityError): - models.Favorite.objects.create(status=status, user=self.local_user) + # can't fav a status twice + with self.assertRaises(IntegrityError): + models.Favorite.objects.create(status=status, user=self.local_user) activity = fav.to_activity() self.assertEqual(activity["type"], "Like") diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index 96ec955a3..b6c716638 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -35,15 +35,16 @@ class User(TestCase): self.assertIsNotNone(self.user.key_pair.public_key) def test_remote_user(self): - with patch("bookwyrm.models.user.set_remote_server.delay"): - user = models.User.objects.create_user( - "rat", - "rat@rat.rat", - "ratword", - local=False, - remote_id="https://example.com/dfjkg", - bookwyrm_user=False, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + user = models.User.objects.create_user( + "rat", + "rat@rat.rat", + "ratword", + local=False, + remote_id="https://example.com/dfjkg", + bookwyrm_user=False, + ) self.assertEqual(user.username, "rat@example.com") def test_user_shelves(self): diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py index bbd6dff9f..da335e894 100644 --- a/bookwyrm/tests/test_activitystreams.py +++ b/bookwyrm/tests/test_activitystreams.py @@ -22,16 +22,16 @@ class Activitystreams(TestCase): local=True, localname="nutria", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.book = models.Edition.objects.create(title="test book") diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py index 5a2f1b748..b9b1af261 100644 --- a/bookwyrm/tests/test_signing.py +++ b/bookwyrm/tests/test_signing.py @@ -119,9 +119,10 @@ class Signature(TestCase): status=200, ) - with patch("bookwyrm.models.user.get_remote_reviews.delay"): - response = self.send_test_request(sender=self.fake_remote) - self.assertEqual(response.status_code, 200) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.get_remote_reviews.delay"): + response = self.send_test_request(sender=self.fake_remote) + self.assertEqual(response.status_code, 200) @responses.activate def test_key_needs_refresh(self): @@ -142,22 +143,23 @@ class Signature(TestCase): data["publicKey"]["publicKeyPem"] = key_pair.public_key responses.add(responses.GET, self.fake_remote.remote_id, json=data, status=200) - with patch("bookwyrm.models.user.get_remote_reviews.delay"): - # Key correct: - response = self.send_test_request(sender=self.fake_remote) - self.assertEqual(response.status_code, 200) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.get_remote_reviews.delay"): + # Key correct: + response = self.send_test_request(sender=self.fake_remote) + self.assertEqual(response.status_code, 200) - # Old key is cached, so still works: - response = self.send_test_request(sender=self.fake_remote) - self.assertEqual(response.status_code, 200) + # Old key is cached, so still works: + response = self.send_test_request(sender=self.fake_remote) + self.assertEqual(response.status_code, 200) - # Try with new key: - response = self.send_test_request(sender=new_sender) - self.assertEqual(response.status_code, 200) + # Try with new key: + response = self.send_test_request(sender=new_sender) + self.assertEqual(response.status_code, 200) - # Now the old key will fail: - response = self.send_test_request(sender=self.fake_remote) - self.assertEqual(response.status_code, 401) + # Now the old key will fail: + response = self.send_test_request(sender=self.fake_remote) + self.assertEqual(response.status_code, 401) @responses.activate def test_nonexistent_signer(self): diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py index a472ac74b..9a215cadf 100644 --- a/bookwyrm/tests/test_templatetags.py +++ b/bookwyrm/tests/test_templatetags.py @@ -29,14 +29,14 @@ class TemplateTags(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.rat", - "ratword", - remote_id="http://example.com/rat", - local=False, - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.rat", + "ratword", + remote_id="http://example.com/rat", + local=False, + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.book = models.Edition.objects.create(title="Test Book") @@ -146,19 +146,20 @@ class TemplateTags(TestCase): def test_get_book_description(self, _): """grab it from the edition or the parent""" - work = models.Work.objects.create(title="Test Work") - self.book.parent_work = work - self.book.save() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book.parent_work = work + self.book.save() - self.assertIsNone(bookwyrm_tags.get_book_description(self.book)) + self.assertIsNone(bookwyrm_tags.get_book_description(self.book)) - work.description = "hi" - work.save() - self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hi") + work.description = "hi" + work.save() + self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hi") - self.book.description = "hello" - self.book.save() - self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hello") + self.book.description = "hello" + self.book.save() + self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hello") def test_get_uuid(self, _): """uuid functionality""" diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py index ccd3a5e5e..0ac813bb1 100644 --- a/bookwyrm/tests/views/inbox/test_inbox.py +++ b/bookwyrm/tests/views/inbox/test_inbox.py @@ -29,16 +29,16 @@ class Inbox(TestCase): ) local_user.remote_id = "https://example.com/user/mouse" local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) self.create_json = { "id": "hi", "type": "Create", diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py index c1fd90fea..2862fdf57 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_add.py +++ b/bookwyrm/tests/views/inbox/test_inbox_add.py @@ -23,16 +23,16 @@ class InboxAdd(TestCase): ) local_user.remote_id = "https://example.com/user/mouse" local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): work = models.Work.objects.create(title="work title") self.book = models.Edition.objects.create( diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py index 853266ed1..4815c6895 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_announce.py +++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py @@ -23,16 +23,16 @@ class InboxActivities(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py index 310a6fa67..8c12e42bf 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_block.py +++ b/bookwyrm/tests/views/inbox/test_inbox_block.py @@ -22,16 +22,16 @@ class InboxBlock(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py index 3f677bd2e..a885239b6 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_create.py +++ b/bookwyrm/tests/views/inbox/test_inbox_create.py @@ -25,6 +25,16 @@ class InboxCreate(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): self.status = models.Status.objects.create( @@ -32,16 +42,6 @@ class InboxCreate(TestCase): content="Test status", remote_id="https://example.com/status/1", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) self.create_json = { "id": "hi", diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py index 07b286a54..067a30ad3 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_delete.py +++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py @@ -23,16 +23,16 @@ class InboxActivities(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.activitystreams.ActivityStream.add_status"): self.status = models.Status.objects.create( user=self.remote_user, @@ -119,7 +119,8 @@ class InboxActivities(TestCase): "object": self.remote_user.remote_id, } - views.inbox.activity_task(activity) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + views.inbox.activity_task(activity) self.assertFalse(models.User.objects.get(username="rat@example.com").is_active) def test_delete_user_unknown(self): diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py index 5d5dcd4ea..063ad5d39 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_follow.py +++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py @@ -23,17 +23,17 @@ class InboxRelationships(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py index aa10f93fe..5d072fb0c 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_like.py +++ b/bookwyrm/tests/views/inbox/test_inbox_like.py @@ -22,16 +22,16 @@ class InboxActivities(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py index 3c2e72d64..2812ef1ff 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_remove.py +++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py @@ -22,16 +22,16 @@ class InboxRemove(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.work = models.Work.objects.create(title="work title") diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py index 78d694a2a..39ac4a895 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_update.py +++ b/bookwyrm/tests/views/inbox/test_inbox_update.py @@ -24,16 +24,16 @@ class InboxUpdate(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) self.create_json = { "id": "hi", diff --git a/bookwyrm/tests/views/test_block.py b/bookwyrm/tests/views/test_block.py index 80d20f11b..d640617cd 100644 --- a/bookwyrm/tests/views/test_block.py +++ b/bookwyrm/tests/views/test_block.py @@ -22,16 +22,16 @@ class BlockViews(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py index b4d81d54c..9ff122552 100644 --- a/bookwyrm/tests/views/test_federation.py +++ b/bookwyrm/tests/views/test_federation.py @@ -23,16 +23,16 @@ class FederationViews(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py index 8ea8accc5..f37370cc6 100644 --- a/bookwyrm/tests/views/test_follow.py +++ b/bookwyrm/tests/views/test_follow.py @@ -25,16 +25,16 @@ class BookViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@email.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@email.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) self.group = Group.objects.create(name="editor") self.group.permissions.add( Permission.objects.create( diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index bc99e69fd..f0807c55b 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -29,6 +29,17 @@ class ViewsHelpers(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + discoverable=True, + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.work = models.Work.objects.create(title="Test Work") self.book = models.Edition.objects.create( @@ -36,17 +47,6 @@ class ViewsHelpers(TestCase): remote_id="https://example.com/book/1", parent_work=self.work, ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - discoverable=True, - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") self.userdata = json.loads(datafile.read_bytes()) del self.userdata["icon"] diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py index 208d270ce..cb974dcdb 100644 --- a/bookwyrm/tests/views/test_interaction.py +++ b/bookwyrm/tests/views/test_interaction.py @@ -23,16 +23,16 @@ class InteractionViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@email.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@email.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): work = models.Work.objects.create(title="Test Work") diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py index 5a59ab992..1ffdde732 100644 --- a/bookwyrm/tests/views/test_reading.py +++ b/bookwyrm/tests/views/test_reading.py @@ -24,6 +24,16 @@ class ReadingViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.work = models.Work.objects.create(title="Test Work") self.book = models.Edition.objects.create( @@ -31,16 +41,6 @@ class ReadingViews(TestCase): remote_id="https://example.com/book/1", parent_work=self.work, ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) def test_start_reading(self, _): """begin a book""" diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index c12fd0c43..9253e6e57 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -24,16 +24,16 @@ class StatusViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@email.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@email.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): work = models.Work.objects.create(title="Test Work") diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py index bd291d04b..839240ed6 100644 --- a/bookwyrm/tests/views/test_wellknown.py +++ b/bookwyrm/tests/views/test_wellknown.py @@ -27,16 +27,16 @@ class UserViews(TestCase): models.User.objects.create_user( "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - models.User.objects.create_user( - "rat", - "rat@remote.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + models.User.objects.create_user( + "rat", + "rat@remote.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): models.SiteSettings.objects.create() self.anonymous_user = AnonymousUser From d9d34d82201cd02af1905938e9be7694557dae4b Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 27 May 2021 21:40:23 +0200 Subject: [PATCH 031/130] Fix linting --- bookwyrm/models/book.py | 2 +- bookwyrm/models/site.py | 2 +- bookwyrm/models/status.py | 4 ++-- bookwyrm/models/user.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 398517bab..91ebbc463 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -93,7 +93,7 @@ class Book(BookDataModel): published_date = fields.DateTimeField(blank=True, null=True) objects = InheritanceManager() - field_tracker = FieldTracker(fields=['authors', 'title', 'subtitle', 'cover']) + field_tracker = FieldTracker(fields=["authors", "title", "subtitle", "cover"]) @property def author_text(self): diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index c9c015e1e..670816942 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -49,7 +49,7 @@ class SiteSettings(models.Model): admin_email = models.EmailField(max_length=255, null=True, blank=True) footer_item = models.TextField(null=True, blank=True) - field_tracker = FieldTracker(fields=['name', 'instance_tagline', 'logo']) + field_tracker = FieldTracker(fields=["name", "instance_tagline", "logo"]) @classmethod def get(cls): diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index feedc02a5..81c73bf52 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -307,7 +307,7 @@ class Review(Status): max_digits=3, ) - field_tracker = FieldTracker(fields=['rating']) + field_tracker = FieldTracker(fields=["rating"]) @property def pure_name(self): @@ -410,7 +410,7 @@ class Boost(ActivityMixin, Status): def preview_image(instance, sender, *args, **kwargs): if sender in (Review, ReviewRating): changed_fields = instance.field_tracker.changed() - + if len(changed_fields) > 0: edition = instance.book generate_edition_preview_image_task.delay(edition.id) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index f2c700b6c..be65483ca 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -123,7 +123,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): name_field = "username" property_fields = [("following_link", "following")] - field_tracker = FieldTracker(fields=['name', 'avatar']) + field_tracker = FieldTracker(fields=["name", "avatar"]) @property def following_link(self): From f8df5012391a8ae1dec8c6de2f8c9e3d7f2b7937 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 27 May 2021 23:19:17 +0200 Subject: [PATCH 032/130] Fix tests (for realz) --- .../tests/activitypub/test_base_activity.py | 9 ++-- .../connectors/test_abstract_connector.py | 5 +- .../connectors/test_openlibrary_connector.py | 11 +++-- .../tests/connectors/test_self_connector.py | 30 ++++++------ bookwyrm/tests/models/test_fields.py | 29 +++++------ bookwyrm/tests/models/test_import_model.py | 3 +- bookwyrm/tests/models/test_status_model.py | 2 +- .../tests/views/inbox/test_inbox_create.py | 7 +-- .../tests/views/inbox/test_inbox_update.py | 48 ++++++++++--------- bookwyrm/tests/views/test_book.py | 21 ++++---- bookwyrm/tests/views/test_get_started.py | 11 +++-- bookwyrm/tests/views/test_helpers.py | 9 ++-- bookwyrm/tests/views/test_user.py | 22 +++++---- 13 files changed, 112 insertions(+), 95 deletions(-) diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py index 54fbb49e6..9a88b1c66 100644 --- a/bookwyrm/tests/activitypub/test_base_activity.py +++ b/bookwyrm/tests/activitypub/test_base_activity.py @@ -98,10 +98,11 @@ class BaseActivity(TestCase): status=200, ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - result = resolve_remote_id( - "https://example.com/user/mouse", model=models.User - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + result = resolve_remote_id( + "https://example.com/user/mouse", model=models.User + ) self.assertIsInstance(result, models.User) self.assertEqual(result.remote_id, "https://example.com/user/mouse") self.assertEqual(result.name, "MOUSE?? MOUSE!!") diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index 9ca3c8f2f..68a4c7be2 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -111,8 +111,9 @@ class AbstractConnector(TestCase): responses.add( responses.GET, "https://example.com/book/abcd", json=self.edition_data ) - with patch("bookwyrm.connectors.abstract_connector.load_more_data.delay"): - result = self.connector.get_or_create_book("https://example.com/book/abcd") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.connectors.abstract_connector.load_more_data.delay"): + result = self.connector.get_or_create_book("https://example.com/book/abcd") self.assertEqual(result, self.book) self.assertEqual(models.Edition.objects.count(), 1) self.assertEqual(models.Edition.objects.count(), 1) diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py index 8c00061a4..b34a68d20 100644 --- a/bookwyrm/tests/connectors/test_openlibrary_connector.py +++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py @@ -230,11 +230,12 @@ class Openlibrary(TestCase): json={"hi": "there"}, status=200, ) - with patch( - "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" - ) as mock: - mock.return_value = [] - result = self.connector.create_edition_from_data(work, self.edition_data) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch( + "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" + ) as mock: + mock.return_value = [] + result = self.connector.create_edition_from_data(work, self.edition_data) self.assertEqual(result.parent_work, work) self.assertEqual(result.title, "Sabriel") self.assertEqual(result.isbn_10, "0060273224") diff --git a/bookwyrm/tests/connectors/test_self_connector.py b/bookwyrm/tests/connectors/test_self_connector.py index e6e64a7dc..4f2173085 100644 --- a/bookwyrm/tests/connectors/test_self_connector.py +++ b/bookwyrm/tests/connectors/test_self_connector.py @@ -36,7 +36,7 @@ class SelfConnector(TestCase): published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc), ) edition.authors.add(author) - result = self.connector.search("Edition of Example")[0] + result = self.connector.search("Edition of Example")[0] self.assertEqual(result.title, "Edition of Example Work") self.assertEqual(result.key, edition.remote_id) self.assertEqual(result.author, "Anonymous") @@ -46,7 +46,7 @@ class SelfConnector(TestCase): def test_search_rank(self): """prioritize certain results""" author = models.Author.objects.create(name="Anonymous") - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): edition = models.Edition.objects.create( title="Edition of Example Work", published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc), @@ -74,7 +74,7 @@ class SelfConnector(TestCase): title="An Edition", parent_work=models.Work.objects.create(title="") ) - results = self.connector.search("Anonymous") + results = self.connector.search("Anonymous") self.assertEqual(len(results), 3) self.assertEqual(results[0].title, "Anonymous") self.assertEqual(results[1].title, "More Editions") @@ -94,17 +94,17 @@ class SelfConnector(TestCase): ) edition_3 = models.Edition.objects.create(title="Fish", parent_work=work) - # pick the best edition - results = self.connector.search("Edition 1 Title") - self.assertEqual(len(results), 1) - self.assertEqual(results[0].key, edition_1.remote_id) + # pick the best edition + results = self.connector.search("Edition 1 Title") + self.assertEqual(len(results), 1) + self.assertEqual(results[0].key, edition_1.remote_id) - # pick the default edition when no match is best - results = self.connector.search("Edition Title") - self.assertEqual(len(results), 1) - self.assertEqual(results[0].key, edition_2.remote_id) + # pick the default edition when no match is best + results = self.connector.search("Edition Title") + self.assertEqual(len(results), 1) + self.assertEqual(results[0].key, edition_2.remote_id) - # only matches one edition, so no deduplication takes place - results = self.connector.search("Fish") - self.assertEqual(len(results), 1) - self.assertEqual(results[0].key, edition_3.remote_id) + # only matches one edition, so no deduplication takes place + results = self.connector.search("Fish") + self.assertEqual(len(results), 1) + self.assertEqual(results[0].key, edition_3.remote_id) diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index e8c48b0bb..2fb337517 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -254,12 +254,12 @@ class ActivitypubFields(TestCase): "rat", "rat@rat.rat", "ratword", local=True, localname="rat" ) - # test receiving an unknown remote id and loading data - responses.add( - responses.GET, "https://example.com/user/mouse", json=userdata, status=200 - ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - value = instance.field_from_activity("https://example.com/user/mouse") + # test receiving an unknown remote id and loading data + responses.add( + responses.GET, "https://example.com/user/mouse", json=userdata, status=200 + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + value = instance.field_from_activity("https://example.com/user/mouse") self.assertIsInstance(value, User) self.assertNotEqual(value, unrelated_user) self.assertEqual(value.remote_id, "https://example.com/user/mouse") @@ -278,8 +278,8 @@ class ActivitypubFields(TestCase): unrelated_user = User.objects.create_user( "rat", "rat@rat.rat", "ratword", local=True, localname="rat" ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - value = instance.field_from_activity(activitypub.Person(**userdata)) + with patch("bookwyrm.models.user.set_remote_server.delay"): + value = instance.field_from_activity(activitypub.Person(**userdata)) self.assertIsInstance(value, User) self.assertNotEqual(value, unrelated_user) self.assertEqual(value.remote_id, "https://example.com/user/mouse") @@ -302,8 +302,8 @@ class ActivitypubFields(TestCase): "rat", "rat@rat.rat", "ratword", local=True, localname="rat" ) - with patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast"): - value = instance.field_from_activity(activitypub.Person(**userdata)) + with patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast"): + value = instance.field_from_activity(activitypub.Person(**userdata)) self.assertEqual(value, user) def test_foreign_key_from_activity_str_existing(self): @@ -357,10 +357,11 @@ class ActivitypubFields(TestCase): responses.add( responses.GET, "https://example.com/user/mouse", json=userdata, status=200 ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - value = instance.field_from_activity( - ["https://example.com/user/mouse", "bleh"] - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + value = instance.field_from_activity( + ["https://example.com/user/mouse", "bleh"] + ) self.assertIsInstance(value, list) self.assertEqual(len(value), 1) self.assertIsInstance(value[0], User) diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py index 02263e0e4..15d8766c1 100644 --- a/bookwyrm/tests/models/test_import_model.py +++ b/bookwyrm/tests/models/test_import_model.py @@ -175,6 +175,7 @@ class ImportJob(TestCase): with patch( "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" ): - book = self.item_1.get_book_from_isbn() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = self.item_1.get_book_from_isbn() self.assertEqual(book.title, "Sabriel") diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index db4475c78..a14c515ee 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -60,7 +60,7 @@ class Status(TestCase): child = models.Status.objects.create( content="hello", reply_parent=parent, user=self.local_user ) - with patch("bookwyrm.preview_images.generate_edition_image_task.delay"): + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): models.Review.objects.create( content="hey", reply_parent=parent, user=self.local_user, book=self.book ) diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py index a885239b6..046291fb5 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_create.py +++ b/bookwyrm/tests/views/inbox/test_inbox_create.py @@ -162,9 +162,10 @@ class InboxCreate(TestCase): "rating": 3, "@context": "https://www.w3.org/ns/activitystreams", } - with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock: - views.inbox.activity_task(activity) - self.assertTrue(redis_mock.called) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock: + views.inbox.activity_task(activity) + self.assertTrue(redis_mock.called) rating = models.ReviewRating.objects.first() self.assertEqual(rating.book, book) self.assertEqual(rating.rating, 3.0) diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py index 39ac4a895..32cac4713 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_update.py +++ b/bookwyrm/tests/views/inbox/test_inbox_update.py @@ -98,16 +98,18 @@ class InboxUpdate(TestCase): del userdata["icon"] self.assertIsNone(self.remote_user.name) self.assertFalse(self.remote_user.discoverable) - views.inbox.activity_task( - { - "type": "Update", - "to": [], - "cc": [], - "actor": "hi", - "id": "sdkjf", - "object": userdata, - } - ) + + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + views.inbox.activity_task( + { + "type": "Update", + "to": [], + "cc": [], + "actor": "hi", + "id": "sdkjf", + "object": userdata, + } + ) user = models.User.objects.get(id=self.remote_user.id) self.assertEqual(user.name, "RAT???") self.assertEqual(user.username, "rat@example.com") @@ -130,20 +132,20 @@ class InboxUpdate(TestCase): title="Test Book", remote_id="https://bookwyrm.social/book/5989" ) - del bookdata["authors"] - self.assertEqual(book.title, "Test Book") + del bookdata["authors"] + self.assertEqual(book.title, "Test Book") - with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"): - views.inbox.activity_task( - { - "type": "Update", - "to": [], - "cc": [], - "actor": "hi", - "id": "sdkjf", - "object": bookdata, - } - ) + with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"): + views.inbox.activity_task( + { + "type": "Update", + "to": [], + "cc": [], + "actor": "hi", + "id": "sdkjf", + "object": bookdata, + } + ) book = models.Edition.objects.get(id=book.id) self.assertEqual(book.title, "Piranesi") self.assertEqual(book.last_edited_by, self.remote_user) diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py index 37bf3e9ee..375cdb038 100644 --- a/bookwyrm/tests/views/test_book.py +++ b/bookwyrm/tests/views/test_book.py @@ -74,7 +74,8 @@ class BookViews(TestCase): request = self.factory.get("") request.user = self.local_user request.user.is_superuser = True - result = view(request, self.book.id) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + result = view(request, self.book.id) self.assertIsInstance(result, TemplateResponse) result.render() self.assertEqual(result.status_code, 200) @@ -89,7 +90,7 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): view(request, self.book.id) @@ -127,7 +128,7 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): view(request, self.book.id) @@ -149,8 +150,9 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - view(request, self.book.id) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + view(request, self.book.id) self.book.refresh_from_db() self.assertEqual(self.book.title, "New Title") self.assertFalse(self.book.authors.exists()) @@ -165,7 +167,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - view(request) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + view(request) book = models.Edition.objects.get(title="New Title") self.assertEqual(book.parent_work.title, "New Title") @@ -180,7 +183,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - view(request) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + view(request) book = models.Edition.objects.get(title="New Title") self.assertEqual(book.parent_work, self.work) @@ -196,7 +200,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - view(request) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + view(request) book = models.Edition.objects.get(title="New Title") self.assertEqual(book.parent_work.title, "New Title") self.assertEqual(book.authors.first().name, "Sappho") diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py index 2eb89f10c..7a3b0c444 100644 --- a/bookwyrm/tests/views/test_get_started.py +++ b/bookwyrm/tests/views/test_get_started.py @@ -55,11 +55,12 @@ class GetStartedViews(TestCase): request.user = self.local_user self.assertIsNone(self.local_user.name) - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - view(request) - self.assertEqual(delay_mock.call_count, 1) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + view(request) + self.assertEqual(delay_mock.call_count, 1) self.assertEqual(self.local_user.name, "New Name") self.assertTrue(self.local_user.discoverable) diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index f0807c55b..e8d1895cf 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -144,10 +144,11 @@ class ViewsHelpers(TestCase): json=self.userdata, status=200, ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - result = views.helpers.handle_remote_webfinger("@mouse@example.com") - self.assertIsInstance(result, models.User) - self.assertEqual(result.username, "mouse@example.com") + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + result = views.helpers.handle_remote_webfinger("@mouse@example.com") + self.assertIsInstance(result, models.User) + self.assertEqual(result.username, "mouse@example.com") def test_user_on_blocked_server(self, _): """find a remote user using webfinger""" diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index 1badf142a..27607f790 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -162,11 +162,12 @@ class UserViews(TestCase): request.user = self.local_user self.assertIsNone(self.local_user.name) - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - view(request) - self.assertEqual(delay_mock.call_count, 1) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + view(request) + self.assertEqual(delay_mock.call_count, 1) self.assertEqual(self.local_user.name, "New Name") self.assertEqual(self.local_user.email, "wow@email.com") @@ -186,11 +187,12 @@ class UserViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - view(request) - self.assertEqual(delay_mock.call_count, 1) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + view(request) + self.assertEqual(delay_mock.call_count, 1) self.assertEqual(self.local_user.name, "New Name") self.assertEqual(self.local_user.email, "wow@email.com") self.assertIsNotNone(self.local_user.avatar) From 878cc5cb175b09c5b8cfa6a1a1666ba73e306301 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 27 May 2021 23:21:47 +0200 Subject: [PATCH 033/130] Lint --- bookwyrm/tests/connectors/test_abstract_connector.py | 4 +++- bookwyrm/tests/connectors/test_openlibrary_connector.py | 4 +++- bookwyrm/tests/models/test_fields.py | 5 ++++- bookwyrm/tests/models/test_import_model.py | 4 +++- bookwyrm/tests/views/inbox/test_inbox_create.py | 4 +++- bookwyrm/tests/views/inbox/test_inbox_update.py | 2 +- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index 68a4c7be2..4390a220a 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -113,7 +113,9 @@ class AbstractConnector(TestCase): ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): with patch("bookwyrm.connectors.abstract_connector.load_more_data.delay"): - result = self.connector.get_or_create_book("https://example.com/book/abcd") + result = self.connector.get_or_create_book( + "https://example.com/book/abcd" + ) self.assertEqual(result, self.book) self.assertEqual(models.Edition.objects.count(), 1) self.assertEqual(models.Edition.objects.count(), 1) diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py index b34a68d20..1cca34d68 100644 --- a/bookwyrm/tests/connectors/test_openlibrary_connector.py +++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py @@ -235,7 +235,9 @@ class Openlibrary(TestCase): "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" ) as mock: mock.return_value = [] - result = self.connector.create_edition_from_data(work, self.edition_data) + result = self.connector.create_edition_from_data( + work, self.edition_data + ) self.assertEqual(result.parent_work, work) self.assertEqual(result.title, "Sabriel") self.assertEqual(result.isbn_10, "0060273224") diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index 2fb337517..339d35685 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -256,7 +256,10 @@ class ActivitypubFields(TestCase): # test receiving an unknown remote id and loading data responses.add( - responses.GET, "https://example.com/user/mouse", json=userdata, status=200 + responses.GET, + "https://example.com/user/mouse", + json=userdata, + status=200, ) with patch("bookwyrm.models.user.set_remote_server.delay"): value = instance.field_from_activity("https://example.com/user/mouse") diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py index 15d8766c1..be6702b31 100644 --- a/bookwyrm/tests/models/test_import_model.py +++ b/bookwyrm/tests/models/test_import_model.py @@ -175,7 +175,9 @@ class ImportJob(TestCase): with patch( "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" ): - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): book = self.item_1.get_book_from_isbn() self.assertEqual(book.title, "Sabriel") diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py index 046291fb5..ed5e6f937 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_create.py +++ b/bookwyrm/tests/views/inbox/test_inbox_create.py @@ -163,7 +163,9 @@ class InboxCreate(TestCase): "@context": "https://www.w3.org/ns/activitystreams", } with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock: + with patch( + "bookwyrm.activitystreams.ActivityStream.add_status" + ) as redis_mock: views.inbox.activity_task(activity) self.assertTrue(redis_mock.called) rating = models.ReviewRating.objects.first() diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py index 32cac4713..db9b0ca0b 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_update.py +++ b/bookwyrm/tests/views/inbox/test_inbox_update.py @@ -98,7 +98,7 @@ class InboxUpdate(TestCase): del userdata["icon"] self.assertIsNone(self.remote_user.name) self.assertFalse(self.remote_user.discoverable) - + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): views.inbox.activity_task( { From f206f61e9a9c0ab676a2c5789c793c0730cffa6b Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 17:00:07 +0200 Subject: [PATCH 034/130] Use global switch to enable/disable preview images --- .env.dev.example | 12 +++ .env.prod.example | 12 +++ bookwyrm/context_processors.py | 16 ++-- bookwyrm/preview_images.py | 87 ++++++++++--------- bookwyrm/settings.py | 14 ++- bookwyrm/templates/book/book.html | 3 +- bookwyrm/templates/layout.html | 3 +- .../templates/snippets/opengraph_images.html | 12 +++ bookwyrm/templates/user/layout.html | 3 +- 9 files changed, 99 insertions(+), 63 deletions(-) create mode 100644 bookwyrm/templates/snippets/opengraph_images.html diff --git a/.env.dev.example b/.env.dev.example index 2f24378c6..71cc11a1f 100644 --- a/.env.dev.example +++ b/.env.dev.example @@ -52,3 +52,15 @@ EMAIL_USE_SSL=false # Set this to true when initializing certbot for domain, false when not CERTBOT_INIT=false + +# Preview image generation can be computing and storage intensive +# ENABLE_PREVIEW_IMAGES=True + +# Specify RGB tuple or RGB hex strings, +# or use_dominant_color_light / use_dominant_color_dark +PREVIEW_BG_COLOR=use_dominant_color_light +# Change to #FFF if you use use_dominant_color_dark +PREVIEW_TEXT_COLOR=#363636 +PREVIEW_IMG_WIDTH=1200 +PREVIEW_IMG_HEIGHT=630 +PREVIEW_DEFAULT_COVER_COLOR=#002549 diff --git a/.env.prod.example b/.env.prod.example index a82499a32..e132d216b 100644 --- a/.env.prod.example +++ b/.env.prod.example @@ -52,3 +52,15 @@ EMAIL_USE_SSL=false # Set this to true when initializing certbot for domain, false when not CERTBOT_INIT=false + +# Preview image generation can be computing and storage intensive +# ENABLE_PREVIEW_IMAGES=True + +# Specify RGB tuple or RGB hex strings, +# or use_dominant_color_light / use_dominant_color_dark +PREVIEW_BG_COLOR=use_dominant_color_light +# Change to #FFF if you use use_dominant_color_dark +PREVIEW_TEXT_COLOR=#363636 +PREVIEW_IMG_WIDTH=1200 +PREVIEW_IMG_HEIGHT=630 +PREVIEW_DEFAULT_COVER_COLOR=#002549 diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py index a6c535c2b..f2661a193 100644 --- a/bookwyrm/context_processors.py +++ b/bookwyrm/context_processors.py @@ -1,18 +1,20 @@ """ customize the info available in context for rendering templates """ -from bookwyrm import models -from bookwyrm.settings import STATIC_URL, STATIC_PATH, MEDIA_URL, MEDIA_PATH +from bookwyrm import models, settings def site_settings(request): # pylint: disable=unused-argument """include the custom info about the site""" - request_protocol = "https://" if request.is_secure() else "http://" + request_protocol = "https://" + if not request.is_secure(): + request_protocol = "http://" return { "site": models.SiteSettings.objects.get(), "active_announcements": models.Announcement.active_announcements(), - "static_url": STATIC_URL, - "media_url": MEDIA_URL, - "static_path": STATIC_PATH, - "media_path": MEDIA_PATH, + "static_url": settings.STATIC_URL, + "media_url": settings.MEDIA_URL, + "static_path": settings.STATIC_PATH, + "media_path": settings.MEDIA_PATH, + "preview_images_enabled": settings.ENABLE_PREVIEW_IMAGES, "request_protocol": request_protocol, } diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 1decb36a0..60b69d0a3 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -13,9 +13,9 @@ from django.core.files.uploadedfile import InMemoryUploadedFile from django.db.models import Avg from bookwyrm import models, settings -from bookwyrm.settings import DOMAIN, STATIC_ROOT from bookwyrm.tasks import app + IMG_WIDTH = settings.PREVIEW_IMG_WIDTH IMG_HEIGHT = settings.PREVIEW_IMG_HEIGHT BG_COLOR = settings.PREVIEW_BG_COLOR @@ -27,7 +27,7 @@ margin = math.floor(IMG_HEIGHT / 10) gutter = math.floor(margin / 2) inner_img_height = math.floor(IMG_HEIGHT * 0.8) inner_img_width = math.floor(inner_img_height * 0.7) -font_dir = os.path.join(STATIC_ROOT, "fonts/public_sans") +font_dir = os.path.join(settings.STATIC_ROOT, "fonts/public_sans") def get_font(font_name, size=28): @@ -103,7 +103,7 @@ def generate_instance_layer(content_width): if site.logo_small: logo_img = Image.open(site.logo_small) else: - static_path = os.path.join(STATIC_ROOT, "images/logo-small.png") + static_path = os.path.join(settings.STATIC_ROOT, "images/logo-small.png") logo_img = Image.open(static_path) instance_layer = Image.new("RGBA", (content_width, 62), color=TRANSPARENT_COLOR) @@ -126,11 +126,11 @@ def generate_instance_layer(content_width): def generate_rating_layer(rating, content_width): - icon_star_full = Image.open(os.path.join(STATIC_ROOT, "images/icons/star-full.png")) + icon_star_full = Image.open(os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png")) icon_star_empty = Image.open( - os.path.join(STATIC_ROOT, "images/icons/star-empty.png") + os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") ) - icon_star_half = Image.open(os.path.join(STATIC_ROOT, "images/icons/star-half.png")) + icon_star_half = Image.open(os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png")) icon_size = 64 icon_margin = 10 @@ -307,61 +307,64 @@ def save_and_cleanup(image, instance=None): @app.task def generate_site_preview_image_task(): """generate preview_image for the website""" - site = models.SiteSettings.objects.get() + if settings.ENABLE_PREVIEW_IMAGES == True: + site = models.SiteSettings.objects.get() - if site.logo: - logo = site.logo - else: - logo = os.path.join(STATIC_ROOT, "images/logo.png") + if site.logo: + logo = site.logo + else: + logo = os.path.join(settings.STATIC_ROOT, "images/logo.png") - texts = { - "text_zero": DOMAIN, - "text_one": site.name, - "text_three": site.instance_tagline, - } + texts = { + "text_zero": settings.DOMAIN, + "text_one": site.name, + "text_three": site.instance_tagline, + } - image = generate_preview_image(texts=texts, picture=logo, show_instance_layer=False) + image = generate_preview_image(texts=texts, picture=logo, show_instance_layer=False) - save_and_cleanup(image, instance=site) + save_and_cleanup(image, instance=site) @app.task def generate_edition_preview_image_task(book_id): """generate preview_image for a book""" - book = models.Book.objects.select_subclasses().get(id=book_id) + if settings.ENABLE_PREVIEW_IMAGES == True: + book = models.Book.objects.select_subclasses().get(id=book_id) - rating = models.Review.objects.filter( - privacy="public", - deleted=False, - book__in=[book_id], - ).aggregate(Avg("rating"))["rating__avg"] + rating = models.Review.objects.filter( + privacy="public", + deleted=False, + book__in=[book_id], + ).aggregate(Avg("rating"))["rating__avg"] - texts = { - "text_one": book.title, - "text_two": book.subtitle, - "text_three": book.author_text, - } + texts = { + "text_one": book.title, + "text_two": book.subtitle, + "text_three": book.author_text, + } - image = generate_preview_image(texts=texts, picture=book.cover, rating=rating) + image = generate_preview_image(texts=texts, picture=book.cover, rating=rating) - save_and_cleanup(image, instance=book) + save_and_cleanup(image, instance=book) @app.task def generate_user_preview_image_task(user_id): """generate preview_image for a book""" - user = models.User.objects.get(id=user_id) + if settings.ENABLE_PREVIEW_IMAGES == True: + user = models.User.objects.get(id=user_id) - texts = { - "text_one": user.display_name, - "text_three": "@{}@{}".format(user.localname, DOMAIN), - } + texts = { + "text_one": user.display_name, + "text_three": "@{}@{}".format(user.localname, settings.DOMAIN), + } - if user.avatar: - avatar = user.avatar - else: - avatar = os.path.join(STATIC_ROOT, "images/default_avi.jpg") + if user.avatar: + avatar = user.avatar + else: + avatar = os.path.join(settings.STATIC_ROOT, "images/default_avi.jpg") - image = generate_preview_image(texts=texts, picture=avatar) + image = generate_preview_image(texts=texts, picture=avatar) - save_and_cleanup(image, instance=user) + save_and_cleanup(image, instance=user) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index b0ff5a72c..a4cf74f0b 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -38,14 +38,12 @@ LOCALE_PATHS = [ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" # Preview image - -# Specify RGB tuple or RGB hex strings, -# or "use_dominant_color_light" / "use_dominant_color_dark" -PREVIEW_BG_COLOR = "use_dominant_color_light" -PREVIEW_IMG_WIDTH = 1200 -PREVIEW_IMG_HEIGHT = 630 -PREVIEW_TEXT_COLOR = "#363636" # Change to "#FFF" if you use "use_dominant_color_dark" -PREVIEW_DEFAULT_COVER_COLOR = "#002549" +ENABLE_PREVIEW_IMAGES = env.bool("ENABLE_PREVIEW_IMAGES", False) +PREVIEW_BG_COLOR = env.str("PREVIEW_BG_COLOR", "use_dominant_color_light") +PREVIEW_TEXT_COLOR = env.str("PREVIEW_TEXT_COLOR", "#363636") +PREVIEW_IMG_WIDTH = env.int("PREVIEW_IMG_WIDTH", 1200) +PREVIEW_IMG_HEIGHT = env.int("PREVIEW_IMG_HEIGHT", 630) +PREVIEW_DEFAULT_COVER_COLOR = env.str("PREVIEW_DEFAULT_COVER_COLOR", "#002549") # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index c40209964..150bda44e 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -4,8 +4,7 @@ {% block title %}{{ book|book_title }}{% endblock %} {% block opengraph_images %} - - + {% include 'snippets/opengraph_images.html' with image=book.preview_image %} {% endblock %} {% block content %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index c06294d9c..6e0c42348 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -17,8 +17,7 @@ {% block opengraph_images %} - - + {% include 'snippets/opengraph_images.html' %} {% endblock %} diff --git a/bookwyrm/templates/snippets/opengraph_images.html b/bookwyrm/templates/snippets/opengraph_images.html new file mode 100644 index 000000000..d2c379a89 --- /dev/null +++ b/bookwyrm/templates/snippets/opengraph_images.html @@ -0,0 +1,12 @@ +{% if preview_images_enabled is True %} + {% if image %} + + + {% else %} + + + {% endif %} +{% else %} + + +{% endif %} diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index a645b07bb..69455806e 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -8,8 +8,7 @@ {% block title %}{{ user.display_name }}{% endblock %} {% block opengraph_images %} - - + {% include 'snippets/opengraph_images.html' with image=user.preview_image %} {% endblock %} {% block content %} From 61367c3f4fa3096a771a7e60ba344d2a6d9446e3 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 17:25:20 +0200 Subject: [PATCH 035/130] Protect generate_preview_images command - add `--all` argument - send computation intensive tasks to Celery --- .../commands/generate_preview_images.py | 82 ++++++++++--------- bw-dev | 2 +- 2 files changed, 46 insertions(+), 38 deletions(-) diff --git a/bookwyrm/management/commands/generate_preview_images.py b/bookwyrm/management/commands/generate_preview_images.py index 754f6e9a9..28ea1c0cb 100644 --- a/bookwyrm/management/commands/generate_preview_images.py +++ b/bookwyrm/management/commands/generate_preview_images.py @@ -6,44 +6,52 @@ from django.core.management.base import BaseCommand from bookwyrm import activitystreams, models, settings, preview_images -def generate_preview_images(): - """generate preview images""" - print(" | Hello! I will be generating preview images for your instance.") - print( - "🧑‍🎨 ⎨ This might take quite long if your instance has a lot of books and users." - ) - print(" | ✧ Thank you for your patience ✧") - - # Site - sys.stdout.write(" → Site preview image: ") - preview_images.generate_site_preview_image_task() - sys.stdout.write(" OK 🖼\n") - - # Users - users = models.User.objects.filter( - local=True, - is_active=True, - ) - sys.stdout.write(" → User preview images ({}): ".format(len(users))) - for user in users: - preview_images.generate_user_preview_image_task(user.id) - sys.stdout.write(".") - sys.stdout.write(" OK 🖼\n") - - # Books - books = models.Book.objects.select_subclasses().filter() - sys.stdout.write(" → Book preview images ({}): ".format(len(books))) - for book in books: - preview_images.generate_edition_preview_image_task(book.id) - sys.stdout.write(".") - sys.stdout.write(" OK 🖼\n") - - print("🧑‍🎨 ⎨ I’m all done! ✧ Enjoy ✧") - - class Command(BaseCommand): help = "Generate preview images" + + def add_arguments(self, parser): + parser.add_argument('--all', '-a', action="store_true", help="Generates images for ALL types: site, users and books. Can use a lot of computing power.") + # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): - """run feed builder""" - generate_preview_images() + """generate preview images""" + self.stdout.write(" | Hello! I will be generating preview images for your instance.") + if options['all']: + self.stdout.write( + "🧑‍🎨 ⎨ This might take quite long if your instance has a lot of books and users." + ) + self.stdout.write(" | ✧ Thank you for your patience ✧") + else: + self.stdout.write( + "🧑‍🎨 ⎨ I will only generate the instance preview image." + ) + self.stdout.write(" | ✧ Be right back! ✧") + + # Site + self.stdout.write(" → Site preview image: ", ending='') + preview_images.generate_site_preview_image_task.delay() + self.stdout.write(" OK 🖼") + + if options['all']: + # Users + users = models.User.objects.filter( + local=True, + is_active=True, + ) + self.stdout.write(" → User preview images ({}): ".format(len(users)), ending='') + for user in users: + preview_images.generate_user_preview_image_task.delay(user.id) + self.stdout.write(".", ending='') + self.stdout.write(" OK 🖼") + + # Books + books = models.Book.objects.select_subclasses().filter() + self.stdout.write(" → Book preview images ({}): ".format(len(books)), ending='') + for book in books: + preview_images.generate_edition_preview_image_task.delay(book.id) + self.stdout.write(".", ending='') + self.stdout.write(" OK 🖼") + + self.stdout.write("🧑‍🎨 ⎨ I’m all done! ✧ Enjoy ✧") + + diff --git a/bw-dev b/bw-dev index 95681b115..5ef049f12 100755 --- a/bw-dev +++ b/bw-dev @@ -108,7 +108,7 @@ case "$CMD" in runweb python manage.py populate_streams ;; generate_preview_images) - runweb python manage.py generate_preview_images + runweb python manage.py generate_preview_images $@ ;; *) echo "Unrecognised command. Try: build, clean, up, initdb, resetdb, makemigrations, migrate, bash, shell, dbshell, restart_celery, test, pytest, test_report, black, populate_feeds, generate_preview_images" From 08cebd70513813cce5a72d1c7b33d9fbe5e70dca Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 17:26:43 +0200 Subject: [PATCH 036/130] Lint --- .../commands/generate_preview_images.py | 35 +++++++++++-------- bookwyrm/preview_images.py | 12 +++++-- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/bookwyrm/management/commands/generate_preview_images.py b/bookwyrm/management/commands/generate_preview_images.py index 28ea1c0cb..6ca26b2d3 100644 --- a/bookwyrm/management/commands/generate_preview_images.py +++ b/bookwyrm/management/commands/generate_preview_images.py @@ -10,48 +10,55 @@ class Command(BaseCommand): help = "Generate preview images" def add_arguments(self, parser): - parser.add_argument('--all', '-a', action="store_true", help="Generates images for ALL types: site, users and books. Can use a lot of computing power.") + parser.add_argument( + "--all", + "-a", + action="store_true", + help="Generates images for ALL types: site, users and books. Can use a lot of computing power.", + ) # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """generate preview images""" - self.stdout.write(" | Hello! I will be generating preview images for your instance.") - if options['all']: + self.stdout.write( + " | Hello! I will be generating preview images for your instance." + ) + if options["all"]: self.stdout.write( "🧑‍🎨 ⎨ This might take quite long if your instance has a lot of books and users." ) self.stdout.write(" | ✧ Thank you for your patience ✧") else: - self.stdout.write( - "🧑‍🎨 ⎨ I will only generate the instance preview image." - ) + self.stdout.write("🧑‍🎨 ⎨ I will only generate the instance preview image.") self.stdout.write(" | ✧ Be right back! ✧") # Site - self.stdout.write(" → Site preview image: ", ending='') + self.stdout.write(" → Site preview image: ", ending="") preview_images.generate_site_preview_image_task.delay() self.stdout.write(" OK 🖼") - if options['all']: + if options["all"]: # Users users = models.User.objects.filter( local=True, is_active=True, ) - self.stdout.write(" → User preview images ({}): ".format(len(users)), ending='') + self.stdout.write( + " → User preview images ({}): ".format(len(users)), ending="" + ) for user in users: preview_images.generate_user_preview_image_task.delay(user.id) - self.stdout.write(".", ending='') + self.stdout.write(".", ending="") self.stdout.write(" OK 🖼") # Books books = models.Book.objects.select_subclasses().filter() - self.stdout.write(" → Book preview images ({}): ".format(len(books)), ending='') + self.stdout.write( + " → Book preview images ({}): ".format(len(books)), ending="" + ) for book in books: preview_images.generate_edition_preview_image_task.delay(book.id) - self.stdout.write(".", ending='') + self.stdout.write(".", ending="") self.stdout.write(" OK 🖼") self.stdout.write("🧑‍🎨 ⎨ I’m all done! ✧ Enjoy ✧") - - diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 60b69d0a3..7a23353c8 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -126,11 +126,15 @@ def generate_instance_layer(content_width): def generate_rating_layer(rating, content_width): - icon_star_full = Image.open(os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png")) + icon_star_full = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png") + ) icon_star_empty = Image.open( os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") ) - icon_star_half = Image.open(os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png")) + icon_star_half = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png") + ) icon_size = 64 icon_margin = 10 @@ -321,7 +325,9 @@ def generate_site_preview_image_task(): "text_three": site.instance_tagline, } - image = generate_preview_image(texts=texts, picture=logo, show_instance_layer=False) + image = generate_preview_image( + texts=texts, picture=logo, show_instance_layer=False + ) save_and_cleanup(image, instance=site) From ec159ebcb0bc1742aeb90af83edbe5524af22feb Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 21:24:45 +0200 Subject: [PATCH 037/130] Test generating preview images --- bookwyrm/preview_images.py | 15 ++-- bookwyrm/tests/test_preview_images.py | 99 +++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 bookwyrm/tests/test_preview_images.py diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 7a23353c8..17511ddee 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -57,7 +57,7 @@ def generate_texts_layer(texts, content_width): text_y = 0 - if "text_zero" in texts: + if "text_zero" in texts and texts["text_zero"]: # Text one (Book title) text_zero = textwrap.fill(texts["text_zero"], width=72) text_layer_draw.multiline_text( @@ -66,7 +66,7 @@ def generate_texts_layer(texts, content_width): text_y = text_y + font_text_zero.getsize_multiline(text_zero)[1] + 16 - if "text_one" in texts: + if "text_one" in texts and texts["text_one"]: # Text one (Book title) text_one = textwrap.fill(texts["text_one"], width=28) text_layer_draw.multiline_text( @@ -75,7 +75,7 @@ def generate_texts_layer(texts, content_width): text_y = text_y + font_text_one.getsize_multiline(text_one)[1] + 16 - if "text_two" in texts: + if "text_two" in texts and texts["text_two"]: # Text one (Book subtitle) text_two = textwrap.fill(texts["text_two"], width=36) text_layer_draw.multiline_text( @@ -84,7 +84,7 @@ def generate_texts_layer(texts, content_width): text_y = text_y + font_text_one.getsize_multiline(text_two)[1] + 16 - if "text_three" in texts: + if "text_three" in texts and texts["text_three"]: # Text three (Book authors) text_three = textwrap.fill(texts["text_three"], width=36) text_layer_draw.multiline_text( @@ -299,7 +299,12 @@ def save_and_cleanup(image, instance=None): image_buffer.tell(), None, ) - instance.save(update_fields=["preview_image"]) + + save_without_broadcast = isinstance(instance, (models.Book, models.User)) + if save_without_broadcast: + instance.save(update_fields=["preview_image"], broadcast=False) + else: + instance.save(update_fields=["preview_image"]) # Clean up old file after saving if os.path.exists(old_path): diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py new file mode 100644 index 000000000..6edf2e791 --- /dev/null +++ b/bookwyrm/tests/test_preview_images.py @@ -0,0 +1,99 @@ +""" test generating preview images """ +import sys +import pathlib +from unittest.mock import patch +from PIL import Image + +from django.test import TestCase +from django.test.client import RequestFactory +from django.core.files.uploadedfile import SimpleUploadedFile +from django.db.models.fields.files import ImageFieldFile + +from bookwyrm import models, settings + +from bookwyrm.preview_images import ( + generate_site_preview_image_task, + generate_edition_preview_image_task, + generate_user_preview_image_task, + generate_preview_image, +) + +import logging + +@patch("bookwyrm.emailing.send_email.delay") +class PreviewImages(TestCase): + """every response to a get request, html or json""" + + def setUp(self): + """we need basic test data and mocks""" + self.factory = RequestFactory() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + avatar_file = pathlib.Path(__file__).parent.joinpath( + "../static/images/no_cover.jpg" + ) + self.local_user = models.User.objects.create_user( + "possum@local.com", + "possum@possum.possum", + "password", + local=True, + localname="possum", + avatar=SimpleUploadedFile( + avatar_file, open(avatar_file, "rb").read(), content_type="image/jpeg" + ) + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() + + def test_generate_preview_image(self, *args, **kwargs): + image_file = pathlib.Path(__file__).parent.joinpath( + "../static/images/no_cover.jpg" + ) + + texts = { + "text_one": "Awesome Possum", + "text_three": "@possum@local.com", + } + + result = generate_preview_image(texts=texts, picture=image_file, rating=5) + self.assertIsInstance(result, Image.Image) + self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) + + def test_site_preview(self, *args, **kwargs): + """generate site preview""" + generate_site_preview_image_task() + + updated_site = models.SiteSettings.objects.get() + site_preview_image = updated_site.preview_image + + self.assertIsInstance(site_preview_image, ImageFieldFile) + result = Image.open(site_preview_image) + self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) + + def test_edition_preview(self, *args, **kwargs): + """generate user preview""" + generate_edition_preview_image_task(self.book.id) + + updated_book = models.Book.objects.get(id=self.book.id) + book_preview_image = updated_book.preview_image + + self.assertIsInstance(book_preview_image, ImageFieldFile) + result = Image.open(book_preview_image) + self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) + + def test_user_preview(self, *args, **kwargs): + """generate user preview""" + generate_user_preview_image_task(self.local_user.id) + + updated_user = models.User.objects.get(id=self.local_user.id) + user_preview_image = updated_user.preview_image + + self.assertIsInstance(user_preview_image, ImageFieldFile) + result = Image.open(user_preview_image) + self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) From 2bf254bce7cf47bc29213cabb87af4d969f362f8 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 21:26:13 +0200 Subject: [PATCH 038/130] Update test_preview_images.py --- bookwyrm/tests/test_preview_images.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 6edf2e791..86ed00287 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -20,6 +20,7 @@ from bookwyrm.preview_images import ( import logging + @patch("bookwyrm.emailing.send_email.delay") class PreviewImages(TestCase): """every response to a get request, html or json""" @@ -38,8 +39,10 @@ class PreviewImages(TestCase): local=True, localname="possum", avatar=SimpleUploadedFile( - avatar_file, open(avatar_file, "rb").read(), content_type="image/jpeg" - ) + avatar_file, + open(avatar_file, "rb").read(), + content_type="image/jpeg", + ), ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.work = models.Work.objects.create(title="Test Work") @@ -63,7 +66,9 @@ class PreviewImages(TestCase): result = generate_preview_image(texts=texts, picture=image_file, rating=5) self.assertIsInstance(result, Image.Image) - self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) + self.assertEqual( + result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + ) def test_site_preview(self, *args, **kwargs): """generate site preview""" @@ -74,7 +79,9 @@ class PreviewImages(TestCase): self.assertIsInstance(site_preview_image, ImageFieldFile) result = Image.open(site_preview_image) - self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) + self.assertEqual( + result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + ) def test_edition_preview(self, *args, **kwargs): """generate user preview""" @@ -85,7 +92,9 @@ class PreviewImages(TestCase): self.assertIsInstance(book_preview_image, ImageFieldFile) result = Image.open(book_preview_image) - self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) + self.assertEqual( + result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + ) def test_user_preview(self, *args, **kwargs): """generate user preview""" @@ -96,4 +105,6 @@ class PreviewImages(TestCase): self.assertIsInstance(user_preview_image, ImageFieldFile) result = Image.open(user_preview_image) - self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) + self.assertEqual( + result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + ) From 8755b92c2e28564bba83b5bba4d4cc6aa58c18bf Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 21:40:20 +0200 Subject: [PATCH 039/130] Fix GitHub FileNotFoundError --- bookwyrm/preview_images.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 17511ddee..624b6afe6 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -103,17 +103,27 @@ def generate_instance_layer(content_width): if site.logo_small: logo_img = Image.open(site.logo_small) else: - static_path = os.path.join(settings.STATIC_ROOT, "images/logo-small.png") - logo_img = Image.open(static_path) + try: + static_path = os.path.join(settings.STATIC_ROOT, "images/logo-small.png") + logo_img = Image.open(static_path) + except FileNotFoundError: + logo_img = None instance_layer = Image.new("RGBA", (content_width, 62), color=TRANSPARENT_COLOR) - logo_img.thumbnail((50, 50), Image.ANTIALIAS) + instance_text_x = 0 - instance_layer.paste(logo_img, (0, 0)) + if logo_img: + logo_img.thumbnail((50, 50), Image.ANTIALIAS) + + instance_layer.paste(logo_img, (0, 0)) + + instance_text_x = instance_text_x + 60 instance_layer_draw = ImageDraw.Draw(instance_layer) - instance_layer_draw.text((60, 10), site.name, font=font_instance, fill=TEXT_COLOR) + instance_layer_draw.text( + (instance_text_x, 10), site.name, font=font_instance, fill=TEXT_COLOR + ) line_width = 50 + 10 + font_instance.getsize(site.name)[0] From 71bc35224bb9123a9f5d903368b71efcfcd81197 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 22:00:26 +0200 Subject: [PATCH 040/130] no, this will work --- bookwyrm/preview_images.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 624b6afe6..b083b9631 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -64,7 +64,10 @@ def generate_texts_layer(texts, content_width): (0, text_y), text_zero, font=font_text_zero, fill=TEXT_COLOR ) - text_y = text_y + font_text_zero.getsize_multiline(text_zero)[1] + 16 + try: + text_y = text_y + font_text_zero.getsize_multiline(text_zero)[1] + 16 + except: + text_y = text_y + 26 if "text_one" in texts and texts["text_one"]: # Text one (Book title) @@ -73,7 +76,10 @@ def generate_texts_layer(texts, content_width): (0, text_y), text_one, font=font_text_one, fill=TEXT_COLOR ) - text_y = text_y + font_text_one.getsize_multiline(text_one)[1] + 16 + try: + text_y = text_y + font_text_one.getsize_multiline(text_one)[1] + 16 + except: + text_y = text_y + 26 if "text_two" in texts and texts["text_two"]: # Text one (Book subtitle) @@ -82,7 +88,10 @@ def generate_texts_layer(texts, content_width): (0, text_y), text_two, font=font_text_two, fill=TEXT_COLOR ) - text_y = text_y + font_text_one.getsize_multiline(text_two)[1] + 16 + try: + text_y = text_y + font_text_one.getsize_multiline(text_two)[1] + 16 + except: + text_y = text_y + 26 if "text_three" in texts and texts["text_three"]: # Text three (Book authors) From 0e28b79089272dbf9bf83d3b2795f57dc48df5fb Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 22:10:57 +0200 Subject: [PATCH 041/130] third time's the charm --- bookwyrm/preview_images.py | 79 +++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 36 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index b083b9631..2fa097a8c 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -145,49 +145,54 @@ def generate_instance_layer(content_width): def generate_rating_layer(rating, content_width): - icon_star_full = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png") - ) - icon_star_empty = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") - ) - icon_star_half = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png") - ) + try: + icon_star_full = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png") + ) + icon_star_empty = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") + ) + icon_star_half = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png") + ) - icon_size = 64 - icon_margin = 10 + icon_size = 64 + icon_margin = 10 - rating_layer_base = Image.new( - "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR - ) - rating_layer_color = Image.new("RGBA", (content_width, icon_size), color=TEXT_COLOR) - rating_layer_mask = Image.new( - "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR - ) + rating_layer_base = Image.new( + "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR + ) + rating_layer_color = Image.new( + "RGBA", (content_width, icon_size), color=TEXT_COLOR + ) + rating_layer_mask = Image.new( + "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR + ) - position_x = 0 + position_x = 0 - for r in range(math.floor(rating)): - rating_layer_mask.alpha_composite(icon_star_full, (position_x, 0)) - position_x = position_x + icon_size + icon_margin + for r in range(math.floor(rating)): + rating_layer_mask.alpha_composite(icon_star_full, (position_x, 0)) + position_x = position_x + icon_size + icon_margin - if math.floor(rating) != math.ceil(rating): - rating_layer_mask.alpha_composite(icon_star_half, (position_x, 0)) - position_x = position_x + icon_size + icon_margin + if math.floor(rating) != math.ceil(rating): + rating_layer_mask.alpha_composite(icon_star_half, (position_x, 0)) + position_x = position_x + icon_size + icon_margin - for r in range(5 - math.ceil(rating)): - rating_layer_mask.alpha_composite(icon_star_empty, (position_x, 0)) - position_x = position_x + icon_size + icon_margin + for r in range(5 - math.ceil(rating)): + rating_layer_mask.alpha_composite(icon_star_empty, (position_x, 0)) + position_x = position_x + icon_size + icon_margin - rating_layer_mask = rating_layer_mask.getchannel("A") - rating_layer_mask = ImageOps.invert(rating_layer_mask) + rating_layer_mask = rating_layer_mask.getchannel("A") + rating_layer_mask = ImageOps.invert(rating_layer_mask) - rating_layer_composite = Image.composite( - rating_layer_base, rating_layer_color, rating_layer_mask - ) + rating_layer_composite = Image.composite( + rating_layer_base, rating_layer_color, rating_layer_mask + ) - return rating_layer_composite + return rating_layer_composite + except: + return None def generate_default_inner_img(): @@ -273,8 +278,10 @@ def generate_preview_image( # Add some more margin contents_composite_y = contents_composite_y + gutter rating_layer = generate_rating_layer(rating, content_width) - contents_layer.alpha_composite(rating_layer, (0, contents_composite_y)) - contents_composite_y = contents_composite_y + rating_layer.height + gutter + + if rating_layer: + contents_layer.alpha_composite(rating_layer, (0, contents_composite_y)) + contents_composite_y = contents_composite_y + rating_layer.height + gutter contents_layer_box = contents_layer.getbbox() contents_layer_height = contents_layer_box[3] - contents_layer_box[1] From 9cee11920021b0577c19549ed126d0f4a28add90 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 23:29:28 +0200 Subject: [PATCH 042/130] test --- bookwyrm/tests/test_preview_images.py | 59 +++++++++++++++------------ 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 86ed00287..600a4569d 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -3,6 +3,7 @@ import sys import pathlib from unittest.mock import patch from PIL import Image +import re from django.test import TestCase from django.test.client import RequestFactory @@ -75,36 +76,44 @@ class PreviewImages(TestCase): generate_site_preview_image_task() updated_site = models.SiteSettings.objects.get() - site_preview_image = updated_site.preview_image + # site_preview_image = updated_site.preview_image - self.assertIsInstance(site_preview_image, ImageFieldFile) - result = Image.open(site_preview_image) - self.assertEqual( - result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + output = models.fields.image_serializer(updated_site.preview_image, alt="alt text") + self.assertIsNotNone( + re.match( + r".*\.png", + output.url, + ) ) - def test_edition_preview(self, *args, **kwargs): - """generate user preview""" - generate_edition_preview_image_task(self.book.id) + # self.assertIsInstance(site_preview_image, ImageFieldFile) + # result = Image.open(site_preview_image) + # self.assertEqual( + # result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + # ) - updated_book = models.Book.objects.get(id=self.book.id) - book_preview_image = updated_book.preview_image + # def test_edition_preview(self, *args, **kwargs): + # """generate user preview""" + # generate_edition_preview_image_task(self.book.id) - self.assertIsInstance(book_preview_image, ImageFieldFile) - result = Image.open(book_preview_image) - self.assertEqual( - result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - ) + # updated_book = models.Book.objects.get(id=self.book.id) + # book_preview_image = updated_book.preview_image - def test_user_preview(self, *args, **kwargs): - """generate user preview""" - generate_user_preview_image_task(self.local_user.id) + # self.assertIsInstance(book_preview_image, ImageFieldFile) + # result = Image.open(book_preview_image) + # self.assertEqual( + # result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + # ) - updated_user = models.User.objects.get(id=self.local_user.id) - user_preview_image = updated_user.preview_image + # def test_user_preview(self, *args, **kwargs): + # """generate user preview""" + # generate_user_preview_image_task(self.local_user.id) - self.assertIsInstance(user_preview_image, ImageFieldFile) - result = Image.open(user_preview_image) - self.assertEqual( - result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - ) + # updated_user = models.User.objects.get(id=self.local_user.id) + # user_preview_image = updated_user.preview_image + + # self.assertIsInstance(user_preview_image, ImageFieldFile) + # result = Image.open(user_preview_image) + # self.assertEqual( + # result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + # ) From 872084d61a784813147b67339c305c203c8d8e62 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 23:41:41 +0200 Subject: [PATCH 043/130] Update test_preview_images.py --- bookwyrm/tests/test_preview_images.py | 59 ++++++++++++--------------- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 600a4569d..86ed00287 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -3,7 +3,6 @@ import sys import pathlib from unittest.mock import patch from PIL import Image -import re from django.test import TestCase from django.test.client import RequestFactory @@ -76,44 +75,36 @@ class PreviewImages(TestCase): generate_site_preview_image_task() updated_site = models.SiteSettings.objects.get() - # site_preview_image = updated_site.preview_image + site_preview_image = updated_site.preview_image - output = models.fields.image_serializer(updated_site.preview_image, alt="alt text") - self.assertIsNotNone( - re.match( - r".*\.png", - output.url, - ) + self.assertIsInstance(site_preview_image, ImageFieldFile) + result = Image.open(site_preview_image) + self.assertEqual( + result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) ) - # self.assertIsInstance(site_preview_image, ImageFieldFile) - # result = Image.open(site_preview_image) - # self.assertEqual( - # result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - # ) + def test_edition_preview(self, *args, **kwargs): + """generate user preview""" + generate_edition_preview_image_task(self.book.id) - # def test_edition_preview(self, *args, **kwargs): - # """generate user preview""" - # generate_edition_preview_image_task(self.book.id) + updated_book = models.Book.objects.get(id=self.book.id) + book_preview_image = updated_book.preview_image - # updated_book = models.Book.objects.get(id=self.book.id) - # book_preview_image = updated_book.preview_image + self.assertIsInstance(book_preview_image, ImageFieldFile) + result = Image.open(book_preview_image) + self.assertEqual( + result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + ) - # self.assertIsInstance(book_preview_image, ImageFieldFile) - # result = Image.open(book_preview_image) - # self.assertEqual( - # result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - # ) + def test_user_preview(self, *args, **kwargs): + """generate user preview""" + generate_user_preview_image_task(self.local_user.id) - # def test_user_preview(self, *args, **kwargs): - # """generate user preview""" - # generate_user_preview_image_task(self.local_user.id) + updated_user = models.User.objects.get(id=self.local_user.id) + user_preview_image = updated_user.preview_image - # updated_user = models.User.objects.get(id=self.local_user.id) - # user_preview_image = updated_user.preview_image - - # self.assertIsInstance(user_preview_image, ImageFieldFile) - # result = Image.open(user_preview_image) - # self.assertEqual( - # result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - # ) + self.assertIsInstance(user_preview_image, ImageFieldFile) + result = Image.open(user_preview_image) + self.assertEqual( + result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + ) From 0f80456a08482602703a56b93311f2a189095464 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 23:42:04 +0200 Subject: [PATCH 044/130] Save as JPG --- bookwyrm/preview_images.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 2fa097a8c..41dbf8bc7 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -301,12 +301,12 @@ def generate_preview_image( ) img.alpha_composite(contents_layer, (content_x, contents_y)) - return img + return img.convert("RGB") def save_and_cleanup(image, instance=None): if instance: - file_name = "%s.png" % str(uuid4()) + file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4())) image_buffer = BytesIO() try: @@ -316,12 +316,12 @@ def save_and_cleanup(image, instance=None): old_path = "" # Save - image.save(image_buffer, format="png") + image.save(image_buffer, format="jpeg", quality=75) instance.preview_image = InMemoryUploadedFile( ContentFile(image_buffer.getvalue()), "preview_image", file_name, - "image/png", + "image/jpg", image_buffer.tell(), None, ) From b4e2d8c6e39029ff0dabbec71b62e69f3c39dcd8 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 11:17:59 +0200 Subject: [PATCH 045/130] Better refresh object in test --- bookwyrm/tests/test_preview_images.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 86ed00287..2777fc488 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -52,7 +52,7 @@ class PreviewImages(TestCase): parent_work=self.work, ) with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.site = models.SiteSettings.objects.create() def test_generate_preview_image(self, *args, **kwargs): image_file = pathlib.Path(__file__).parent.joinpath( @@ -74,11 +74,10 @@ class PreviewImages(TestCase): """generate site preview""" generate_site_preview_image_task() - updated_site = models.SiteSettings.objects.get() - site_preview_image = updated_site.preview_image + self.site.refresh_from_db() - self.assertIsInstance(site_preview_image, ImageFieldFile) - result = Image.open(site_preview_image) + self.assertIsInstance(self.site.preview_image, ImageFieldFile) + result = Image.open(self.site.preview_image) self.assertEqual( result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) ) @@ -87,11 +86,10 @@ class PreviewImages(TestCase): """generate user preview""" generate_edition_preview_image_task(self.book.id) - updated_book = models.Book.objects.get(id=self.book.id) - book_preview_image = updated_book.preview_image + self.book.refresh_from_db() - self.assertIsInstance(book_preview_image, ImageFieldFile) - result = Image.open(book_preview_image) + self.assertIsInstance(self.book.preview_image, ImageFieldFile) + result = Image.open(self.book.preview_image) self.assertEqual( result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) ) @@ -100,11 +98,10 @@ class PreviewImages(TestCase): """generate user preview""" generate_user_preview_image_task(self.local_user.id) - updated_user = models.User.objects.get(id=self.local_user.id) - user_preview_image = updated_user.preview_image + self.local_user.refresh_from_db() - self.assertIsInstance(user_preview_image, ImageFieldFile) - result = Image.open(user_preview_image) + self.assertIsInstance(self.local_user.preview_image, ImageFieldFile) + result = Image.open(self.local_user.preview_image) self.assertEqual( result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) ) From 022182e1146a8c66abdcd6ec913da4b967f40e33 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 11:33:37 +0200 Subject: [PATCH 046/130] See if the image is saved in DB in the Github Actions test environment --- bookwyrm/preview_images.py | 46 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 41dbf8bc7..0d9f26e7d 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -309,33 +309,33 @@ def save_and_cleanup(image, instance=None): file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4())) image_buffer = BytesIO() + # try: try: - try: - old_path = instance.preview_image.path - except ValueError: - old_path = "" + old_path = instance.preview_image.path + except ValueError: + old_path = "" - # Save - image.save(image_buffer, format="jpeg", quality=75) - instance.preview_image = InMemoryUploadedFile( - ContentFile(image_buffer.getvalue()), - "preview_image", - file_name, - "image/jpg", - image_buffer.tell(), - None, - ) + # Save + image.save(image_buffer, format="jpeg", quality=75) + instance.preview_image = InMemoryUploadedFile( + ContentFile(image_buffer.getvalue()), + "preview_image", + file_name, + "image/jpg", + image_buffer.tell(), + None, + ) - save_without_broadcast = isinstance(instance, (models.Book, models.User)) - if save_without_broadcast: - instance.save(update_fields=["preview_image"], broadcast=False) - else: - instance.save(update_fields=["preview_image"]) + save_without_broadcast = isinstance(instance, (models.Book, models.User)) + if save_without_broadcast: + instance.save(update_fields=["preview_image"], broadcast=False) + else: + instance.save(update_fields=["preview_image"]) - # Clean up old file after saving - if os.path.exists(old_path): - os.remove(old_path) - finally: + # Clean up old file after saving + if os.path.exists(old_path): + os.remove(old_path) + # finally: image_buffer.close() From cc0881b11cae62770dff5d4f667ddf5c9f48a84e Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 12:33:04 +0200 Subject: [PATCH 047/130] Try another way --- bookwyrm/preview_images.py | 46 +++++++++++++-------------- bookwyrm/tests/test_preview_images.py | 35 ++++++++++---------- 2 files changed, 39 insertions(+), 42 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 0d9f26e7d..41dbf8bc7 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -309,33 +309,33 @@ def save_and_cleanup(image, instance=None): file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4())) image_buffer = BytesIO() - # try: try: - old_path = instance.preview_image.path - except ValueError: - old_path = "" + try: + old_path = instance.preview_image.path + except ValueError: + old_path = "" - # Save - image.save(image_buffer, format="jpeg", quality=75) - instance.preview_image = InMemoryUploadedFile( - ContentFile(image_buffer.getvalue()), - "preview_image", - file_name, - "image/jpg", - image_buffer.tell(), - None, - ) + # Save + image.save(image_buffer, format="jpeg", quality=75) + instance.preview_image = InMemoryUploadedFile( + ContentFile(image_buffer.getvalue()), + "preview_image", + file_name, + "image/jpg", + image_buffer.tell(), + None, + ) - save_without_broadcast = isinstance(instance, (models.Book, models.User)) - if save_without_broadcast: - instance.save(update_fields=["preview_image"], broadcast=False) - else: - instance.save(update_fields=["preview_image"]) + save_without_broadcast = isinstance(instance, (models.Book, models.User)) + if save_without_broadcast: + instance.save(update_fields=["preview_image"], broadcast=False) + else: + instance.save(update_fields=["preview_image"]) - # Clean up old file after saving - if os.path.exists(old_path): - os.remove(old_path) - # finally: + # Clean up old file after saving + if os.path.exists(old_path): + os.remove(old_path) + finally: image_buffer.close() diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 2777fc488..a48c60803 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -46,7 +46,7 @@ class PreviewImages(TestCase): ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + self.edition = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=self.work, @@ -71,37 +71,34 @@ class PreviewImages(TestCase): ) def test_site_preview(self, *args, **kwargs): - """generate site preview""" + """generate site preview""" generate_site_preview_image_task() self.site.refresh_from_db() self.assertIsInstance(self.site.preview_image, ImageFieldFile) - result = Image.open(self.site.preview_image) - self.assertEqual( - result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - ) + self.assertIsNotNone(self.site.preview_image) + self.assertEqual(self.site.preview_image.width, settings.PREVIEW_IMG_WIDTH) + self.assertEqual(self.site.preview_image.height, settings.PREVIEW_IMG_HEIGHT) def test_edition_preview(self, *args, **kwargs): - """generate user preview""" - generate_edition_preview_image_task(self.book.id) + """generate edition preview""" + generate_edition_preview_image_task(self.edition.id) - self.book.refresh_from_db() + self.edition.refresh_from_db() - self.assertIsInstance(self.book.preview_image, ImageFieldFile) - result = Image.open(self.book.preview_image) - self.assertEqual( - result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - ) + self.assertIsInstance(self.edition.preview_image, ImageFieldFile) + self.assertIsNotNone(self.edition.preview_image) + self.assertEqual(self.edition.preview_image.width, settings.PREVIEW_IMG_WIDTH) + self.assertEqual(self.edition.preview_image.height, settings.PREVIEW_IMG_HEIGHT) def test_user_preview(self, *args, **kwargs): - """generate user preview""" + """generate user preview""" generate_user_preview_image_task(self.local_user.id) self.local_user.refresh_from_db() self.assertIsInstance(self.local_user.preview_image, ImageFieldFile) - result = Image.open(self.local_user.preview_image) - self.assertEqual( - result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - ) + self.assertIsNotNone(self.local_user.preview_image) + self.assertEqual(self.local_user.preview_image.width, settings.PREVIEW_IMG_WIDTH) + self.assertEqual(self.local_user.preview_image.height, settings.PREVIEW_IMG_HEIGHT) From fbb262fe88986001f4a8e00c3a8ceb62ef8be604 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 13:44:43 +0200 Subject: [PATCH 048/130] Try logging output --- bookwyrm/preview_images.py | 16 ++++++++++++++++ bookwyrm/settings.py | 3 +++ 2 files changed, 19 insertions(+) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 41dbf8bc7..aeb5597e4 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -15,6 +15,9 @@ from django.db.models import Avg from bookwyrm import models, settings from bookwyrm.tasks import app +# remove after testing in Github Actions +import sys + IMG_WIDTH = settings.PREVIEW_IMG_WIDTH IMG_HEIGHT = settings.PREVIEW_IMG_HEIGHT @@ -305,8 +308,12 @@ def generate_preview_image( def save_and_cleanup(image, instance=None): + sys.stdout.write("/start save_and_cleanup") + if instance: + sys.stdout.write("\nInstance OK, ") file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4())) + sys.stdout.write("%s, " % file_name) image_buffer = BytesIO() try: @@ -314,6 +321,8 @@ def save_and_cleanup(image, instance=None): old_path = instance.preview_image.path except ValueError: old_path = "" + + sys.stdout.write("path: %s, " % old_path) # Save image.save(image_buffer, format="jpeg", quality=75) @@ -325,6 +334,8 @@ def save_and_cleanup(image, instance=None): image_buffer.tell(), None, ) + sys.stdout.write("before save: %sx" % instance.preview_image.width) + sys.stdout.write("%s, " % instance.preview_image.height) save_without_broadcast = isinstance(instance, (models.Book, models.User)) if save_without_broadcast: @@ -332,12 +343,17 @@ def save_and_cleanup(image, instance=None): else: instance.save(update_fields=["preview_image"]) + instance.refresh_from_db() + sys.stdout.write("after save: %sx" % instance.preview_image.width) + sys.stdout.write("%s\n" % instance.preview_image.height) + # Clean up old file after saving if os.path.exists(old_path): os.remove(old_path) finally: image_buffer.close() + sys.stdout.write("end save_and_cleanup/\n") @app.task def generate_site_preview_image_task(): diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index a4cf74f0b..2bfc96c5b 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -177,6 +177,9 @@ USE_L10N = True USE_TZ = True +NOSE_ARGS = ['--nocapture', + '--nologcapture',] + # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.2/howto/static-files/ From 00b09cd07db49358ac9d13035a1e5ed8705880b7 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 14:43:06 +0200 Subject: [PATCH 049/130] Try with logging --- bookwyrm/preview_images.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index aeb5597e4..8cdbcc38f 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -16,7 +16,7 @@ from bookwyrm import models, settings from bookwyrm.tasks import app # remove after testing in Github Actions -import sys +import logging IMG_WIDTH = settings.PREVIEW_IMG_WIDTH @@ -308,12 +308,12 @@ def generate_preview_image( def save_and_cleanup(image, instance=None): - sys.stdout.write("/start save_and_cleanup") + logging.warn("/start save_and_cleanup") if instance: - sys.stdout.write("\nInstance OK, ") + logging.warn("\nInstance OK, ") file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4())) - sys.stdout.write("%s, " % file_name) + logging.warn("%s, " % file_name) image_buffer = BytesIO() try: @@ -322,7 +322,7 @@ def save_and_cleanup(image, instance=None): except ValueError: old_path = "" - sys.stdout.write("path: %s, " % old_path) + logging.warn("path: %s, " % old_path) # Save image.save(image_buffer, format="jpeg", quality=75) @@ -334,18 +334,18 @@ def save_and_cleanup(image, instance=None): image_buffer.tell(), None, ) - sys.stdout.write("before save: %sx" % instance.preview_image.width) - sys.stdout.write("%s, " % instance.preview_image.height) + logging.warn("before save: %sx" % instance.preview_image.width) + logging.warn("%s, " % instance.preview_image.height) save_without_broadcast = isinstance(instance, (models.Book, models.User)) if save_without_broadcast: - instance.save(update_fields=["preview_image"], broadcast=False) + instance.save(broadcast=False) else: - instance.save(update_fields=["preview_image"]) + instance.save() instance.refresh_from_db() - sys.stdout.write("after save: %sx" % instance.preview_image.width) - sys.stdout.write("%s\n" % instance.preview_image.height) + logging.warn("after save: %sx" % instance.preview_image.width) + logging.warn("%s\n" % instance.preview_image.height) # Clean up old file after saving if os.path.exists(old_path): @@ -353,7 +353,7 @@ def save_and_cleanup(image, instance=None): finally: image_buffer.close() - sys.stdout.write("end save_and_cleanup/\n") + logging.warn("end save_and_cleanup/\n") @app.task def generate_site_preview_image_task(): From ba39dad06c49131a4ba622d070f123d8e56d702b Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 15:32:04 +0200 Subject: [PATCH 050/130] Add save_and_cleanup test --- bookwyrm/tests/test_preview_images.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index a48c60803..41d11d439 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -16,6 +16,7 @@ from bookwyrm.preview_images import ( generate_edition_preview_image_task, generate_user_preview_image_task, generate_preview_image, + save_and_cleanup, ) import logging @@ -70,6 +71,19 @@ class PreviewImages(TestCase): result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) ) + def test_store_preview_image(self, *args, **kwargs): + image = Image.new("RGB", (200, 200), color="#F00") + + result = save_and_cleanup(image, instance=self.local_user) + self.assertTrue(result) + + self.local_user.refresh_from_db() + self.assertIsInstance(self.local_user.preview_image, ImageFieldFile) + self.assertIsNotNone(self.local_user.preview_image) + self.assertEqual(self.local_user.preview_image.width, 200) + self.assertEqual(self.local_user.preview_image.height, 200) + + def test_site_preview(self, *args, **kwargs): """generate site preview""" generate_site_preview_image_task() From cd7c0ccaeaa29d1112241cd579b2e15aba1ab320 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 15:51:56 +0200 Subject: [PATCH 051/130] Enable env on GitHub Actions --- .github/workflows/django-tests.yml | 1 + bookwyrm/preview_images.py | 25 +++++++------------------ bookwyrm/settings.py | 3 --- bookwyrm/tests/test_preview_images.py | 17 +++++++++-------- 4 files changed, 17 insertions(+), 29 deletions(-) diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml index 3ce368ecd..391afdd4c 100644 --- a/.github/workflows/django-tests.yml +++ b/.github/workflows/django-tests.yml @@ -64,5 +64,6 @@ jobs: EMAIL_HOST_USER: "" EMAIL_HOST_PASSWORD: "" EMAIL_USE_TLS: true + ENABLE_PREVIEW_IMAGES": true run: | python manage.py test diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 8cdbcc38f..180162cea 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -15,9 +15,6 @@ from django.db.models import Avg from bookwyrm import models, settings from bookwyrm.tasks import app -# remove after testing in Github Actions -import logging - IMG_WIDTH = settings.PREVIEW_IMG_WIDTH IMG_HEIGHT = settings.PREVIEW_IMG_HEIGHT @@ -308,12 +305,8 @@ def generate_preview_image( def save_and_cleanup(image, instance=None): - logging.warn("/start save_and_cleanup") - - if instance: - logging.warn("\nInstance OK, ") + if isinstance(instance, (models.Book, models.User, models.SiteSettings)): file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4())) - logging.warn("%s, " % file_name) image_buffer = BytesIO() try: @@ -321,11 +314,10 @@ def save_and_cleanup(image, instance=None): old_path = instance.preview_image.path except ValueError: old_path = "" - - logging.warn("path: %s, " % old_path) # Save image.save(image_buffer, format="jpeg", quality=75) + instance.preview_image = InMemoryUploadedFile( ContentFile(image_buffer.getvalue()), "preview_image", @@ -334,26 +326,23 @@ def save_and_cleanup(image, instance=None): image_buffer.tell(), None, ) - logging.warn("before save: %sx" % instance.preview_image.width) - logging.warn("%s, " % instance.preview_image.height) save_without_broadcast = isinstance(instance, (models.Book, models.User)) if save_without_broadcast: - instance.save(broadcast=False) + result = instance.save(broadcast=False) else: instance.save() - instance.refresh_from_db() - logging.warn("after save: %sx" % instance.preview_image.width) - logging.warn("%s\n" % instance.preview_image.height) - # Clean up old file after saving if os.path.exists(old_path): os.remove(old_path) + finally: image_buffer.close() + return True + else: + return False - logging.warn("end save_and_cleanup/\n") @app.task def generate_site_preview_image_task(): diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 2bfc96c5b..a4cf74f0b 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -177,9 +177,6 @@ USE_L10N = True USE_TZ = True -NOSE_ARGS = ['--nocapture', - '--nologcapture',] - # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.2/howto/static-files/ diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 41d11d439..c65615e8a 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -1,5 +1,4 @@ """ test generating preview images """ -import sys import pathlib from unittest.mock import patch from PIL import Image @@ -22,7 +21,6 @@ from bookwyrm.preview_images import ( import logging -@patch("bookwyrm.emailing.send_email.delay") class PreviewImages(TestCase): """every response to a get request, html or json""" @@ -83,9 +81,8 @@ class PreviewImages(TestCase): self.assertEqual(self.local_user.preview_image.width, 200) self.assertEqual(self.local_user.preview_image.height, 200) - def test_site_preview(self, *args, **kwargs): - """generate site preview""" + """generate site preview""" generate_site_preview_image_task() self.site.refresh_from_db() @@ -96,7 +93,7 @@ class PreviewImages(TestCase): self.assertEqual(self.site.preview_image.height, settings.PREVIEW_IMG_HEIGHT) def test_edition_preview(self, *args, **kwargs): - """generate edition preview""" + """generate edition preview""" generate_edition_preview_image_task(self.edition.id) self.edition.refresh_from_db() @@ -107,12 +104,16 @@ class PreviewImages(TestCase): self.assertEqual(self.edition.preview_image.height, settings.PREVIEW_IMG_HEIGHT) def test_user_preview(self, *args, **kwargs): - """generate user preview""" + """generate user preview""" generate_user_preview_image_task(self.local_user.id) self.local_user.refresh_from_db() self.assertIsInstance(self.local_user.preview_image, ImageFieldFile) self.assertIsNotNone(self.local_user.preview_image) - self.assertEqual(self.local_user.preview_image.width, settings.PREVIEW_IMG_WIDTH) - self.assertEqual(self.local_user.preview_image.height, settings.PREVIEW_IMG_HEIGHT) + self.assertEqual( + self.local_user.preview_image.width, settings.PREVIEW_IMG_WIDTH + ) + self.assertEqual( + self.local_user.preview_image.height, settings.PREVIEW_IMG_HEIGHT + ) From 5966520f0d4639ba82a06bb041329af0bd022a6c Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 16:01:33 +0200 Subject: [PATCH 052/130] Ok this is stupid. --- .github/workflows/django-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml index 391afdd4c..c4f7bb6e5 100644 --- a/.github/workflows/django-tests.yml +++ b/.github/workflows/django-tests.yml @@ -64,6 +64,6 @@ jobs: EMAIL_HOST_USER: "" EMAIL_HOST_PASSWORD: "" EMAIL_USE_TLS: true - ENABLE_PREVIEW_IMAGES": true + ENABLE_PREVIEW_IMAGES: true run: | python manage.py test From 3db8a0916996537d34b1bdee54adcb6d32f4aebe Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 5 Jun 2021 22:29:06 +0200 Subject: [PATCH 053/130] Locales: French update --- locale/fr_FR/LC_MESSAGES/django.mo | Bin 45401 -> 45654 bytes locale/fr_FR/LC_MESSAGES/django.po | 685 ++++++++++++++++++----------- 2 files changed, 434 insertions(+), 251 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index b893b1287e9b958ea2c5cc78708ab547f378d4b4..9ee6ba4e5ee57843822b31b5e65908a877ab021d 100644 GIT binary patch delta 14041 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 BRQ~_~ delta 13750 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 diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index a96f9d76d..1e90d80ae 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-23 10:45+0000\n" +"POT-Creation-Date: 2021-06-02 16:08+0000\n" "PO-Revision-Date: 2021-04-05 12:44+0100\n" "Last-Translator: Fabien Basmaison \n" "Language-Team: Mouse Reeve \n" @@ -56,12 +56,12 @@ msgid "Book Title" msgstr "Titre du livre" #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34 -#: bookwyrm/templates/user/shelf/shelf.html:84 -#: bookwyrm/templates/user/shelf/shelf.html:115 +#: bookwyrm/templates/user/shelf/shelf.html:85 +#: bookwyrm/templates/user/shelf/shelf.html:116 msgid "Rating" msgstr "Note" -#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101 +#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "Trier par" @@ -73,41 +73,41 @@ msgstr "Ordre croissant" msgid "Descending" msgstr "Ordre décroissant" -#: bookwyrm/models/fields.py:24 +#: bookwyrm/models/fields.py:25 #, python-format msgid "%(value)s is not a valid remote_id" msgstr "%(value)s n’est pas une remote_id valide." -#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42 +#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43 #, python-format msgid "%(value)s is not a valid username" msgstr "%(value)s n’est pas un nom de compte valide." -#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157 +#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152 msgid "username" msgstr "nom du compte :" -#: bookwyrm/models/fields.py:170 +#: bookwyrm/models/fields.py:171 msgid "A user with that username already exists." msgstr "Ce nom est déjà associé à un compte." -#: bookwyrm/settings.py:155 +#: bookwyrm/settings.py:156 msgid "English" msgstr "English" -#: bookwyrm/settings.py:156 +#: bookwyrm/settings.py:157 msgid "German" msgstr "Deutsch" -#: bookwyrm/settings.py:157 +#: bookwyrm/settings.py:158 msgid "Spanish" msgstr "Español" -#: bookwyrm/settings.py:158 +#: bookwyrm/settings.py:159 msgid "French" msgstr "Français" -#: bookwyrm/settings.py:159 +#: bookwyrm/settings.py:160 msgid "Simplified Chinese" msgstr "简化字" @@ -137,7 +137,7 @@ msgid "Edit Author" msgstr "Modifier l’auteur ou autrice" #: bookwyrm/templates/author/author.html:32 -#: bookwyrm/templates/author/edit_author.html:38 +#: bookwyrm/templates/author/edit_author.html:41 msgid "Aliases:" msgstr "Pseudonymes :" @@ -173,85 +173,85 @@ msgid "Edit Author:" msgstr "Modifier l’auteur ou l’autrice :" #: bookwyrm/templates/author/edit_author.html:13 -#: bookwyrm/templates/book/edit_book.html:18 +#: bookwyrm/templates/book/edit_book.html:19 msgid "Added:" -msgstr "AJouté :" +msgstr "Ajouté :" #: bookwyrm/templates/author/edit_author.html:14 -#: bookwyrm/templates/book/edit_book.html:19 +#: bookwyrm/templates/book/edit_book.html:24 msgid "Updated:" msgstr "Mis à jour :" #: bookwyrm/templates/author/edit_author.html:15 -#: bookwyrm/templates/book/edit_book.html:20 +#: bookwyrm/templates/book/edit_book.html:30 msgid "Last edited by:" msgstr "Dernière modification par :" #: bookwyrm/templates/author/edit_author.html:31 -#: bookwyrm/templates/book/edit_book.html:90 +#: bookwyrm/templates/book/edit_book.html:117 msgid "Metadata" msgstr "Métadonnées" -#: bookwyrm/templates/author/edit_author.html:32 +#: bookwyrm/templates/author/edit_author.html:33 #: bookwyrm/templates/lists/form.html:8 #: bookwyrm/templates/user/shelf/create_shelf_form.html:13 #: bookwyrm/templates/user/shelf/edit_shelf_form.html:14 msgid "Name:" msgstr "Nom :" -#: bookwyrm/templates/author/edit_author.html:40 -#: bookwyrm/templates/book/edit_book.html:132 -#: bookwyrm/templates/book/edit_book.html:141 -#: bookwyrm/templates/book/edit_book.html:178 +#: bookwyrm/templates/author/edit_author.html:43 +#: bookwyrm/templates/book/edit_book.html:162 +#: bookwyrm/templates/book/edit_book.html:171 +#: bookwyrm/templates/book/edit_book.html:214 msgid "Separate multiple values with commas." msgstr "Séparez plusieurs valeurs par une virgule." -#: bookwyrm/templates/author/edit_author.html:46 +#: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" msgstr "Bio :" -#: bookwyrm/templates/author/edit_author.html:51 +#: bookwyrm/templates/author/edit_author.html:57 msgid "Wikipedia link:" msgstr "Wikipedia :" -#: bookwyrm/templates/author/edit_author.html:57 +#: bookwyrm/templates/author/edit_author.html:63 msgid "Birth date:" msgstr "Date de naissance :" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:71 msgid "Death date:" msgstr "Date de décès :" -#: bookwyrm/templates/author/edit_author.html:73 +#: bookwyrm/templates/author/edit_author.html:79 msgid "Author Identifiers" msgstr "Identifiants de l’auteur ou autrice" -#: bookwyrm/templates/author/edit_author.html:74 +#: bookwyrm/templates/author/edit_author.html:81 msgid "Openlibrary key:" msgstr "Clé Openlibrary :" -#: bookwyrm/templates/author/edit_author.html:79 -#: bookwyrm/templates/book/edit_book.html:243 +#: bookwyrm/templates/author/edit_author.html:89 +#: bookwyrm/templates/book/edit_book.html:293 msgid "Inventaire ID:" msgstr "Identifiant Inventaire :" -#: bookwyrm/templates/author/edit_author.html:84 +#: bookwyrm/templates/author/edit_author.html:97 msgid "Librarything key:" msgstr "Clé Librarything :" -#: bookwyrm/templates/author/edit_author.html:89 +#: bookwyrm/templates/author/edit_author.html:105 msgid "Goodreads key:" msgstr "Clé Goodreads :" -#: bookwyrm/templates/author/edit_author.html:98 +#: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:124 -#: bookwyrm/templates/book/edit_book.html:263 +#: bookwyrm/templates/book/edit_book.html:321 #: bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/preferences/edit_user.html:70 #: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 #: bookwyrm/templates/settings/federated_server.html:98 -#: bookwyrm/templates/settings/site.html:97 +#: bookwyrm/templates/settings/site.html:101 #: bookwyrm/templates/snippets/readthrough.html:77 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42 @@ -260,10 +260,10 @@ msgstr "Clé Goodreads :" msgid "Save" msgstr "Enregistrer" -#: bookwyrm/templates/author/edit_author.html:99 +#: bookwyrm/templates/author/edit_author.html:117 #: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174 #: bookwyrm/templates/book/cover_modal.html:32 -#: bookwyrm/templates/book/edit_book.html:264 +#: bookwyrm/templates/book/edit_book.html:322 #: bookwyrm/templates/moderation/report_modal.html:34 #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 @@ -307,7 +307,7 @@ msgid "Add Description" msgstr "Ajouter une description" #: bookwyrm/templates/book/book.html:120 -#: bookwyrm/templates/book/edit_book.html:108 +#: bookwyrm/templates/book/edit_book.html:136 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "Description :" @@ -320,12 +320,17 @@ msgstr "%(count)s éditions" #: bookwyrm/templates/book/book.html:142 #, python-format msgid "This edition is on your %(shelf_name)s shelf." -msgstr "Cette édition est sur votre étagère %(shelf_name)s." +msgstr "" +"Cette édition est sur votre étagère %(shelf_name)s." #: bookwyrm/templates/book/book.html:148 #, python-format -msgid "A different edition of this book is on your %(shelf_name)s shelf." -msgstr "Une édition différente de ce livre existe sur votre étagère %(shelf_name)s." +msgid "" +"A different edition of this book is on your %(shelf_name)s shelf." +msgstr "" +"Une édition différente de ce livre existe sur " +"votre étagère %(shelf_name)s." #: bookwyrm/templates/book/book.html:159 msgid "Your reading activity" @@ -367,7 +372,7 @@ msgstr "Sujets" msgid "Places" msgstr "Lieux" -#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -381,7 +386,7 @@ msgstr "Ajouter à la liste" #: bookwyrm/templates/book/book.html:297 #: bookwyrm/templates/book/cover_modal.html:31 -#: bookwyrm/templates/lists/list.html:164 +#: bookwyrm/templates/lists/list.html:179 msgid "Add" msgstr "Ajouter" @@ -390,22 +395,22 @@ msgid "ISBN:" msgstr "ISBN :" #: bookwyrm/templates/book/book_identifiers.html:14 -#: bookwyrm/templates/book/edit_book.html:248 +#: bookwyrm/templates/book/edit_book.html:301 msgid "OCLC Number:" msgstr "Numéro OCLC :" #: bookwyrm/templates/book/book_identifiers.html:21 -#: bookwyrm/templates/book/edit_book.html:253 +#: bookwyrm/templates/book/edit_book.html:309 msgid "ASIN:" msgstr "ASIN :" #: bookwyrm/templates/book/cover_modal.html:17 -#: bookwyrm/templates/book/edit_book.html:192 +#: bookwyrm/templates/book/edit_book.html:229 msgid "Upload cover:" msgstr "Charger une couverture :" #: bookwyrm/templates/book/cover_modal.html:23 -#: bookwyrm/templates/book/edit_book.html:198 +#: bookwyrm/templates/book/edit_book.html:235 msgid "Load cover from url:" msgstr "Charger la couverture depuis une URL :" @@ -420,127 +425,132 @@ msgstr "Modifier « %(book_title)s »" msgid "Add Book" msgstr "Ajouter un livre" -#: bookwyrm/templates/book/edit_book.html:40 +#: bookwyrm/templates/book/edit_book.html:54 msgid "Confirm Book Info" msgstr "Confirmer les informations de ce livre" -#: bookwyrm/templates/book/edit_book.html:47 +#: bookwyrm/templates/book/edit_book.html:62 #, python-format msgid "Is \"%(name)s\" an existing author?" -msgstr "Est‑ce que l’auteur ou l’autrice « %(name)s » existe déjà ?" +msgstr "Est‑ce que l’auteur/autrice « %(name)s » existe déjà ?" -#: bookwyrm/templates/book/edit_book.html:52 +#: bookwyrm/templates/book/edit_book.html:71 #, python-format msgid "Author of %(book_title)s" -msgstr "Commencer « %(book_title)s »" +msgstr "Auteur/autrice de %(book_title)s" -#: bookwyrm/templates/book/edit_book.html:55 +#: bookwyrm/templates/book/edit_book.html:75 msgid "This is a new author" msgstr "Il s’agit d’un nouvel auteur ou d’une nouvelle autrice." -#: bookwyrm/templates/book/edit_book.html:61 +#: bookwyrm/templates/book/edit_book.html:82 #, python-format msgid "Creating a new author: %(name)s" -msgstr "Création d’un nouvel auteur ou d’une nouvelle autrice : %(name)s" +msgstr "Création d’un nouvel auteur/autrice : %(name)s" -#: bookwyrm/templates/book/edit_book.html:67 +#: bookwyrm/templates/book/edit_book.html:89 msgid "Is this an edition of an existing work?" msgstr "Est‑ce l’édition d’un ouvrage existant ?" -#: bookwyrm/templates/book/edit_book.html:71 +#: bookwyrm/templates/book/edit_book.html:97 msgid "This is a new work" msgstr "Il s’agit d’un nouvel ouvrage." -#: bookwyrm/templates/book/edit_book.html:77 +#: bookwyrm/templates/book/edit_book.html:104 #: bookwyrm/templates/password_reset.html:30 msgid "Confirm" msgstr "Confirmer" -#: bookwyrm/templates/book/edit_book.html:79 +#: bookwyrm/templates/book/edit_book.html:106 #: bookwyrm/templates/feed/status.html:8 msgid "Back" msgstr "Retour" -#: bookwyrm/templates/book/edit_book.html:93 +#: bookwyrm/templates/book/edit_book.html:120 msgid "Title:" msgstr "Titre :" -#: bookwyrm/templates/book/edit_book.html:101 +#: bookwyrm/templates/book/edit_book.html:128 msgid "Subtitle:" msgstr "Sous‑titre :" -#: bookwyrm/templates/book/edit_book.html:114 +#: bookwyrm/templates/book/edit_book.html:144 msgid "Series:" msgstr "Série :" -#: bookwyrm/templates/book/edit_book.html:122 +#: bookwyrm/templates/book/edit_book.html:152 msgid "Series number:" msgstr "Numéro dans la série :" -#: bookwyrm/templates/book/edit_book.html:130 +#: bookwyrm/templates/book/edit_book.html:160 msgid "Languages:" msgstr "Langues :" -#: bookwyrm/templates/book/edit_book.html:139 +#: bookwyrm/templates/book/edit_book.html:169 msgid "Publisher:" msgstr "Éditeur :" -#: bookwyrm/templates/book/edit_book.html:148 +#: bookwyrm/templates/book/edit_book.html:178 msgid "First published date:" msgstr "Première date de publication :" -#: bookwyrm/templates/book/edit_book.html:156 +#: bookwyrm/templates/book/edit_book.html:186 msgid "Published date:" msgstr "Date de publication :" -#: bookwyrm/templates/book/edit_book.html:165 +#: bookwyrm/templates/book/edit_book.html:195 msgid "Authors" msgstr "Auteurs ou autrices" -#: bookwyrm/templates/book/edit_book.html:171 +#: bookwyrm/templates/book/edit_book.html:202 #, python-format -msgid "Remove %(name)s" -msgstr "Supprimer %(name)s" +msgid "Remove %(name)s" +msgstr "Retirer %(name)s" -#: bookwyrm/templates/book/edit_book.html:176 +#: bookwyrm/templates/book/edit_book.html:205 +#, python-format +msgid "Author page for %(name)s" +msgstr "Page de %(name)s" + +#: bookwyrm/templates/book/edit_book.html:212 msgid "Add Authors:" msgstr "Ajouter des auteurs ou autrices :" -#: bookwyrm/templates/book/edit_book.html:177 +#: bookwyrm/templates/book/edit_book.html:213 msgid "John Doe, Jane Smith" msgstr "Claude Dupont, Dominique Durand" -#: bookwyrm/templates/book/edit_book.html:183 -#: bookwyrm/templates/user/shelf/shelf.html:77 +#: bookwyrm/templates/book/edit_book.html:220 +#: bookwyrm/templates/user/shelf/shelf.html:78 msgid "Cover" msgstr "Couverture" -#: bookwyrm/templates/book/edit_book.html:211 +#: bookwyrm/templates/book/edit_book.html:248 msgid "Physical Properties" msgstr "Propriétés physiques" -#: bookwyrm/templates/book/edit_book.html:212 +#: bookwyrm/templates/book/edit_book.html:250 #: bookwyrm/templates/book/format_filter.html:5 msgid "Format:" msgstr "Format :" -#: bookwyrm/templates/book/edit_book.html:220 +#: bookwyrm/templates/book/edit_book.html:258 msgid "Pages:" msgstr "Pages :" -#: bookwyrm/templates/book/edit_book.html:227 +#: bookwyrm/templates/book/edit_book.html:267 msgid "Book Identifiers" msgstr "Identifiants du livre" -#: bookwyrm/templates/book/edit_book.html:228 +#: bookwyrm/templates/book/edit_book.html:269 msgid "ISBN 13:" msgstr "ISBN 13 :" -#: bookwyrm/templates/book/edit_book.html:233 +#: bookwyrm/templates/book/edit_book.html:277 msgid "ISBN 10:" msgstr "ISBN 10 :" -#: bookwyrm/templates/book/edit_book.html:238 +#: bookwyrm/templates/book/edit_book.html:285 msgid "Openlibrary ID:" msgstr "Identifiant Openlibrary :" @@ -630,18 +640,24 @@ msgstr "Communauté fédérée" #: bookwyrm/templates/directory/directory.html:4 #: bookwyrm/templates/directory/directory.html:9 -#: bookwyrm/templates/layout.html:92 +#: bookwyrm/templates/layout.html:64 msgid "Directory" msgstr "Répertoire" #: bookwyrm/templates/directory/directory.html:17 msgid "Make your profile discoverable to other BookWyrm users." -msgstr "Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir votre profil." +msgstr "" +"Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir " +"votre profil." #: bookwyrm/templates/directory/directory.html:24 #, python-format -msgid "You can opt-out at any time in your profile settings." -msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos paramètres de profil." +msgid "" +"You can opt-out at any time in your profile settings." +msgstr "" +"Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos " +"paramètres de profil." #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/snippets/announcement.html:34 @@ -770,8 +786,12 @@ msgstr "Bien le bonjour," #: bookwyrm/templates/email/html_layout.html:21 #, python-format -msgid "BookWyrm hosted on %(site_name)s" -msgstr "BookWyrm, hébergé par %(site_name)s" +msgid "" +"BookWyrm hosted on " +"%(site_name)s" +msgstr "" +"BookWyrm, hébergé par %(site_name)s" #: bookwyrm/templates/email/html_layout.html:23 msgid "Email preference" @@ -789,13 +809,21 @@ msgstr "S’enregistrer maintenant" #: bookwyrm/templates/email/invite/html_content.html:15 #, python-format -msgid "Learn more about this instance." -msgstr "En savoir plus sur cette instance." +msgid "" +"Learn more about this instance." +msgstr "" +"En savoir plus sur cette " +"instance." #: bookwyrm/templates/email/invite/text_content.html:4 #, python-format -msgid "You're invited to join %(site_name)s! Click the link below to create an account." -msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien suivant pour créer un compte." +msgid "" +"You're invited to join %(site_name)s! Click the link below to create an " +"account." +msgstr "" +"Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien " +"suivant pour créer un compte." #: bookwyrm/templates/email/invite/text_content.html:8 msgid "Learn more about this instance:" @@ -804,8 +832,13 @@ msgstr "En savoir plus sur cete instance :" #: bookwyrm/templates/email/password_reset/html_content.html:6 #: bookwyrm/templates/email/password_reset/text_content.html:4 #, python-format -msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account." -msgstr "Une demande de réinitialisation de votre mot de passe sur %(site_name)s a été initialisée. Cliquez le lien suivant pour définir un nouveau mot de passe et vous connecter à votre compte." +msgid "" +"You requested to reset your %(site_name)s password. Click the link below to " +"set a new password and log in to your account." +msgstr "" +"Une demande de réinitialisation de votre mot de passe sur %(site_name)s a été initialisée. Cliquez le lien suivant pour définir un nouveau mot de " +"passe et vous connecter à votre compte." #: bookwyrm/templates/email/password_reset/html_content.html:9 #: bookwyrm/templates/password_reset.html:4 @@ -817,8 +850,11 @@ msgstr "Changez le mot de passe" #: bookwyrm/templates/email/password_reset/html_content.html:13 #: bookwyrm/templates/email/password_reset/text_content.html:8 -msgid "If you didn't request to reset your password, you can ignore this email." -msgstr "Si vous n’avez pas demandé la réinitialisation de votre mot de passe, vous pouvez ignorer cet email." +msgid "" +"If you didn't request to reset your password, you can ignore this email." +msgstr "" +"Si vous n’avez pas demandé la réinitialisation de votre mot de passe, vous " +"pouvez ignorer cet email." #: bookwyrm/templates/email/password_reset/subject.html:2 #, python-format @@ -831,7 +867,7 @@ msgid "Direct Messages with %(username)s" msgstr "Messages directs avec %(username)s" #: bookwyrm/templates/feed/direct_messages.html:10 -#: bookwyrm/templates/layout.html:87 +#: bookwyrm/templates/layout.html:92 msgid "Direct Messages" msgstr "Messages directs" @@ -871,11 +907,14 @@ msgstr "Fédéré" #: bookwyrm/templates/feed/feed.html:32 #, python-format msgid "load 0 unread status(es)" -msgstr "charger le(s) 0 statut(s) non lu(s)" +msgstr "" +"charger le(s) 0 statut(s) non lu(s)" #: bookwyrm/templates/feed/feed.html:47 -msgid "There aren't any activities right now! Try following a user to get started" -msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer" +msgid "" +"There aren't any activities right now! Try following a user to get started" +msgstr "" +"Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer" #: bookwyrm/templates/feed/feed.html:55 #: bookwyrm/templates/get_started/users.html:6 @@ -887,13 +926,13 @@ msgid "Updates" msgstr "Mises à jour" #: bookwyrm/templates/feed/feed_layout.html:10 -#: bookwyrm/templates/layout.html:58 #: bookwyrm/templates/user/shelf/books_header.html:3 msgid "Your books" msgstr "Vos livres" #: bookwyrm/templates/feed/feed_layout.html:12 -msgid "There are no books here right now! Try searching for a book to get started" +msgid "" +"There are no books here right now! Try searching for a book to get started" msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer" #: bookwyrm/templates/feed/feed_layout.html:23 @@ -942,7 +981,7 @@ msgid "What are you reading?" msgstr "Que lisez‑vous ?" #: bookwyrm/templates/get_started/books.html:9 -#: bookwyrm/templates/lists/list.html:120 +#: bookwyrm/templates/lists/list.html:135 msgid "Search for a book" msgstr "Chercher un livre" @@ -955,14 +994,16 @@ msgstr "Aucun livre trouvé pour « %(query)s »" #: bookwyrm/templates/get_started/books.html:11 #, python-format msgid "You can add books when you start using %(site_name)s." -msgstr "Vous pourrez ajouter des livres lorsque vous commencerez à utiliser %(site_name)s." +msgstr "" +"Vous pourrez ajouter des livres lorsque vous commencerez à utiliser " +"%(site_name)s." #: bookwyrm/templates/get_started/books.html:16 #: bookwyrm/templates/get_started/books.html:17 #: bookwyrm/templates/get_started/users.html:18 #: bookwyrm/templates/get_started/users.html:19 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38 -#: bookwyrm/templates/lists/list.html:124 +#: bookwyrm/templates/lists/list.html:139 #: bookwyrm/templates/search/layout.html:4 #: bookwyrm/templates/search/layout.html:9 msgid "Search" @@ -978,7 +1019,7 @@ msgid "Popular on %(site_name)s" msgstr "Populaire sur %(site_name)s" #: bookwyrm/templates/get_started/books.html:58 -#: bookwyrm/templates/lists/list.html:137 +#: bookwyrm/templates/lists/list.html:152 msgid "No books found" msgstr "Aucun livre trouvé" @@ -1047,8 +1088,12 @@ msgid "Show this account in suggested users:" msgstr "Afficher ce compte dans ceux suggérés :" #: bookwyrm/templates/get_started/profile.html:52 -msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." -msgstr "Votre compte sera listé dans le répertoire et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm." +msgid "" +"Your account will show up in the directory, and may be recommended to other " +"BookWyrm users." +msgstr "" +"Votre compte sera listé dans le répertoire et pourra être recommandé à " +"d’autres utilisateurs ou utilisatrices de BookWyrm." #: bookwyrm/templates/get_started/users.html:11 msgid "Search for a user" @@ -1071,8 +1116,12 @@ msgstr "Modifier le défi" #: bookwyrm/templates/goal.html:30 #: bookwyrm/templates/snippets/goal_card.html:13 #, python-format -msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year." -msgstr "Définissez un nombre de livre à lire comme objectif pour %(year)s, et suivezvotre progression au fil de l’année." +msgid "" +"Set a goal for how many books you'll finish reading in %(year)s, and track " +"your progress throughout the year." +msgstr "" +"Définissez un nombre de livre à lire comme objectif pour %(year)s, et " +"suivezvotre progression au fil de l’année." #: bookwyrm/templates/goal.html:39 #, python-format @@ -1090,7 +1139,7 @@ msgid "%(username)s's %(year)s Books" msgstr "Livres de %(username)s en %(year)s" #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 -#: bookwyrm/templates/layout.html:97 +#: bookwyrm/templates/user/shelf/shelf.html:40 msgid "Import Books" msgstr "Importer des livres" @@ -1128,65 +1177,74 @@ msgstr "Aucune importation récente" msgid "Import Status" msgstr "Statut de l’importation" -#: bookwyrm/templates/import_status.html:12 +#: bookwyrm/templates/import_status.html:13 msgid "Import started:" -msgstr "Importation en cours :" +msgstr "Début de l’importation :" -#: bookwyrm/templates/import_status.html:16 +#: bookwyrm/templates/import_status.html:18 msgid "Import completed:" -msgstr "Importation terminé :" +msgstr "Fin de l’importation :" -#: bookwyrm/templates/import_status.html:19 +#: bookwyrm/templates/import_status.html:23 msgid "TASK FAILED" msgstr "la tâche a échoué" -#: bookwyrm/templates/import_status.html:25 +#: bookwyrm/templates/import_status.html:30 msgid "Import still in progress." msgstr "L’importation est toujours en cours" -#: bookwyrm/templates/import_status.html:27 +#: bookwyrm/templates/import_status.html:32 msgid "(Hit reload to update!)" -msgstr "(Rechargez la page pour mettre à jour !" +msgstr "(Rechargez la page pour la mettre à jour !)" -#: bookwyrm/templates/import_status.html:34 +#: bookwyrm/templates/import_status.html:39 msgid "Failed to load" -msgstr "Items non importés" +msgstr "Éléments non importés" -#: bookwyrm/templates/import_status.html:43 +#: bookwyrm/templates/import_status.html:48 #, python-format -msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import." -msgstr "Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant pu être importés." +msgid "" +"Jump to the bottom of the list to select the %(failed_count)s items which " +"failed to import." +msgstr "" +"Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant " +"pu être importés." -#: bookwyrm/templates/import_status.html:78 +#: bookwyrm/templates/import_status.html:60 +#, python-format +msgid "Line %(index)s: %(title)s by %(author)s" +msgstr "Ligne %(index)s : %(title)s par %(author)s" + +#: bookwyrm/templates/import_status.html:80 msgid "Select all" msgstr "Tout sélectionner" -#: bookwyrm/templates/import_status.html:81 +#: bookwyrm/templates/import_status.html:83 msgid "Retry items" -msgstr "Essayer d’importer les items sélectionnés de nouveau" +msgstr "Réessayer l’importation de ces éléments" -#: bookwyrm/templates/import_status.html:107 +#: bookwyrm/templates/import_status.html:109 msgid "Successfully imported" msgstr "Importation réussie" -#: bookwyrm/templates/import_status.html:111 +#: bookwyrm/templates/import_status.html:113 msgid "Book" msgstr "Livre" -#: bookwyrm/templates/import_status.html:114 +#: bookwyrm/templates/import_status.html:116 #: bookwyrm/templates/snippets/create_status_form.html:13 -#: bookwyrm/templates/user/shelf/shelf.html:78 -#: bookwyrm/templates/user/shelf/shelf.html:98 +#: bookwyrm/templates/user/shelf/shelf.html:79 +#: bookwyrm/templates/user/shelf/shelf.html:99 msgid "Title" msgstr "Titre" -#: bookwyrm/templates/import_status.html:117 -#: bookwyrm/templates/user/shelf/shelf.html:79 -#: bookwyrm/templates/user/shelf/shelf.html:101 +#: bookwyrm/templates/import_status.html:119 +#: bookwyrm/templates/user/shelf/shelf.html:80 +#: bookwyrm/templates/user/shelf/shelf.html:102 msgid "Author" -msgstr "Auteur ou autrice" +msgstr "Auteur/autrice" -#: bookwyrm/templates/import_status.html:140 +#: bookwyrm/templates/import_status.html:142 msgid "Imported" msgstr "Importé" @@ -1224,15 +1282,19 @@ msgstr "Chercher un livre ou un compte" msgid "Main navigation menu" msgstr "Menu de navigation principal " -#: bookwyrm/templates/layout.html:61 +#: bookwyrm/templates/layout.html:58 msgid "Feed" msgstr "Fil d’actualité" -#: bookwyrm/templates/layout.html:102 +#: bookwyrm/templates/layout.html:87 +msgid "Your Books" +msgstr "Vos Livres" + +#: bookwyrm/templates/layout.html:97 msgid "Settings" msgstr "Paramètres" -#: bookwyrm/templates/layout.html:111 +#: bookwyrm/templates/layout.html:106 #: bookwyrm/templates/settings/admin_layout.html:31 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 @@ -1240,63 +1302,71 @@ msgstr "Paramètres" msgid "Invites" msgstr "Invitations" -#: bookwyrm/templates/layout.html:118 +#: bookwyrm/templates/layout.html:113 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/layout.html:125 +#: bookwyrm/templates/layout.html:120 msgid "Log out" msgstr "Se déconnecter" -#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134 +#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129 #: bookwyrm/templates/notifications.html:6 #: bookwyrm/templates/notifications.html:11 msgid "Notifications" msgstr "Notifications" -#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160 +#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155 #: bookwyrm/templates/login.html:17 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "Nom du compte :" -#: bookwyrm/templates/layout.html:161 +#: bookwyrm/templates/layout.html:156 msgid "password" msgstr "Mot de passe" -#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36 +#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36 msgid "Forgot your password?" msgstr "Mot de passe oublié ?" -#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10 +#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10 #: bookwyrm/templates/login.html:33 msgid "Log in" msgstr "Se connecter" -#: bookwyrm/templates/layout.html:173 +#: bookwyrm/templates/layout.html:168 msgid "Join" msgstr "Rejoindre" -#: bookwyrm/templates/layout.html:211 +#: bookwyrm/templates/layout.html:206 msgid "About this server" msgstr "À propos de ce serveur" -#: bookwyrm/templates/layout.html:215 +#: bookwyrm/templates/layout.html:210 msgid "Contact site admin" msgstr "Contacter l’administrateur du site" -#: bookwyrm/templates/layout.html:219 +#: bookwyrm/templates/layout.html:214 msgid "Documentation" msgstr "Documentation" -#: bookwyrm/templates/layout.html:226 +#: bookwyrm/templates/layout.html:221 #, python-format -msgid "Support %(site_name)s on %(support_title)s" -msgstr "Soutenez %(site_name)s avec %(support_title)s" +msgid "" +"Support %(site_name)s on " +"%(support_title)s" +msgstr "" +"Soutenez %(site_name)s avec " +"%(support_title)s" -#: bookwyrm/templates/layout.html:230 -msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub." -msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via GitHub." +#: bookwyrm/templates/layout.html:225 +msgid "" +"BookWyrm's source code is freely available. You can contribute or report " +"issues on GitHub." +msgstr "" +"BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports " +"de bogues via GitHub." #: bookwyrm/templates/lists/create_form.html:5 #: bookwyrm/templates/lists/lists.html:20 @@ -1338,7 +1408,7 @@ msgid "Discard" msgstr "Rejeter" #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:17 +#: bookwyrm/templates/lists/list_layout.html:16 msgid "Edit List" msgstr "Modifier la liste" @@ -1385,54 +1455,55 @@ msgstr "Vous avez ajouté un livre à cette liste !" msgid "This list is currently empty" msgstr "Cette liste est actuellement vide" -#: bookwyrm/templates/lists/list.html:65 +#: bookwyrm/templates/lists/list.html:66 #, python-format msgid "Added by %(username)s" msgstr "Ajouté par %(username)s" -#: bookwyrm/templates/lists/list.html:77 -msgid "Set" -msgstr "Appliquer" - -#: bookwyrm/templates/lists/list.html:80 +#: bookwyrm/templates/lists/list.html:74 msgid "List position" msgstr "Position" -#: bookwyrm/templates/lists/list.html:86 +#: bookwyrm/templates/lists/list.html:81 +msgid "Set" +msgstr "Appliquer" + +#: bookwyrm/templates/lists/list.html:89 #: bookwyrm/templates/snippets/shelf_selector.html:26 msgid "Remove" msgstr "Retirer" -#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111 +#: bookwyrm/templates/lists/list.html:103 +#: bookwyrm/templates/lists/list.html:120 msgid "Sort List" msgstr "Trier la liste" -#: bookwyrm/templates/lists/list.html:105 +#: bookwyrm/templates/lists/list.html:113 msgid "Direction" msgstr "Direction" -#: bookwyrm/templates/lists/list.html:116 +#: bookwyrm/templates/lists/list.html:127 msgid "Add Books" msgstr "Ajouter des livres" -#: bookwyrm/templates/lists/list.html:116 +#: bookwyrm/templates/lists/list.html:129 msgid "Suggest Books" msgstr "Suggérer des livres" -#: bookwyrm/templates/lists/list.html:125 +#: bookwyrm/templates/lists/list.html:140 msgid "search" msgstr "chercher" -#: bookwyrm/templates/lists/list.html:131 +#: bookwyrm/templates/lists/list.html:146 msgid "Clear search" msgstr "Vider la requête" -#: bookwyrm/templates/lists/list.html:136 +#: bookwyrm/templates/lists/list.html:151 #, python-format msgid "No books found matching the query \"%(query)s\"" msgstr "Aucun livre trouvé pour la requête « %(query)s »" -#: bookwyrm/templates/lists/list.html:164 +#: bookwyrm/templates/lists/list.html:179 msgid "Suggest" msgstr "Suggérer" @@ -1498,7 +1569,9 @@ msgstr "Signaler @%(username)s" #: bookwyrm/templates/moderation/report_modal.html:23 #, python-format msgid "This report will be sent to %(site_name)s's moderators for review." -msgstr "Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour traitement." +msgstr "" +"Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour " +"traitement." #: bookwyrm/templates/moderation/report_modal.html:24 msgid "More info about this report:" @@ -1559,18 +1632,30 @@ msgstr "Mentions" #: bookwyrm/templates/notifications.html:70 #, python-format -msgid "favorited your review of %(book_title)s" -msgstr "a ajouté votre critique de %(book_title)s à ses favoris" +msgid "" +"favorited your review of %(book_title)s" +msgstr "" +"a ajouté votre critique de %(book_title)s à ses favoris" #: bookwyrm/templates/notifications.html:72 #, python-format -msgid "favorited your comment on %(book_title)s" -msgstr "a ajouté votre commentaire sur %(book_title)s à ses favoris" +msgid "" +"favorited your comment on %(book_title)s" +msgstr "" +"a ajouté votre commentaire sur " +"%(book_title)s à ses favoris" #: bookwyrm/templates/notifications.html:74 #, python-format -msgid "favorited your quote from %(book_title)s" -msgstr "a ajouté votre citation de %(book_title)s à ses favoris" +msgid "" +"favorited your quote from %(book_title)s" +msgstr "" +"a ajouté votre citation de %(book_title)s à ses favoris" #: bookwyrm/templates/notifications.html:76 #, python-format @@ -1579,18 +1664,30 @@ msgstr "a ajouté votre statut à ses favoris" #: bookwyrm/templates/notifications.html:81 #, python-format -msgid "mentioned you in a review of %(book_title)s" -msgstr "vous a mentionné dans sa critique de %(book_title)s" +msgid "" +"mentioned you in a review of " +"%(book_title)s" +msgstr "" +"vous a mentionné dans sa critique de " +"%(book_title)s" #: bookwyrm/templates/notifications.html:83 #, python-format -msgid "mentioned you in a comment on %(book_title)s" -msgstr "vous a mentionné dans son commentaire sur %(book_title)s" +msgid "" +"mentioned you in a comment on " +"%(book_title)s" +msgstr "" +"vous a mentionné dans son commentaire sur " +"%(book_title)s" #: bookwyrm/templates/notifications.html:85 #, python-format -msgid "mentioned you in a quote from %(book_title)s" -msgstr "vous a mentionné dans sa citation de %(book_title)s" +msgid "" +"mentioned you in a quote from " +"%(book_title)s" +msgstr "" +"vous a mentionné dans sa citation de " +"%(book_title)s" #: bookwyrm/templates/notifications.html:87 #, python-format @@ -1599,23 +1696,39 @@ msgstr "vous a mentionné dans son statut" #: bookwyrm/templates/notifications.html:92 #, python-format -msgid "replied to your review of %(book_title)s" -msgstr "a répondu à votre critique de %(book_title)s" +msgid "" +"replied to your review of %(book_title)s" +msgstr "" +"a répondu à votre critique de %(book_title)s" #: bookwyrm/templates/notifications.html:94 #, python-format -msgid "replied to your comment on %(book_title)s" -msgstr "a répondu à votre commentaire sur %(book_title)s" +msgid "" +"replied to your comment on %(book_title)s" +msgstr "" +"a répondu à votre commentaire sur %(book_title)s" #: bookwyrm/templates/notifications.html:96 #, python-format -msgid "replied to your quote from %(book_title)s" -msgstr "a répondu à votre citation de %(book_title)s" +msgid "" +"replied to your quote from %(book_title)s" +msgstr "" +"a répondu à votre citation de %(book_title)s" #: bookwyrm/templates/notifications.html:98 #, python-format -msgid "replied to your status" -msgstr "a répondu à votre statut" +msgid "" +"replied to your status" +msgstr "" +"a répondu à votre statut" #: bookwyrm/templates/notifications.html:102 msgid "followed you" @@ -1627,18 +1740,30 @@ msgstr "vous a envoyé une demande d’abonnement" #: bookwyrm/templates/notifications.html:111 #, python-format -msgid "boosted your review of %(book_title)s" -msgstr "a partagé votre critique de %(book_title)s" +msgid "" +"boosted your review of %(book_title)s" +msgstr "" +"a partagé votre critique de %(book_title)s" #: bookwyrm/templates/notifications.html:113 #, python-format -msgid "boosted your comment on%(book_title)s" -msgstr "a partagé votre commentaire sur %(book_title)s" +msgid "" +"boosted your comment on%(book_title)s" +msgstr "" +"a partagé votre commentaire sur " +"%(book_title)s" #: bookwyrm/templates/notifications.html:115 #, python-format -msgid "boosted your quote from %(book_title)s" -msgstr "a partagé votre citation de %(book_title)s" +msgid "" +"boosted your quote from %(book_title)s" +msgstr "" +"a partagé votre citation de %(book_title)s" #: bookwyrm/templates/notifications.html:117 #, python-format @@ -1647,13 +1772,21 @@ msgstr "a partagé votre statut" #: bookwyrm/templates/notifications.html:121 #, python-format -msgid " added %(book_title)s to your list \"%(list_name)s\"" -msgstr " a ajouté %(book_title)s à votre liste « %(list_name)s »" +msgid "" +" added %(book_title)s to your list " +"\"%(list_name)s\"" +msgstr "" +" a ajouté %(book_title)s à votre " +"liste « %(list_name)s »" #: bookwyrm/templates/notifications.html:123 #, python-format -msgid " suggested adding %(book_title)s to your list \"%(list_name)s\"" -msgstr " a suggégré l’ajout de %(book_title)s à votre liste « %(list_name)s »" +msgid "" +" suggested adding %(book_title)s to " +"your list \"%(list_name)s\"" +msgstr "" +" a suggégré l’ajout de %(book_title)s " +"à votre liste « %(list_name)s »" #: bookwyrm/templates/notifications.html:128 #, python-format @@ -1663,7 +1796,8 @@ msgstr "Votre importation est terminée." #: bookwyrm/templates/notifications.html:131 #, python-format msgid "A new report needs moderation." -msgstr "Un nouveau signalement a besoin d’être traité." +msgstr "" +"Un nouveau signalement a besoin d’être traité." #: bookwyrm/templates/notifications.html:157 msgid "You're all caught up!" @@ -1676,7 +1810,8 @@ msgstr "Confirmez le mot de passe :" #: bookwyrm/templates/password_reset_request.html:14 msgid "A link to reset your password will be sent to your email address" -msgstr "Un lien pour changer votre mot de passe sera envoyé à votre addresse email" +msgstr "" +"Un lien pour changer votre mot de passe sera envoyé à votre addresse email" #: bookwyrm/templates/password_reset_request.html:28 msgid "Reset password" @@ -1710,12 +1845,17 @@ msgstr "Modifier le profil" #: bookwyrm/templates/preferences/edit_user.html:46 msgid "Show set reading goal prompt in feed:" -msgstr "Afficher le message pour définir un défi lecture dans le fil d’actualité :" +msgstr "" +"Afficher le message pour définir un défi lecture dans le fil d’actualité :" #: bookwyrm/templates/preferences/edit_user.html:62 #, python-format -msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." -msgstr "Votre compte sera listé dans le répertoire et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm." +msgid "" +"Your account will show up in the directory, and may " +"be recommended to other BookWyrm users." +msgstr "" +"Votre compte sera listé dans le répertoire et " +"pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm." #: bookwyrm/templates/preferences/edit_user.html:65 msgid "Preferred Timezone: " @@ -2059,7 +2199,7 @@ msgstr "Logiciel" #: bookwyrm/templates/settings/manage_invite_requests.html:25 #: bookwyrm/templates/settings/manage_invites.html:11 msgid "Invite Requests" -msgstr "Invitations" +msgstr "Demandes d’invitations" #: bookwyrm/templates/settings/manage_invite_requests.html:23 msgid "Ignored Invite Requests" @@ -2225,15 +2365,15 @@ msgstr "Email de l’administrateur :" msgid "Additional info:" msgstr "Infos supplémentaires :" -#: bookwyrm/templates/settings/site.html:83 -msgid "Allow registration:" -msgstr "Autoriser l’enregistrement :" - -#: bookwyrm/templates/settings/site.html:87 -msgid "Allow invite requests:" -msgstr "Autoriser les demandes d’invitation :" +#: bookwyrm/templates/settings/site.html:85 +msgid "Allow registration" +msgstr "Autoriser les inscriptions" #: bookwyrm/templates/settings/site.html:91 +msgid "Allow invite requests" +msgstr "Autoriser les demandes d’invitation" + +#: bookwyrm/templates/settings/site.html:95 msgid "Registration closed text:" msgstr "Texte affiché lorsque les enregistrements sont clos :" @@ -2344,7 +2484,9 @@ msgstr "Supprimer ces dates de lecture ?" #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7 #, python-format -msgid "You are deleting this readthrough and its %(count)s associated progress updates." +msgid "" +"You are deleting this readthrough and its %(count)s associated progress " +"updates." msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées." #: bookwyrm/templates/snippets/fav_button.html:10 @@ -2411,17 +2553,24 @@ msgstr[1] "souhaite lire %(counter)s livres en %(year)s" #: bookwyrm/templates/snippets/generated_status/rating.html:3 #, python-format -msgid "Rated %(title)s: %(display_rating)s star" -msgid_plural "Rated %(title)s: %(display_rating)s stars" +msgid "" +"Rated %(title)s: %(display_rating)s star" +msgid_plural "" +"Rated %(title)s: %(display_rating)s stars" msgstr[0] "A noté %(title)s : %(display_rating)s star" -msgstr[1] "A noté %(title)s : %(display_rating)s stars" +msgstr[1] "" +"A noté %(title)s : %(display_rating)s stars" #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format -msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" -msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s" -msgstr[0] "Critique de « %(book_title)s » (%(display_rating)s star): %(review_title)s" -msgstr[1] "Critique de « %(book_title)s » (%(display_rating)s stars) : %(review_title)s" +msgid "" +"Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" +msgid_plural "" +"Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s" +msgstr[0] "" +"Critique de « %(book_title)s » (%(display_rating)s star): %(review_title)s" +msgstr[1] "" +"Critique de « %(book_title)s » (%(display_rating)s stars) : %(review_title)s" #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8 #, python-format @@ -2430,8 +2579,12 @@ msgstr "Critique de « %(book_title)s » : %(review_title)s" #: bookwyrm/templates/snippets/goal_card.html:23 #, python-format -msgid "You can set or change your reading goal any time from your profile page" -msgstr "Vous pouvez définir ou changer votre défi lecture à n’importe quel moment depuis votre profil" +msgid "" +"You can set or change your reading goal any time from your profile page" +msgstr "" +"Vous pouvez définir ou changer votre défi lecture à n’importe quel moment " +"depuis votre profil" #: bookwyrm/templates/snippets/goal_form.html:9 msgid "Reading goal:" @@ -2463,13 +2616,20 @@ msgstr "%(percent)s%% terminé !" #: bookwyrm/templates/snippets/goal_progress.html:12 #, python-format -msgid "You've read %(read_count)s of %(goal_count)s books." -msgstr "Vous avez lu %(read_count)s sur %(goal_count)s livres." +msgid "" +"You've read %(read_count)s of %(goal_count)s books." +msgstr "" +"Vous avez lu %(read_count)s sur %(goal_count)s livres." #: bookwyrm/templates/snippets/goal_progress.html:14 #, python-format -msgid "%(username)s has read %(read_count)s of %(goal_count)s books." -msgstr "%(username)s a lu %(read_count)s sur %(goal_count)s livres." +msgid "" +"%(username)s has read %(read_count)s of %(goal_count)s " +"books." +msgstr "" +"%(username)s a lu %(read_count)s sur %(goal_count)s " +"livres." #: bookwyrm/templates/snippets/page_text.html:4 #, python-format @@ -2623,7 +2783,7 @@ msgstr "Commencer « %(book_title)s »" #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5 #, python-format msgid "Want to Read \"%(book_title)s\"" -msgstr "A envie de lire « %(book_title)s »" +msgstr "Ajouter « %(book_title)s » aux envies de lecture" #: bookwyrm/templates/snippets/status/content_status.html:71 #: bookwyrm/templates/snippets/trimmed_text.html:15 @@ -2660,8 +2820,12 @@ msgstr "a partagé" #: bookwyrm/templates/snippets/status/status_header.html:45 #, python-format -msgid "replied to %(username)s's status" -msgstr "a répondu au statut de %(username)s" +msgid "" +"replied to %(username)s's status" +msgstr "" +"a répondu au statut de %(username)s" #: bookwyrm/templates/snippets/status/status_options.html:7 #: bookwyrm/templates/snippets/user_options.html:7 @@ -2752,30 +2916,30 @@ msgstr "Tous les livres" msgid "Create shelf" msgstr "Créer une étagère" -#: bookwyrm/templates/user/shelf/shelf.html:61 +#: bookwyrm/templates/user/shelf/shelf.html:62 msgid "Edit shelf" msgstr "Modifier l’étagère" -#: bookwyrm/templates/user/shelf/shelf.html:80 -#: bookwyrm/templates/user/shelf/shelf.html:104 +#: bookwyrm/templates/user/shelf/shelf.html:81 +#: bookwyrm/templates/user/shelf/shelf.html:105 msgid "Shelved" msgstr "Date d’ajout" -#: bookwyrm/templates/user/shelf/shelf.html:81 -#: bookwyrm/templates/user/shelf/shelf.html:108 +#: bookwyrm/templates/user/shelf/shelf.html:82 +#: bookwyrm/templates/user/shelf/shelf.html:109 msgid "Started" msgstr "Commencé" -#: bookwyrm/templates/user/shelf/shelf.html:82 -#: bookwyrm/templates/user/shelf/shelf.html:111 +#: bookwyrm/templates/user/shelf/shelf.html:83 +#: bookwyrm/templates/user/shelf/shelf.html:112 msgid "Finished" msgstr "Terminé" -#: bookwyrm/templates/user/shelf/shelf.html:137 +#: bookwyrm/templates/user/shelf/shelf.html:138 msgid "This shelf is empty." msgstr "Cette étagère est vide" -#: bookwyrm/templates/user/shelf/shelf.html:143 +#: bookwyrm/templates/user/shelf/shelf.html:144 msgid "Delete shelf" msgstr "Supprimer l’étagère" @@ -2895,6 +3059,10 @@ msgstr "Rétablir le compte" msgid "Access level:" msgstr "Niveau d’accès :" +#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22 +msgid "File exceeds maximum size: 10MB" +msgstr "Ce fichier dépasse la taille limite : 10 Mo" + #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" msgstr "Fichier CSV non valide" @@ -2908,6 +3076,9 @@ msgstr "Aucun compte avec cette adresse email n’a été trouvé." msgid "A password reset link sent to %s" msgstr "Un lien de réinitialisation a été envoyé à %s." +#~ msgid "Remove %(name)s" +#~ msgstr "Supprimer %(name)s" + #, fuzzy #~| msgid "BookWyrm users" #~ msgid "BookWyrm\\" @@ -3198,14 +3369,26 @@ msgstr "Un lien de réinitialisation a été envoyé à %s." #~ msgid "Reactivate user" #~ msgstr "Réactiver le compte" -#~ msgid "replied to %(username)s's review" -#~ msgstr "a répondu à la critique de %(username)s" +#~ msgid "" +#~ "replied to %(username)s's review" +#~ msgstr "" +#~ "a répondu à la critique de %(username)s" -#~ msgid "replied to %(username)s's comment" -#~ msgstr "a répondu au commentaire de %(username)s" +#~ msgid "" +#~ "replied to %(username)s's comment" +#~ msgstr "" +#~ "a répondu au commentaire de %(username)s" -#~ msgid "replied to %(username)s's quote" -#~ msgstr "a répondu à la citation de %(username)s" +#~ msgid "" +#~ "replied to %(username)s's quote" +#~ msgstr "" +#~ "a répondu à la citation de %(username)s" #~ msgid "Remove tag" #~ msgstr "Supprimer le tag" From 4accf3953b6aae47ab1a4ee8a98f9d4267121287 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 5 Jun 2021 22:38:59 +0200 Subject: [PATCH 054/130] Update --- locale/fr_FR/LC_MESSAGES/django.mo | Bin 45654 -> 45836 bytes locale/fr_FR/LC_MESSAGES/django.po | 34 ++++++++++++++++++----------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index 9ee6ba4e5ee57843822b31b5e65908a877ab021d..28db351430e417fb71bf8d17ff0eee5e1d4bce63 100644 GIT binary patch delta 13702 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 F7XS?NcZvW2 diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 1e90d80ae..4d5278adc 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-02 16:08+0000\n" +"POT-Creation-Date: 2021-06-05 20:35+0000\n" "PO-Revision-Date: 2021-04-05 12:44+0100\n" "Last-Translator: Fabien Basmaison \n" "Language-Team: Mouse Reeve \n" @@ -91,23 +91,23 @@ msgstr "nom du compte :" msgid "A user with that username already exists." msgstr "Ce nom est déjà associé à un compte." -#: bookwyrm/settings.py:156 +#: bookwyrm/settings.py:160 msgid "English" msgstr "English" -#: bookwyrm/settings.py:157 +#: bookwyrm/settings.py:161 msgid "German" msgstr "Deutsch" -#: bookwyrm/settings.py:158 +#: bookwyrm/settings.py:162 msgid "Spanish" msgstr "Español" -#: bookwyrm/settings.py:159 +#: bookwyrm/settings.py:163 msgid "French" msgstr "Français" -#: bookwyrm/settings.py:160 +#: bookwyrm/settings.py:164 msgid "Simplified Chinese" msgstr "简化字" @@ -136,34 +136,42 @@ msgstr "Une erreur s’est produite ; désolé !" msgid "Edit Author" msgstr "Modifier l’auteur ou autrice" -#: bookwyrm/templates/author/author.html:32 +#: bookwyrm/templates/author/author.html:34 #: bookwyrm/templates/author/edit_author.html:41 msgid "Aliases:" msgstr "Pseudonymes :" -#: bookwyrm/templates/author/author.html:38 +#: bookwyrm/templates/author/author.html:45 msgid "Born:" msgstr "Naissance :" -#: bookwyrm/templates/author/author.html:44 +#: bookwyrm/templates/author/author.html:52 msgid "Died:" msgstr "Décès :" -#: bookwyrm/templates/author/author.html:51 +#: bookwyrm/templates/author/author.html:61 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:55 +#: bookwyrm/templates/author/author.html:69 #: bookwyrm/templates/book/book.html:78 msgid "View on OpenLibrary" msgstr "Voir sur OpenLibrary" -#: bookwyrm/templates/author/author.html:60 +#: bookwyrm/templates/author/author.html:77 #: bookwyrm/templates/book/book.html:81 msgid "View on Inventaire" msgstr "Voir sur Inventaire" -#: bookwyrm/templates/author/author.html:74 +#: bookwyrm/templates/author/author.html:85 +msgid "View on LibraryThing" +msgstr "Voir sur LibraryThing" + +#: bookwyrm/templates/author/author.html:93 +msgid "View on Goodreads" +msgstr "Voir sur Goodreads" + +#: bookwyrm/templates/author/author.html:108 #, python-format msgid "Books by %(name)s" msgstr "Livres par %(name)s" From b7924f234575fca67a7289687d76c73e0ab21c32 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 6 Jun 2021 18:42:07 +0200 Subject: [PATCH 055/130] Update django.po --- locale/fr_FR/LC_MESSAGES/django.po | 1849 ++++++++++------------------ 1 file changed, 635 insertions(+), 1214 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 4d5278adc..aefdbdd67 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -1,255 +1,235 @@ -# French language text for the bookwyrm UI -# Copyright (C) 2021 Mouse Reeve -# This file is distributed under the same license as the bookwyrm package. -# Mouse Reeve , 2021 -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: 0.1.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-05 20:35+0000\n" -"PO-Revision-Date: 2021-04-05 12:44+0100\n" -"Last-Translator: Fabien Basmaison \n" -"Language-Team: Mouse Reeve \n" -"Language: fr_FR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - #: bookwyrm/forms.py:224 msgid "A user with this email already exists." -msgstr "Cet email est déjà associé à un compte." +msgstr "" #: bookwyrm/forms.py:238 msgid "One Day" -msgstr "Un jour" +msgstr "" #: bookwyrm/forms.py:239 msgid "One Week" -msgstr "Une semaine" +msgstr "" #: bookwyrm/forms.py:240 msgid "One Month" -msgstr "Un mois" +msgstr "" #: bookwyrm/forms.py:241 msgid "Does Not Expire" -msgstr "Sans expiration" +msgstr "" #: bookwyrm/forms.py:246 #, python-format msgid "%(count)d uses" -msgstr "%(count)d utilisations" +msgstr "" #: bookwyrm/forms.py:249 msgid "Unlimited" -msgstr "Sans limite" +msgstr "" #: bookwyrm/forms.py:299 msgid "List Order" -msgstr "Ordre de la liste" +msgstr "" #: bookwyrm/forms.py:300 msgid "Book Title" -msgstr "Titre du livre" +msgstr "" #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34 #: bookwyrm/templates/user/shelf/shelf.html:85 #: bookwyrm/templates/user/shelf/shelf.html:116 msgid "Rating" -msgstr "Note" +msgstr "" #: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107 msgid "Sort By" -msgstr "Trier par" +msgstr "" #: bookwyrm/forms.py:307 msgid "Ascending" -msgstr "Ordre croissant" +msgstr "" #: bookwyrm/forms.py:308 msgid "Descending" -msgstr "Ordre décroissant" +msgstr "" #: bookwyrm/models/fields.py:25 #, python-format msgid "%(value)s is not a valid remote_id" -msgstr "%(value)s n’est pas une remote_id valide." +msgstr "" #: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43 #, python-format msgid "%(value)s is not a valid username" -msgstr "%(value)s n’est pas un nom de compte valide." +msgstr "" #: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152 msgid "username" -msgstr "nom du compte :" +msgstr "" #: bookwyrm/models/fields.py:171 msgid "A user with that username already exists." -msgstr "Ce nom est déjà associé à un compte." +msgstr "" #: bookwyrm/settings.py:160 msgid "English" -msgstr "English" +msgstr "" #: bookwyrm/settings.py:161 msgid "German" -msgstr "Deutsch" +msgstr "" #: bookwyrm/settings.py:162 msgid "Spanish" -msgstr "Español" +msgstr "" #: bookwyrm/settings.py:163 msgid "French" -msgstr "Français" +msgstr "" #: bookwyrm/settings.py:164 msgid "Simplified Chinese" -msgstr "简化字" +msgstr "" #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" -msgstr "Introuvable" +msgstr "" #: bookwyrm/templates/404.html:9 msgid "The page you requested doesn't seem to exist!" -msgstr "Il semblerait que la page que vous avez demandée n’existe pas !" +msgstr "" #: bookwyrm/templates/500.html:4 msgid "Oops!" -msgstr "Oups !" +msgstr "" #: bookwyrm/templates/500.html:8 msgid "Server Error" -msgstr "Erreur côté serveur" +msgstr "" #: bookwyrm/templates/500.html:9 msgid "Something went wrong! Sorry about that." -msgstr "Une erreur s’est produite ; désolé !" +msgstr "" #: bookwyrm/templates/author/author.html:17 #: bookwyrm/templates/author/author.html:18 msgid "Edit Author" -msgstr "Modifier l’auteur ou autrice" +msgstr "" #: bookwyrm/templates/author/author.html:34 #: bookwyrm/templates/author/edit_author.html:41 msgid "Aliases:" -msgstr "Pseudonymes :" +msgstr "" #: bookwyrm/templates/author/author.html:45 msgid "Born:" -msgstr "Naissance :" +msgstr "" #: bookwyrm/templates/author/author.html:52 msgid "Died:" -msgstr "Décès :" +msgstr "" #: bookwyrm/templates/author/author.html:61 msgid "Wikipedia" -msgstr "Wikipedia" +msgstr "" #: bookwyrm/templates/author/author.html:69 #: bookwyrm/templates/book/book.html:78 msgid "View on OpenLibrary" -msgstr "Voir sur OpenLibrary" +msgstr "" #: bookwyrm/templates/author/author.html:77 #: bookwyrm/templates/book/book.html:81 msgid "View on Inventaire" -msgstr "Voir sur Inventaire" +msgstr "" #: bookwyrm/templates/author/author.html:85 msgid "View on LibraryThing" -msgstr "Voir sur LibraryThing" +msgstr "" #: bookwyrm/templates/author/author.html:93 msgid "View on Goodreads" -msgstr "Voir sur Goodreads" +msgstr "" #: bookwyrm/templates/author/author.html:108 #, python-format msgid "Books by %(name)s" -msgstr "Livres par %(name)s" +msgstr "" #: bookwyrm/templates/author/edit_author.html:5 msgid "Edit Author:" -msgstr "Modifier l’auteur ou l’autrice :" +msgstr "" #: bookwyrm/templates/author/edit_author.html:13 #: bookwyrm/templates/book/edit_book.html:19 msgid "Added:" -msgstr "Ajouté :" +msgstr "" #: bookwyrm/templates/author/edit_author.html:14 #: bookwyrm/templates/book/edit_book.html:24 msgid "Updated:" -msgstr "Mis à jour :" +msgstr "" #: bookwyrm/templates/author/edit_author.html:15 #: bookwyrm/templates/book/edit_book.html:30 msgid "Last edited by:" -msgstr "Dernière modification par :" +msgstr "" #: bookwyrm/templates/author/edit_author.html:31 #: bookwyrm/templates/book/edit_book.html:117 msgid "Metadata" -msgstr "Métadonnées" +msgstr "" #: bookwyrm/templates/author/edit_author.html:33 #: bookwyrm/templates/lists/form.html:8 #: bookwyrm/templates/user/shelf/create_shelf_form.html:13 #: bookwyrm/templates/user/shelf/edit_shelf_form.html:14 msgid "Name:" -msgstr "Nom :" +msgstr "" #: bookwyrm/templates/author/edit_author.html:43 #: bookwyrm/templates/book/edit_book.html:162 #: bookwyrm/templates/book/edit_book.html:171 #: bookwyrm/templates/book/edit_book.html:214 msgid "Separate multiple values with commas." -msgstr "Séparez plusieurs valeurs par une virgule." +msgstr "" #: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" -msgstr "Bio :" +msgstr "" #: bookwyrm/templates/author/edit_author.html:57 msgid "Wikipedia link:" -msgstr "Wikipedia :" +msgstr "" #: bookwyrm/templates/author/edit_author.html:63 msgid "Birth date:" -msgstr "Date de naissance :" +msgstr "" #: bookwyrm/templates/author/edit_author.html:71 msgid "Death date:" -msgstr "Date de décès :" +msgstr "" #: bookwyrm/templates/author/edit_author.html:79 msgid "Author Identifiers" -msgstr "Identifiants de l’auteur ou autrice" +msgstr "" #: bookwyrm/templates/author/edit_author.html:81 msgid "Openlibrary key:" -msgstr "Clé Openlibrary :" +msgstr "" #: bookwyrm/templates/author/edit_author.html:89 #: bookwyrm/templates/book/edit_book.html:293 msgid "Inventaire ID:" -msgstr "Identifiant Inventaire :" +msgstr "" #: bookwyrm/templates/author/edit_author.html:97 msgid "Librarything key:" -msgstr "Clé Librarything :" +msgstr "" #: bookwyrm/templates/author/edit_author.html:105 msgid "Goodreads key:" -msgstr "Clé Goodreads :" +msgstr "" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:124 @@ -266,7 +246,7 @@ msgstr "Clé Goodreads :" #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34 #: bookwyrm/templates/user_admin/user_moderation_actions.html:38 msgid "Save" -msgstr "Enregistrer" +msgstr "" #: bookwyrm/templates/author/edit_author.html:117 #: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174 @@ -282,103 +262,98 @@ msgstr "Enregistrer" #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28 msgid "Cancel" -msgstr "Annuler" +msgstr "" #: bookwyrm/templates/book/book.html:31 #: bookwyrm/templates/discover/large-book.html:25 #: bookwyrm/templates/discover/small-book.html:19 msgid "by" -msgstr "par" +msgstr "" #: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40 msgid "Edit Book" -msgstr "Modifier le livre" +msgstr "" #: bookwyrm/templates/book/book.html:57 #: bookwyrm/templates/book/cover_modal.html:5 msgid "Add cover" -msgstr "Ajouter une couverture" +msgstr "" #: bookwyrm/templates/book/book.html:61 msgid "Failed to load cover" -msgstr "La couverture n’a pu être chargée" +msgstr "" #: bookwyrm/templates/book/book.html:101 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" -msgstr[0] "(%(review_count)s critique)" -msgstr[1] "(%(review_count)s critiques)" +msgstr[0] "" +msgstr[1] "" #: bookwyrm/templates/book/book.html:113 msgid "Add Description" -msgstr "Ajouter une description" +msgstr "" #: bookwyrm/templates/book/book.html:120 #: bookwyrm/templates/book/edit_book.html:136 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" -msgstr "Description :" +msgstr "" #: bookwyrm/templates/book/book.html:134 #, python-format msgid "%(count)s editions" -msgstr "%(count)s éditions" +msgstr "" #: bookwyrm/templates/book/book.html:142 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "" -"Cette édition est sur votre étagère %(shelf_name)s." #: bookwyrm/templates/book/book.html:148 #, python-format -msgid "" -"A different edition of this book is on your %(shelf_name)s shelf." +msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -"Une édition différente de ce livre existe sur " -"votre étagère %(shelf_name)s." #: bookwyrm/templates/book/book.html:159 msgid "Your reading activity" -msgstr "Votre activité de lecture" +msgstr "" #: bookwyrm/templates/book/book.html:162 msgid "Add read dates" -msgstr "Ajouter des dates de lecture" +msgstr "" #: bookwyrm/templates/book/book.html:171 msgid "Create" -msgstr "Créer" +msgstr "" #: bookwyrm/templates/book/book.html:181 msgid "You don't have any reading activity for this book." -msgstr "Vous n’avez aucune activité de lecture pour ce livre" +msgstr "" #: bookwyrm/templates/book/book.html:200 msgid "Reviews" -msgstr "Critiques" +msgstr "" #: bookwyrm/templates/book/book.html:205 msgid "Your reviews" -msgstr "Vos critiques" +msgstr "" #: bookwyrm/templates/book/book.html:211 msgid "Your comments" -msgstr "Vos commentaires" +msgstr "" #: bookwyrm/templates/book/book.html:217 msgid "Your quotes" -msgstr "Vos citations" +msgstr "" #: bookwyrm/templates/book/book.html:253 msgid "Subjects" -msgstr "Sujets" +msgstr "" #: bookwyrm/templates/book/book.html:265 msgid "Places" -msgstr "Lieux" +msgstr "" #: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 @@ -386,239 +361,239 @@ msgstr "Lieux" #: bookwyrm/templates/search/layout.html:50 #: bookwyrm/templates/user/layout.html:68 msgid "Lists" -msgstr "Listes" +msgstr "" #: bookwyrm/templates/book/book.html:287 msgid "Add to list" -msgstr "Ajouter à la liste" +msgstr "" #: bookwyrm/templates/book/book.html:297 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:179 msgid "Add" -msgstr "Ajouter" +msgstr "" #: bookwyrm/templates/book/book_identifiers.html:7 msgid "ISBN:" -msgstr "ISBN :" +msgstr "" #: bookwyrm/templates/book/book_identifiers.html:14 #: bookwyrm/templates/book/edit_book.html:301 msgid "OCLC Number:" -msgstr "Numéro OCLC :" +msgstr "" #: bookwyrm/templates/book/book_identifiers.html:21 #: bookwyrm/templates/book/edit_book.html:309 msgid "ASIN:" -msgstr "ASIN :" +msgstr "" #: bookwyrm/templates/book/cover_modal.html:17 #: bookwyrm/templates/book/edit_book.html:229 msgid "Upload cover:" -msgstr "Charger une couverture :" +msgstr "" #: bookwyrm/templates/book/cover_modal.html:23 #: bookwyrm/templates/book/edit_book.html:235 msgid "Load cover from url:" -msgstr "Charger la couverture depuis une URL :" +msgstr "" #: bookwyrm/templates/book/edit_book.html:5 #: bookwyrm/templates/book/edit_book.html:11 #, python-format msgid "Edit \"%(book_title)s\"" -msgstr "Modifier « %(book_title)s »" +msgstr "" #: bookwyrm/templates/book/edit_book.html:5 #: bookwyrm/templates/book/edit_book.html:13 msgid "Add Book" -msgstr "Ajouter un livre" +msgstr "" #: bookwyrm/templates/book/edit_book.html:54 msgid "Confirm Book Info" -msgstr "Confirmer les informations de ce livre" +msgstr "" #: bookwyrm/templates/book/edit_book.html:62 #, python-format msgid "Is \"%(name)s\" an existing author?" -msgstr "Est‑ce que l’auteur/autrice « %(name)s » existe déjà ?" +msgstr "" #: bookwyrm/templates/book/edit_book.html:71 #, python-format msgid "Author of %(book_title)s" -msgstr "Auteur/autrice de %(book_title)s" +msgstr "" #: bookwyrm/templates/book/edit_book.html:75 msgid "This is a new author" -msgstr "Il s’agit d’un nouvel auteur ou d’une nouvelle autrice." +msgstr "" #: bookwyrm/templates/book/edit_book.html:82 #, python-format msgid "Creating a new author: %(name)s" -msgstr "Création d’un nouvel auteur/autrice : %(name)s" +msgstr "" #: bookwyrm/templates/book/edit_book.html:89 msgid "Is this an edition of an existing work?" -msgstr "Est‑ce l’édition d’un ouvrage existant ?" +msgstr "" #: bookwyrm/templates/book/edit_book.html:97 msgid "This is a new work" -msgstr "Il s’agit d’un nouvel ouvrage." +msgstr "" #: bookwyrm/templates/book/edit_book.html:104 #: bookwyrm/templates/password_reset.html:30 msgid "Confirm" -msgstr "Confirmer" +msgstr "" #: bookwyrm/templates/book/edit_book.html:106 #: bookwyrm/templates/feed/status.html:8 msgid "Back" -msgstr "Retour" +msgstr "" #: bookwyrm/templates/book/edit_book.html:120 msgid "Title:" -msgstr "Titre :" +msgstr "" #: bookwyrm/templates/book/edit_book.html:128 msgid "Subtitle:" -msgstr "Sous‑titre :" +msgstr "" #: bookwyrm/templates/book/edit_book.html:144 msgid "Series:" -msgstr "Série :" +msgstr "" #: bookwyrm/templates/book/edit_book.html:152 msgid "Series number:" -msgstr "Numéro dans la série :" +msgstr "" #: bookwyrm/templates/book/edit_book.html:160 msgid "Languages:" -msgstr "Langues :" +msgstr "" #: bookwyrm/templates/book/edit_book.html:169 msgid "Publisher:" -msgstr "Éditeur :" +msgstr "" #: bookwyrm/templates/book/edit_book.html:178 msgid "First published date:" -msgstr "Première date de publication :" +msgstr "" #: bookwyrm/templates/book/edit_book.html:186 msgid "Published date:" -msgstr "Date de publication :" +msgstr "" #: bookwyrm/templates/book/edit_book.html:195 msgid "Authors" -msgstr "Auteurs ou autrices" +msgstr "" #: bookwyrm/templates/book/edit_book.html:202 #, python-format msgid "Remove %(name)s" -msgstr "Retirer %(name)s" +msgstr "" #: bookwyrm/templates/book/edit_book.html:205 #, python-format msgid "Author page for %(name)s" -msgstr "Page de %(name)s" +msgstr "" #: bookwyrm/templates/book/edit_book.html:212 msgid "Add Authors:" -msgstr "Ajouter des auteurs ou autrices :" +msgstr "" #: bookwyrm/templates/book/edit_book.html:213 msgid "John Doe, Jane Smith" -msgstr "Claude Dupont, Dominique Durand" +msgstr "" #: bookwyrm/templates/book/edit_book.html:220 #: bookwyrm/templates/user/shelf/shelf.html:78 msgid "Cover" -msgstr "Couverture" +msgstr "" #: bookwyrm/templates/book/edit_book.html:248 msgid "Physical Properties" -msgstr "Propriétés physiques" +msgstr "" #: bookwyrm/templates/book/edit_book.html:250 #: bookwyrm/templates/book/format_filter.html:5 msgid "Format:" -msgstr "Format :" +msgstr "" #: bookwyrm/templates/book/edit_book.html:258 msgid "Pages:" -msgstr "Pages :" +msgstr "" #: bookwyrm/templates/book/edit_book.html:267 msgid "Book Identifiers" -msgstr "Identifiants du livre" +msgstr "" #: bookwyrm/templates/book/edit_book.html:269 msgid "ISBN 13:" -msgstr "ISBN 13 :" +msgstr "" #: bookwyrm/templates/book/edit_book.html:277 msgid "ISBN 10:" -msgstr "ISBN 10 :" +msgstr "" #: bookwyrm/templates/book/edit_book.html:285 msgid "Openlibrary ID:" -msgstr "Identifiant Openlibrary :" +msgstr "" #: bookwyrm/templates/book/editions.html:4 #, python-format msgid "Editions of %(book_title)s" -msgstr "Éditions de %(book_title)s" +msgstr "" #: bookwyrm/templates/book/editions.html:8 #, python-format msgid "Editions of \"%(work_title)s\"" -msgstr "Éditions de « %(work_title)s »" +msgstr "" #: bookwyrm/templates/book/format_filter.html:8 #: bookwyrm/templates/book/language_filter.html:8 msgid "Any" -msgstr "Tou(te)s" +msgstr "" #: bookwyrm/templates/book/language_filter.html:5 msgid "Language:" -msgstr "Langue :" +msgstr "" #: bookwyrm/templates/book/publisher_info.html:22 #, python-format msgid "%(format)s" -msgstr "%(format)s" +msgstr "" #: bookwyrm/templates/book/publisher_info.html:24 #, python-format msgid "%(format)s, %(pages)s pages" -msgstr "%(format)s, %(pages)s pages" +msgstr "" #: bookwyrm/templates/book/publisher_info.html:26 #, python-format msgid "%(pages)s pages" -msgstr "%(pages)s pages" +msgstr "" #: bookwyrm/templates/book/publisher_info.html:38 #, python-format msgid "%(languages)s language" -msgstr "Langue : %(languages)s" +msgstr "" #: bookwyrm/templates/book/publisher_info.html:64 #, python-format msgid "Published %(date)s by %(publisher)s." -msgstr "Publié %(date)s par %(publisher)s." +msgstr "" #: bookwyrm/templates/book/publisher_info.html:66 #, python-format msgid "Published %(date)s" -msgstr "Publié %(date)s" +msgstr "" #: bookwyrm/templates/book/publisher_info.html:68 #, python-format msgid "Published by %(publisher)s." -msgstr "Publié par %(publisher)s." +msgstr "" #: bookwyrm/templates/book/rating.html:13 msgid "rated it" -msgstr "l’a noté" +msgstr "" #: bookwyrm/templates/components/inline_form.html:8 #: bookwyrm/templates/components/modal.html:11 @@ -628,225 +603,202 @@ msgstr "l’a noté" #: bookwyrm/templates/search/book.html:32 #: bookwyrm/templates/snippets/announcement.html:18 msgid "Close" -msgstr "Fermer" +msgstr "" #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8 msgid "Compose status" -msgstr "Rédiger un statut" +msgstr "" #: bookwyrm/templates/directory/community_filter.html:5 msgid "Community" -msgstr "Communauté" +msgstr "" #: bookwyrm/templates/directory/community_filter.html:8 msgid "Local users" -msgstr "Comptes locaux" +msgstr "" #: bookwyrm/templates/directory/community_filter.html:12 msgid "Federated community" -msgstr "Communauté fédérée" +msgstr "" #: bookwyrm/templates/directory/directory.html:4 #: bookwyrm/templates/directory/directory.html:9 #: bookwyrm/templates/layout.html:64 msgid "Directory" -msgstr "Répertoire" +msgstr "" #: bookwyrm/templates/directory/directory.html:17 msgid "Make your profile discoverable to other BookWyrm users." msgstr "" -"Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir " -"votre profil." #: bookwyrm/templates/directory/directory.html:24 #, python-format -msgid "" -"You can opt-out at any time in your profile settings." +msgid "You can opt-out at any time in your profile settings." msgstr "" -"Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos " -"paramètres de profil." #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/snippets/announcement.html:34 #: bookwyrm/templates/snippets/goal_card.html:22 msgid "Dismiss message" -msgstr "Fermer le message" +msgstr "" #: bookwyrm/templates/directory/sort_filter.html:5 msgid "Order by" -msgstr "Trier par" +msgstr "" #: bookwyrm/templates/directory/sort_filter.html:8 msgid "Suggested" -msgstr "Suggéré" +msgstr "" #: bookwyrm/templates/directory/sort_filter.html:9 msgid "Recently active" -msgstr "Actif récemment" +msgstr "" #: bookwyrm/templates/directory/user_card.html:33 msgid "follower you follow" msgid_plural "followers you follow" -msgstr[0] "compte que vous suivez" -msgstr[1] "comptes que vous suivez" +msgstr[0] "" +msgstr[1] "" #: bookwyrm/templates/directory/user_card.html:40 msgid "book on your shelves" msgid_plural "books on your shelves" -msgstr[0] "livre sur vos étagères" -msgstr[1] "livres sur vos étagères" +msgstr[0] "" +msgstr[1] "" #: bookwyrm/templates/directory/user_card.html:48 msgid "posts" -msgstr "publications" +msgstr "" #: bookwyrm/templates/directory/user_card.html:54 msgid "last active" -msgstr "dernière activité" +msgstr "" #: bookwyrm/templates/directory/user_type_filter.html:5 msgid "User type" -msgstr "Type de compte" +msgstr "" #: bookwyrm/templates/directory/user_type_filter.html:8 msgid "BookWyrm users" -msgstr "Comptes BookWyrm" +msgstr "" #: bookwyrm/templates/directory/user_type_filter.html:12 msgid "All known users" -msgstr "Tous les comptes connus" +msgstr "" #: bookwyrm/templates/discover/about.html:7 #, python-format msgid "About %(site_name)s" -msgstr "À propos de %(site_name)s" +msgstr "" #: bookwyrm/templates/discover/about.html:10 #: bookwyrm/templates/discover/about.html:20 msgid "Code of Conduct" -msgstr "Code de conduite" +msgstr "" #: bookwyrm/templates/discover/about.html:13 #: bookwyrm/templates/discover/about.html:29 msgid "Privacy Policy" -msgstr "Politique de vie privée" +msgstr "" #: bookwyrm/templates/discover/discover.html:6 msgid "Recent Books" -msgstr "Livres récents" +msgstr "" #: bookwyrm/templates/discover/landing_layout.html:5 #: bookwyrm/templates/get_started/layout.html:4 msgid "Welcome" -msgstr "Bienvenue" +msgstr "" #: bookwyrm/templates/discover/landing_layout.html:17 msgid "Decentralized" -msgstr "Décentralisé" +msgstr "" #: bookwyrm/templates/discover/landing_layout.html:23 msgid "Friendly" -msgstr "Sympa" +msgstr "" #: bookwyrm/templates/discover/landing_layout.html:29 msgid "Anti-Corporate" -msgstr "Anti‑commercial" +msgstr "" #: bookwyrm/templates/discover/landing_layout.html:44 #, python-format msgid "Join %(name)s" -msgstr "Rejoignez %(name)s" +msgstr "" #: bookwyrm/templates/discover/landing_layout.html:51 #: bookwyrm/templates/login.html:51 msgid "This instance is closed" -msgstr "Cette instance est fermée" +msgstr "" #: bookwyrm/templates/discover/landing_layout.html:57 msgid "Thank you! Your request has been received." -msgstr "Merci ! Votre demande a bien été reçue." +msgstr "" #: bookwyrm/templates/discover/landing_layout.html:60 msgid "Request an Invitation" -msgstr "Demander une invitation" +msgstr "" #: bookwyrm/templates/discover/landing_layout.html:64 #: bookwyrm/templates/password_reset_request.html:18 #: bookwyrm/templates/preferences/edit_user.html:38 #: bookwyrm/templates/snippets/register_form.html:13 msgid "Email address:" -msgstr "Adresse email :" +msgstr "" #: bookwyrm/templates/discover/landing_layout.html:70 #: bookwyrm/templates/moderation/report_modal.html:33 msgid "Submit" -msgstr "Valider" +msgstr "" #: bookwyrm/templates/discover/landing_layout.html:79 msgid "Your Account" -msgstr "Votre compte" +msgstr "" #: bookwyrm/templates/email/html_layout.html:15 #: bookwyrm/templates/email/text_layout.html:2 msgid "Hi there," -msgstr "Bien le bonjour," +msgstr "" #: bookwyrm/templates/email/html_layout.html:21 #, python-format -msgid "" -"BookWyrm hosted on " -"%(site_name)s" +msgid "BookWyrm hosted on %(site_name)s" msgstr "" -"BookWyrm, hébergé par %(site_name)s" #: bookwyrm/templates/email/html_layout.html:23 msgid "Email preference" -msgstr "Paramètres d’email" +msgstr "" #: bookwyrm/templates/email/invite/html_content.html:6 #: bookwyrm/templates/email/invite/subject.html:2 #, python-format msgid "You're invited to join %(site_name)s!" -msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s !" +msgstr "" #: bookwyrm/templates/email/invite/html_content.html:9 msgid "Join Now" -msgstr "S’enregistrer maintenant" +msgstr "" #: bookwyrm/templates/email/invite/html_content.html:15 #, python-format -msgid "" -"Learn more about this instance." +msgid "Learn more about this instance." msgstr "" -"En savoir plus sur cette " -"instance." #: bookwyrm/templates/email/invite/text_content.html:4 #, python-format -msgid "" -"You're invited to join %(site_name)s! Click the link below to create an " -"account." +msgid "You're invited to join %(site_name)s! Click the link below to create an account." msgstr "" -"Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien " -"suivant pour créer un compte." #: bookwyrm/templates/email/invite/text_content.html:8 msgid "Learn more about this instance:" -msgstr "En savoir plus sur cete instance :" +msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:6 #: bookwyrm/templates/email/password_reset/text_content.html:4 #, python-format -msgid "" -"You requested to reset your %(site_name)s password. Click the link below to " -"set a new password and log in to your account." +msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account." msgstr "" -"Une demande de réinitialisation de votre mot de passe sur %(site_name)s a été initialisée. Cliquez le lien suivant pour définir un nouveau mot de " -"passe et vous connecter à votre compte." #: bookwyrm/templates/email/password_reset/html_content.html:9 #: bookwyrm/templates/password_reset.html:4 @@ -854,157 +806,148 @@ msgstr "" #: bookwyrm/templates/password_reset_request.html:4 #: bookwyrm/templates/password_reset_request.html:10 msgid "Reset Password" -msgstr "Changez le mot de passe" +msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:13 #: bookwyrm/templates/email/password_reset/text_content.html:8 -msgid "" -"If you didn't request to reset your password, you can ignore this email." +msgid "If you didn't request to reset your password, you can ignore this email." msgstr "" -"Si vous n’avez pas demandé la réinitialisation de votre mot de passe, vous " -"pouvez ignorer cet email." #: bookwyrm/templates/email/password_reset/subject.html:2 #, python-format msgid "Reset your %(site_name)s password" -msgstr "Réinitialiser votre mot de passe sur %(site_name)s" +msgstr "" #: bookwyrm/templates/feed/direct_messages.html:8 #, python-format msgid "Direct Messages with %(username)s" -msgstr "Messages directs avec %(username)s" +msgstr "" #: bookwyrm/templates/feed/direct_messages.html:10 #: bookwyrm/templates/layout.html:92 msgid "Direct Messages" -msgstr "Messages directs" +msgstr "" #: bookwyrm/templates/feed/direct_messages.html:13 msgid "All messages" -msgstr "Tous les messages" +msgstr "" #: bookwyrm/templates/feed/direct_messages.html:22 msgid "You have no messages right now." -msgstr "Vous n’avez aucun message pour l’instant." +msgstr "" #: bookwyrm/templates/feed/feed.html:8 msgid "Home Timeline" -msgstr "Mon fil d’actualité" +msgstr "" #: bookwyrm/templates/feed/feed.html:10 msgid "Local Timeline" -msgstr "Fil d’actualité local" +msgstr "" #: bookwyrm/templates/feed/feed.html:12 msgid "Federated Timeline" -msgstr "Fil d’actualité des instances fédérées" +msgstr "" #: bookwyrm/templates/feed/feed.html:18 msgid "Home" -msgstr "Accueil" +msgstr "" #: bookwyrm/templates/feed/feed.html:21 msgid "Local" -msgstr "Local" +msgstr "" #: bookwyrm/templates/feed/feed.html:24 #: bookwyrm/templates/settings/edit_server.html:40 msgid "Federated" -msgstr "Fédéré" +msgstr "" #: bookwyrm/templates/feed/feed.html:32 #, python-format msgid "load 0 unread status(es)" msgstr "" -"charger le(s) 0 statut(s) non lu(s)" #: bookwyrm/templates/feed/feed.html:47 -msgid "" -"There aren't any activities right now! Try following a user to get started" +msgid "There aren't any activities right now! Try following a user to get started" msgstr "" -"Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer" #: bookwyrm/templates/feed/feed.html:55 #: bookwyrm/templates/get_started/users.html:6 msgid "Who to follow" -msgstr "À qui s’abonner" +msgstr "" #: bookwyrm/templates/feed/feed_layout.html:4 msgid "Updates" -msgstr "Mises à jour" +msgstr "" #: bookwyrm/templates/feed/feed_layout.html:10 #: bookwyrm/templates/user/shelf/books_header.html:3 msgid "Your books" -msgstr "Vos livres" +msgstr "" #: bookwyrm/templates/feed/feed_layout.html:12 -msgid "" -"There are no books here right now! Try searching for a book to get started" -msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer" +msgid "There are no books here right now! Try searching for a book to get started" +msgstr "" #: bookwyrm/templates/feed/feed_layout.html:23 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "To Read" -msgstr "À lire" +msgstr "" #: bookwyrm/templates/feed/feed_layout.html:24 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Currently Reading" -msgstr "Lectures en cours" +msgstr "" #: bookwyrm/templates/feed/feed_layout.html:25 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Read" -msgstr "Lu" +msgstr "" #: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26 #: bookwyrm/templates/snippets/goal_card.html:6 #, python-format msgid "%(year)s Reading Goal" -msgstr "Défi lecture pour %(year)s" +msgstr "" #: bookwyrm/templates/feed/suggested_users.html:16 #, python-format msgid "%(mutuals)s follower you follow" msgid_plural "%(mutuals)s followers you follow" -msgstr[0] "%(mutuals)s abonné(e) que vous suivez" -msgstr[1] "%(mutuals)s abonné(e)s que vous suivez" +msgstr[0] "" +msgstr[1] "" #: bookwyrm/templates/feed/suggested_users.html:19 #, python-format msgid "%(shared_books)s book on your shelves" msgid_plural "%(shared_books)s books on your shelves" -msgstr[0] "%(shared_books)s livre sur vos étagères" -msgstr[1] "%(shared_books)s livres sur vos étagères" +msgstr[0] "" +msgstr[1] "" #: bookwyrm/templates/get_started/book_preview.html:6 #, python-format msgid "Have you read %(book_title)s?" -msgstr "Avez‑vous lu « %(book_title)s » ?" +msgstr "" #: bookwyrm/templates/get_started/books.html:6 msgid "What are you reading?" -msgstr "Que lisez‑vous ?" +msgstr "" #: bookwyrm/templates/get_started/books.html:9 #: bookwyrm/templates/lists/list.html:135 msgid "Search for a book" -msgstr "Chercher un livre" +msgstr "" #: bookwyrm/templates/get_started/books.html:11 #: bookwyrm/templates/isbn_search_results.html:17 #, python-format msgid "No books found for \"%(query)s\"" -msgstr "Aucun livre trouvé pour « %(query)s »" +msgstr "" #: bookwyrm/templates/get_started/books.html:11 #, python-format msgid "You can add books when you start using %(site_name)s." msgstr "" -"Vous pourrez ajouter des livres lorsque vous commencerez à utiliser " -"%(site_name)s." #: bookwyrm/templates/get_started/books.html:16 #: bookwyrm/templates/get_started/books.html:17 @@ -1015,292 +958,280 @@ msgstr "" #: bookwyrm/templates/search/layout.html:4 #: bookwyrm/templates/search/layout.html:9 msgid "Search" -msgstr "Chercher" +msgstr "" #: bookwyrm/templates/get_started/books.html:27 msgid "Suggested Books" -msgstr "Suggérer des livres" +msgstr "" #: bookwyrm/templates/get_started/books.html:46 #, python-format msgid "Popular on %(site_name)s" -msgstr "Populaire sur %(site_name)s" +msgstr "" #: bookwyrm/templates/get_started/books.html:58 #: bookwyrm/templates/lists/list.html:152 msgid "No books found" -msgstr "Aucun livre trouvé" +msgstr "" #: bookwyrm/templates/get_started/books.html:63 #: bookwyrm/templates/get_started/profile.html:54 msgid "Save & continue" -msgstr "Enregistrer & continuer" +msgstr "" #: bookwyrm/templates/get_started/layout.html:14 #, python-format msgid "Welcome to %(site_name)s!" -msgstr "Bienvenue sur %(site_name)s !" +msgstr "" #: bookwyrm/templates/get_started/layout.html:16 msgid "These are some first steps to get you started." -msgstr "Voici quelques étapes pour commencer votre profil." +msgstr "" #: bookwyrm/templates/get_started/layout.html:30 #: bookwyrm/templates/get_started/profile.html:6 msgid "Create your profile" -msgstr "Créez votre profil" +msgstr "" #: bookwyrm/templates/get_started/layout.html:34 msgid "Add books" -msgstr "Ajoutez des livres" +msgstr "" #: bookwyrm/templates/get_started/layout.html:38 msgid "Find friends" -msgstr "Établissez des contacts" +msgstr "" #: bookwyrm/templates/get_started/layout.html:44 msgid "Skip this step" -msgstr "Passer cette étape" +msgstr "" #: bookwyrm/templates/get_started/layout.html:48 msgid "Finish" -msgstr "Terminer" +msgstr "" #: bookwyrm/templates/get_started/profile.html:15 #: bookwyrm/templates/preferences/edit_user.html:24 msgid "Display name:" -msgstr "Nom affiché :" +msgstr "" #: bookwyrm/templates/get_started/profile.html:22 #: bookwyrm/templates/preferences/edit_user.html:31 msgid "Summary:" -msgstr "Résumé :" +msgstr "" #: bookwyrm/templates/get_started/profile.html:23 msgid "A little bit about you" -msgstr "Parlez‑nous de vous" +msgstr "" #: bookwyrm/templates/get_started/profile.html:32 #: bookwyrm/templates/preferences/edit_user.html:17 msgid "Avatar:" -msgstr "Avatar :" +msgstr "" #: bookwyrm/templates/get_started/profile.html:42 #: bookwyrm/templates/preferences/edit_user.html:52 msgid "Manually approve followers:" -msgstr "Autoriser les abonnements manuellement :" +msgstr "" #: bookwyrm/templates/get_started/profile.html:48 #: bookwyrm/templates/preferences/edit_user.html:58 msgid "Show this account in suggested users:" -msgstr "Afficher ce compte dans ceux suggérés :" +msgstr "" #: bookwyrm/templates/get_started/profile.html:52 -msgid "" -"Your account will show up in the directory, and may be recommended to other " -"BookWyrm users." +msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "" -"Votre compte sera listé dans le répertoire et pourra être recommandé à " -"d’autres utilisateurs ou utilisatrices de BookWyrm." #: bookwyrm/templates/get_started/users.html:11 msgid "Search for a user" -msgstr "Chercher un compte" +msgstr "" #: bookwyrm/templates/get_started/users.html:13 #, python-format msgid "No users found for \"%(query)s\"" -msgstr "Aucun compte trouvé pour « %(query)s »" +msgstr "" #: bookwyrm/templates/goal.html:7 #, python-format msgid "%(year)s Reading Progress" -msgstr "Progression de lecture pour %(year)s" +msgstr "" #: bookwyrm/templates/goal.html:11 msgid "Edit Goal" -msgstr "Modifier le défi" +msgstr "" #: bookwyrm/templates/goal.html:30 #: bookwyrm/templates/snippets/goal_card.html:13 #, python-format -msgid "" -"Set a goal for how many books you'll finish reading in %(year)s, and track " -"your progress throughout the year." +msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year." msgstr "" -"Définissez un nombre de livre à lire comme objectif pour %(year)s, et " -"suivezvotre progression au fil de l’année." #: bookwyrm/templates/goal.html:39 #, python-format msgid "%(name)s hasn't set a reading goal for %(year)s." -msgstr "%(name)s n’a aucun défi lecture pour %(year)s." +msgstr "" #: bookwyrm/templates/goal.html:51 #, python-format msgid "Your %(year)s Books" -msgstr "Vos livres en %(year)s" +msgstr "" #: bookwyrm/templates/goal.html:53 #, python-format msgid "%(username)s's %(year)s Books" -msgstr "Livres de %(username)s en %(year)s" +msgstr "" #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 #: bookwyrm/templates/user/shelf/shelf.html:40 msgid "Import Books" -msgstr "Importer des livres" +msgstr "" #: bookwyrm/templates/import.html:16 msgid "Data source:" -msgstr "Source de données :" +msgstr "" #: bookwyrm/templates/import.html:32 msgid "Data file:" -msgstr "Fichier de données :" +msgstr "" #: bookwyrm/templates/import.html:40 msgid "Include reviews" -msgstr "Importer les critiques" +msgstr "" #: bookwyrm/templates/import.html:45 msgid "Privacy setting for imported reviews:" -msgstr "Confidentialité des critiques importées :" +msgstr "" #: bookwyrm/templates/import.html:51 #: bookwyrm/templates/settings/server_blocklist.html:64 msgid "Import" -msgstr "Importer" +msgstr "" #: bookwyrm/templates/import.html:56 msgid "Recent Imports" -msgstr "Importations récentes" +msgstr "" #: bookwyrm/templates/import.html:58 msgid "No recent imports" -msgstr "Aucune importation récente" +msgstr "" #: bookwyrm/templates/import_status.html:5 #: bookwyrm/templates/import_status.html:9 msgid "Import Status" -msgstr "Statut de l’importation" +msgstr "" #: bookwyrm/templates/import_status.html:13 msgid "Import started:" -msgstr "Début de l’importation :" +msgstr "" #: bookwyrm/templates/import_status.html:18 msgid "Import completed:" -msgstr "Fin de l’importation :" +msgstr "" #: bookwyrm/templates/import_status.html:23 msgid "TASK FAILED" -msgstr "la tâche a échoué" +msgstr "" #: bookwyrm/templates/import_status.html:30 msgid "Import still in progress." -msgstr "L’importation est toujours en cours" +msgstr "" #: bookwyrm/templates/import_status.html:32 msgid "(Hit reload to update!)" -msgstr "(Rechargez la page pour la mettre à jour !)" +msgstr "" #: bookwyrm/templates/import_status.html:39 msgid "Failed to load" -msgstr "Éléments non importés" +msgstr "" #: bookwyrm/templates/import_status.html:48 #, python-format -msgid "" -"Jump to the bottom of the list to select the %(failed_count)s items which " -"failed to import." +msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import." msgstr "" -"Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant " -"pu être importés." #: bookwyrm/templates/import_status.html:60 #, python-format msgid "Line %(index)s: %(title)s by %(author)s" -msgstr "Ligne %(index)s : %(title)s par %(author)s" +msgstr "" #: bookwyrm/templates/import_status.html:80 msgid "Select all" -msgstr "Tout sélectionner" +msgstr "" #: bookwyrm/templates/import_status.html:83 msgid "Retry items" -msgstr "Réessayer l’importation de ces éléments" +msgstr "" #: bookwyrm/templates/import_status.html:109 msgid "Successfully imported" -msgstr "Importation réussie" +msgstr "" #: bookwyrm/templates/import_status.html:113 msgid "Book" -msgstr "Livre" +msgstr "" #: bookwyrm/templates/import_status.html:116 #: bookwyrm/templates/snippets/create_status_form.html:13 #: bookwyrm/templates/user/shelf/shelf.html:79 #: bookwyrm/templates/user/shelf/shelf.html:99 msgid "Title" -msgstr "Titre" +msgstr "" #: bookwyrm/templates/import_status.html:119 #: bookwyrm/templates/user/shelf/shelf.html:80 #: bookwyrm/templates/user/shelf/shelf.html:102 msgid "Author" -msgstr "Auteur/autrice" +msgstr "" #: bookwyrm/templates/import_status.html:142 msgid "Imported" -msgstr "Importé" +msgstr "" #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 #: bookwyrm/templates/login.html:46 msgid "Create an Account" -msgstr "Créer un compte" +msgstr "" #: bookwyrm/templates/invite.html:21 msgid "Permission Denied" -msgstr "Autorisation refusée" +msgstr "" #: bookwyrm/templates/invite.html:22 msgid "Sorry! This invite code is no longer valid." -msgstr "Cette invitation n’est plus valide ; désolé !" +msgstr "" #: bookwyrm/templates/isbn_search_results.html:4 msgid "Search Results" -msgstr "Résultats de recherche" +msgstr "" #: bookwyrm/templates/isbn_search_results.html:9 #, python-format msgid "Search Results for \"%(query)s\"" -msgstr "Résultats de recherche pour « %(query)s »" +msgstr "" #: bookwyrm/templates/isbn_search_results.html:14 msgid "Matching Books" -msgstr "Livres correspondants" +msgstr "" #: bookwyrm/templates/layout.html:33 msgid "Search for a book or user" -msgstr "Chercher un livre ou un compte" +msgstr "" #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48 msgid "Main navigation menu" -msgstr "Menu de navigation principal " +msgstr "" #: bookwyrm/templates/layout.html:58 msgid "Feed" -msgstr "Fil d’actualité" +msgstr "" #: bookwyrm/templates/layout.html:87 msgid "Your Books" -msgstr "Vos Livres" +msgstr "" #: bookwyrm/templates/layout.html:97 msgid "Settings" -msgstr "Paramètres" +msgstr "" #: bookwyrm/templates/layout.html:106 #: bookwyrm/templates/settings/admin_layout.html:31 @@ -1308,624 +1239,547 @@ msgstr "Paramètres" #: bookwyrm/templates/settings/manage_invites.html:3 #: bookwyrm/templates/settings/manage_invites.html:15 msgid "Invites" -msgstr "Invitations" +msgstr "" #: bookwyrm/templates/layout.html:113 msgid "Admin" -msgstr "Admin" +msgstr "" #: bookwyrm/templates/layout.html:120 msgid "Log out" -msgstr "Se déconnecter" +msgstr "" #: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129 #: bookwyrm/templates/notifications.html:6 #: bookwyrm/templates/notifications.html:11 msgid "Notifications" -msgstr "Notifications" +msgstr "" #: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155 #: bookwyrm/templates/login.html:17 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" -msgstr "Nom du compte :" +msgstr "" #: bookwyrm/templates/layout.html:156 msgid "password" -msgstr "Mot de passe" +msgstr "" #: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36 msgid "Forgot your password?" -msgstr "Mot de passe oublié ?" +msgstr "" #: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10 #: bookwyrm/templates/login.html:33 msgid "Log in" -msgstr "Se connecter" +msgstr "" #: bookwyrm/templates/layout.html:168 msgid "Join" -msgstr "Rejoindre" +msgstr "" #: bookwyrm/templates/layout.html:206 msgid "About this server" -msgstr "À propos de ce serveur" +msgstr "" #: bookwyrm/templates/layout.html:210 msgid "Contact site admin" -msgstr "Contacter l’administrateur du site" +msgstr "" #: bookwyrm/templates/layout.html:214 msgid "Documentation" -msgstr "Documentation" +msgstr "" #: bookwyrm/templates/layout.html:221 #, python-format -msgid "" -"Support %(site_name)s on " -"%(support_title)s" +msgid "Support %(site_name)s on %(support_title)s" msgstr "" -"Soutenez %(site_name)s avec " -"%(support_title)s" #: bookwyrm/templates/layout.html:225 -msgid "" -"BookWyrm's source code is freely available. You can contribute or report " -"issues on GitHub." +msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub." msgstr "" -"BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports " -"de bogues via GitHub." #: bookwyrm/templates/lists/create_form.html:5 #: bookwyrm/templates/lists/lists.html:20 msgid "Create List" -msgstr "Créer une liste" +msgstr "" #: bookwyrm/templates/lists/created_text.html:5 #, python-format msgid "Created and curated by %(username)s" -msgstr "Créée et modérée par %(username)s" +msgstr "" #: bookwyrm/templates/lists/created_text.html:7 #, python-format msgid "Created by %(username)s" -msgstr "Créée par %(username)s" +msgstr "" #: bookwyrm/templates/lists/curate.html:8 msgid "Pending Books" -msgstr "Livres en attente de modération" +msgstr "" #: bookwyrm/templates/lists/curate.html:11 msgid "Go to list" -msgstr "Aller à la liste" +msgstr "" #: bookwyrm/templates/lists/curate.html:15 msgid "You're all set!" -msgstr "Aucun livre en attente de validation !" +msgstr "" #: bookwyrm/templates/lists/curate.html:45 msgid "Suggested by" -msgstr "Suggéré par" +msgstr "" #: bookwyrm/templates/lists/curate.html:57 msgid "Approve" -msgstr "Approuver" +msgstr "" #: bookwyrm/templates/lists/curate.html:63 msgid "Discard" -msgstr "Rejeter" +msgstr "" #: bookwyrm/templates/lists/edit_form.html:5 #: bookwyrm/templates/lists/list_layout.html:16 msgid "Edit List" -msgstr "Modifier la liste" +msgstr "" #: bookwyrm/templates/lists/form.html:18 msgid "List curation:" -msgstr "Modération de la liste :" +msgstr "" #: bookwyrm/templates/lists/form.html:21 msgid "Closed" -msgstr "Fermée" +msgstr "" #: bookwyrm/templates/lists/form.html:22 msgid "Only you can add and remove books to this list" -msgstr "Vous seulement pouvez ajouter ou retirer des livres dans cette liste" +msgstr "" #: bookwyrm/templates/lists/form.html:26 msgid "Curated" -msgstr "Modérée" +msgstr "" #: bookwyrm/templates/lists/form.html:27 msgid "Anyone can suggest books, subject to your approval" -msgstr "N’importe qui peut suggérer des livres, soumis à votre approbation" +msgstr "" #: bookwyrm/templates/lists/form.html:31 #: bookwyrm/templates/moderation/reports.html:25 #: bookwyrm/templates/search/book.html:30 #: bookwyrm/templates/snippets/announcement.html:16 msgid "Open" -msgstr "Ouverte" +msgstr "" #: bookwyrm/templates/lists/form.html:32 msgid "Anyone can add books to this list" -msgstr "N’importe qui peut suggérer des livres" +msgstr "" #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" -msgstr "Vous avez suggéré un livre à cette liste !" +msgstr "" #: bookwyrm/templates/lists/list.html:22 msgid "You successfully added a book to this list!" -msgstr "Vous avez ajouté un livre à cette liste !" +msgstr "" #: bookwyrm/templates/lists/list.html:28 msgid "This list is currently empty" -msgstr "Cette liste est actuellement vide" +msgstr "" #: bookwyrm/templates/lists/list.html:66 #, python-format msgid "Added by %(username)s" -msgstr "Ajouté par %(username)s" +msgstr "" #: bookwyrm/templates/lists/list.html:74 msgid "List position" -msgstr "Position" +msgstr "" #: bookwyrm/templates/lists/list.html:81 msgid "Set" -msgstr "Appliquer" +msgstr "" #: bookwyrm/templates/lists/list.html:89 #: bookwyrm/templates/snippets/shelf_selector.html:26 msgid "Remove" -msgstr "Retirer" +msgstr "" #: bookwyrm/templates/lists/list.html:103 #: bookwyrm/templates/lists/list.html:120 msgid "Sort List" -msgstr "Trier la liste" +msgstr "" #: bookwyrm/templates/lists/list.html:113 msgid "Direction" -msgstr "Direction" +msgstr "" #: bookwyrm/templates/lists/list.html:127 msgid "Add Books" -msgstr "Ajouter des livres" +msgstr "" #: bookwyrm/templates/lists/list.html:129 msgid "Suggest Books" -msgstr "Suggérer des livres" +msgstr "" #: bookwyrm/templates/lists/list.html:140 msgid "search" -msgstr "chercher" +msgstr "" #: bookwyrm/templates/lists/list.html:146 msgid "Clear search" -msgstr "Vider la requête" +msgstr "" #: bookwyrm/templates/lists/list.html:151 #, python-format msgid "No books found matching the query \"%(query)s\"" -msgstr "Aucun livre trouvé pour la requête « %(query)s »" +msgstr "" #: bookwyrm/templates/lists/list.html:179 msgid "Suggest" -msgstr "Suggérer" +msgstr "" #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9 msgid "Your Lists" -msgstr "Vos listes" +msgstr "" #: bookwyrm/templates/login.html:4 msgid "Login" -msgstr "Connexion" +msgstr "" #: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17 #: bookwyrm/templates/snippets/register_form.html:22 msgid "Password:" -msgstr "Mot de passe :" +msgstr "" #: bookwyrm/templates/login.html:52 msgid "Contact an administrator to get an invite" -msgstr "Contacter un administrateur pour obtenir une invitation" +msgstr "" #: bookwyrm/templates/login.html:63 msgid "More about this site" -msgstr "En savoir plus sur ce site" +msgstr "" #: bookwyrm/templates/moderation/report.html:5 #: bookwyrm/templates/moderation/report.html:6 #: bookwyrm/templates/moderation/report_preview.html:6 #, python-format msgid "Report #%(report_id)s: %(username)s" -msgstr "Signalement #%(report_id)s : %(username)s" +msgstr "" #: bookwyrm/templates/moderation/report.html:10 msgid "Back to reports" -msgstr "Retour aux signalements" +msgstr "" #: bookwyrm/templates/moderation/report.html:22 msgid "Moderator Comments" -msgstr "Commentaires de l’équipe de modération" +msgstr "" #: bookwyrm/templates/moderation/report.html:40 #: bookwyrm/templates/snippets/create_status.html:28 #: bookwyrm/templates/snippets/create_status_form.html:66 msgid "Comment" -msgstr "Commentaire" +msgstr "" #: bookwyrm/templates/moderation/report.html:45 msgid "Reported statuses" -msgstr "Statuts signalés" +msgstr "" #: bookwyrm/templates/moderation/report.html:47 msgid "No statuses reported" -msgstr "Aucun statut signalé" +msgstr "" #: bookwyrm/templates/moderation/report.html:53 msgid "Status has been deleted" -msgstr "Le statut a été supprimé" +msgstr "" #: bookwyrm/templates/moderation/report_modal.html:6 #, python-format msgid "Report @%(username)s" -msgstr "Signaler @%(username)s" +msgstr "" #: bookwyrm/templates/moderation/report_modal.html:23 #, python-format msgid "This report will be sent to %(site_name)s's moderators for review." msgstr "" -"Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour " -"traitement." #: bookwyrm/templates/moderation/report_modal.html:24 msgid "More info about this report:" -msgstr "En savoir plus sur ce signalement :" +msgstr "" #: bookwyrm/templates/moderation/report_preview.html:13 msgid "No notes provided" -msgstr "Aucune note fournie" +msgstr "" #: bookwyrm/templates/moderation/report_preview.html:20 #, python-format msgid "Reported by %(username)s" -msgstr "Signalé par %(username)s" +msgstr "" #: bookwyrm/templates/moderation/report_preview.html:30 msgid "Re-open" -msgstr "Réouvrir" +msgstr "" #: bookwyrm/templates/moderation/report_preview.html:32 msgid "Resolve" -msgstr "Résoudre" +msgstr "" #: bookwyrm/templates/moderation/reports.html:6 #, python-format msgid "Reports: %(server_name)s" -msgstr "Signalements : %(server_name)s" +msgstr "" #: bookwyrm/templates/moderation/reports.html:8 #: bookwyrm/templates/moderation/reports.html:17 #: bookwyrm/templates/settings/admin_layout.html:35 msgid "Reports" -msgstr "Signalements" +msgstr "" #: bookwyrm/templates/moderation/reports.html:14 #, python-format msgid "Reports: %(server_name)s" -msgstr "Signalements: %(server_name)s" +msgstr "" #: bookwyrm/templates/moderation/reports.html:28 msgid "Resolved" -msgstr "Résolus" +msgstr "" #: bookwyrm/templates/moderation/reports.html:37 msgid "No reports found." -msgstr "Aucun signalement trouvé." +msgstr "" #: bookwyrm/templates/notifications.html:16 msgid "Delete notifications" -msgstr "Supprimer les notifications" +msgstr "" #: bookwyrm/templates/notifications.html:25 msgid "All" -msgstr "Toutes" +msgstr "" #: bookwyrm/templates/notifications.html:29 msgid "Mentions" -msgstr "Mentions" +msgstr "" #: bookwyrm/templates/notifications.html:70 #, python-format -msgid "" -"favorited your review of %(book_title)s" +msgid "favorited your review of %(book_title)s" msgstr "" -"a ajouté votre critique de %(book_title)s à ses favoris" #: bookwyrm/templates/notifications.html:72 #, python-format -msgid "" -"favorited your comment on %(book_title)s" +msgid "favorited your comment on %(book_title)s" msgstr "" -"a ajouté votre commentaire sur " -"%(book_title)s à ses favoris" #: bookwyrm/templates/notifications.html:74 #, python-format -msgid "" -"favorited your quote from %(book_title)s" +msgid "favorited your quote from %(book_title)s" msgstr "" -"a ajouté votre citation de %(book_title)s à ses favoris" #: bookwyrm/templates/notifications.html:76 #, python-format msgid "favorited your status" -msgstr "a ajouté votre statut à ses favoris" +msgstr "" #: bookwyrm/templates/notifications.html:81 #, python-format -msgid "" -"mentioned you in a review of " -"%(book_title)s" +msgid "mentioned you in a review of %(book_title)s" msgstr "" -"vous a mentionné dans sa critique de " -"%(book_title)s" #: bookwyrm/templates/notifications.html:83 #, python-format -msgid "" -"mentioned you in a comment on " -"%(book_title)s" +msgid "mentioned you in a comment on %(book_title)s" msgstr "" -"vous a mentionné dans son commentaire sur " -"%(book_title)s" #: bookwyrm/templates/notifications.html:85 #, python-format -msgid "" -"mentioned you in a quote from " -"%(book_title)s" +msgid "mentioned you in a quote from %(book_title)s" msgstr "" -"vous a mentionné dans sa citation de " -"%(book_title)s" #: bookwyrm/templates/notifications.html:87 #, python-format msgid "mentioned you in a status" -msgstr "vous a mentionné dans son statut" +msgstr "" #: bookwyrm/templates/notifications.html:92 #, python-format -msgid "" -"replied to your review of %(book_title)s" +msgid "replied to your review of %(book_title)s" msgstr "" -"a répondu à votre critique de %(book_title)s" #: bookwyrm/templates/notifications.html:94 #, python-format -msgid "" -"replied to your comment on %(book_title)s" +msgid "replied to your comment on %(book_title)s" msgstr "" -"a répondu à votre commentaire sur %(book_title)s" #: bookwyrm/templates/notifications.html:96 #, python-format -msgid "" -"replied to your quote from %(book_title)s" +msgid "replied to your quote from %(book_title)s" msgstr "" -"a répondu à votre citation de %(book_title)s" #: bookwyrm/templates/notifications.html:98 #, python-format -msgid "" -"replied to your status" +msgid "replied to your status" msgstr "" -"a répondu à votre statut" #: bookwyrm/templates/notifications.html:102 msgid "followed you" -msgstr "vous suit" +msgstr "" #: bookwyrm/templates/notifications.html:105 msgid "sent you a follow request" -msgstr "vous a envoyé une demande d’abonnement" +msgstr "" #: bookwyrm/templates/notifications.html:111 #, python-format -msgid "" -"boosted your review of %(book_title)s" +msgid "boosted your review of %(book_title)s" msgstr "" -"a partagé votre critique de %(book_title)s" #: bookwyrm/templates/notifications.html:113 #, python-format -msgid "" -"boosted your comment on%(book_title)s" +msgid "boosted your comment on%(book_title)s" msgstr "" -"a partagé votre commentaire sur " -"%(book_title)s" #: bookwyrm/templates/notifications.html:115 #, python-format -msgid "" -"boosted your quote from %(book_title)s" +msgid "boosted your quote from %(book_title)s" msgstr "" -"a partagé votre citation de %(book_title)s" #: bookwyrm/templates/notifications.html:117 #, python-format msgid "boosted your status" -msgstr "a partagé votre statut" +msgstr "" #: bookwyrm/templates/notifications.html:121 #, python-format -msgid "" -" added %(book_title)s to your list " -"\"%(list_name)s\"" +msgid " added %(book_title)s to your list \"%(list_name)s\"" msgstr "" -" a ajouté %(book_title)s à votre " -"liste « %(list_name)s »" #: bookwyrm/templates/notifications.html:123 #, python-format -msgid "" -" suggested adding %(book_title)s to " -"your list \"%(list_name)s\"" +msgid " suggested adding %(book_title)s to your list \"%(list_name)s\"" msgstr "" -" a suggégré l’ajout de %(book_title)s " -"à votre liste « %(list_name)s »" #: bookwyrm/templates/notifications.html:128 #, python-format msgid "Your import completed." -msgstr "Votre importation est terminée." +msgstr "" #: bookwyrm/templates/notifications.html:131 #, python-format msgid "A new report needs moderation." msgstr "" -"Un nouveau signalement a besoin d’être traité." #: bookwyrm/templates/notifications.html:157 msgid "You're all caught up!" -msgstr "Aucune nouvelle notification !" +msgstr "" #: bookwyrm/templates/password_reset.html:23 #: bookwyrm/templates/preferences/change_password.html:18 msgid "Confirm password:" -msgstr "Confirmez le mot de passe :" +msgstr "" #: bookwyrm/templates/password_reset_request.html:14 msgid "A link to reset your password will be sent to your email address" msgstr "" -"Un lien pour changer votre mot de passe sera envoyé à votre addresse email" #: bookwyrm/templates/password_reset_request.html:28 msgid "Reset password" -msgstr "Changer de mot de passe" +msgstr "" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 #: bookwyrm/templates/preferences/preferences_layout.html:26 msgid "Blocked Users" -msgstr "Comptes bloqués" +msgstr "" #: bookwyrm/templates/preferences/blocks.html:12 msgid "No users currently blocked." -msgstr "Aucun compte bloqué actuellement" +msgstr "" #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 #: bookwyrm/templates/preferences/change_password.html:21 #: bookwyrm/templates/preferences/preferences_layout.html:19 msgid "Change Password" -msgstr "Changer le mot de passe" +msgstr "" #: bookwyrm/templates/preferences/change_password.html:14 msgid "New password:" -msgstr "Nouveau mot de passe :" +msgstr "" #: bookwyrm/templates/preferences/edit_user.html:4 #: bookwyrm/templates/preferences/edit_user.html:7 msgid "Edit Profile" -msgstr "Modifier le profil" +msgstr "" #: bookwyrm/templates/preferences/edit_user.html:46 msgid "Show set reading goal prompt in feed:" msgstr "" -"Afficher le message pour définir un défi lecture dans le fil d’actualité :" #: bookwyrm/templates/preferences/edit_user.html:62 #, python-format -msgid "" -"Your account will show up in the directory, and may " -"be recommended to other BookWyrm users." +msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "" -"Votre compte sera listé dans le répertoire et " -"pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm." #: bookwyrm/templates/preferences/edit_user.html:65 msgid "Preferred Timezone: " -msgstr "Fuseau horaire préféré" +msgstr "" #: bookwyrm/templates/preferences/preferences_layout.html:11 msgid "Account" -msgstr "Compte" +msgstr "" #: bookwyrm/templates/preferences/preferences_layout.html:15 msgid "Profile" -msgstr "Profil" +msgstr "" #: bookwyrm/templates/preferences/preferences_layout.html:22 msgid "Relationships" -msgstr "Relations" +msgstr "" #: bookwyrm/templates/rss/title.html:5 #: bookwyrm/templates/snippets/status/status_header.html:35 msgid "rated" -msgstr "a noté" +msgstr "" #: bookwyrm/templates/rss/title.html:7 #: bookwyrm/templates/snippets/status/status_header.html:37 msgid "reviewed" -msgstr "a écrit une critique de" +msgstr "" #: bookwyrm/templates/rss/title.html:9 #: bookwyrm/templates/snippets/status/status_header.html:39 msgid "commented on" -msgstr "a commenté" +msgstr "" #: bookwyrm/templates/rss/title.html:11 #: bookwyrm/templates/snippets/status/status_header.html:41 msgid "quoted" -msgstr "a cité" +msgstr "" #: bookwyrm/templates/search/book.html:64 msgid "Load results from other catalogues" -msgstr "Charger les résultats d’autres catalogues" +msgstr "" #: bookwyrm/templates/search/book.html:68 msgid "Manually add book" -msgstr "Ajouter un livre manuellement" +msgstr "" #: bookwyrm/templates/search/book.html:73 msgid "Log in to import or add books." -msgstr "Authentifiez-vous pour importer ou ajouter des livres." +msgstr "" #: bookwyrm/templates/search/layout.html:16 msgid "Search query" -msgstr "Requête" +msgstr "" #: bookwyrm/templates/search/layout.html:19 msgid "Search type" -msgstr "Type de recherche" +msgstr "" #: bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:74 msgid "Books" -msgstr "Livres" +msgstr "" #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:46 @@ -1933,128 +1787,128 @@ msgstr "Livres" #: bookwyrm/templates/user_admin/user_admin.html:3 #: bookwyrm/templates/user_admin/user_admin.html:10 msgid "Users" -msgstr "Comptes" +msgstr "" #: bookwyrm/templates/search/layout.html:58 #, python-format msgid "No results found for \"%(query)s\"" -msgstr "Aucun résultat pour « %(query)s »" +msgstr "" #: bookwyrm/templates/settings/admin_layout.html:4 msgid "Administration" -msgstr "Administration" +msgstr "" #: bookwyrm/templates/settings/admin_layout.html:22 msgid "Manage Users" -msgstr "Gérer les comptes" +msgstr "" #: bookwyrm/templates/settings/admin_layout.html:39 #: bookwyrm/templates/settings/federation.html:3 #: bookwyrm/templates/settings/federation.html:5 msgid "Federated Servers" -msgstr "Serveurs fédérés" +msgstr "" #: bookwyrm/templates/settings/admin_layout.html:44 msgid "Instance Settings" -msgstr "Paramètres de l’instance" +msgstr "" #: bookwyrm/templates/settings/admin_layout.html:48 #: bookwyrm/templates/settings/announcements.html:3 #: bookwyrm/templates/settings/announcements.html:5 msgid "Announcements" -msgstr "Annonces" +msgstr "" #: bookwyrm/templates/settings/admin_layout.html:52 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" -msgstr "Paramètres du site" +msgstr "" #: bookwyrm/templates/settings/admin_layout.html:55 #: bookwyrm/templates/settings/site.html:13 msgid "Instance Info" -msgstr "Information sur l’instance" +msgstr "" #: bookwyrm/templates/settings/admin_layout.html:56 #: bookwyrm/templates/settings/site.html:39 msgid "Images" -msgstr "Images" +msgstr "" #: bookwyrm/templates/settings/admin_layout.html:57 #: bookwyrm/templates/settings/site.html:59 msgid "Footer Content" -msgstr "Contenu du pied de page" +msgstr "" #: bookwyrm/templates/settings/admin_layout.html:58 #: bookwyrm/templates/settings/site.html:81 msgid "Registration" -msgstr "Enregistrement" +msgstr "" #: bookwyrm/templates/settings/announcement.html:3 #: bookwyrm/templates/settings/announcement.html:6 msgid "Announcement" -msgstr "Annonce" +msgstr "" #: bookwyrm/templates/settings/announcement.html:7 #: bookwyrm/templates/settings/federated_server.html:13 msgid "Back to list" -msgstr "Retour à la liste" +msgstr "" #: bookwyrm/templates/settings/announcement.html:11 #: bookwyrm/templates/settings/announcement_form.html:6 msgid "Edit Announcement" -msgstr "Modifier l’annonce" +msgstr "" #: bookwyrm/templates/settings/announcement.html:20 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 #: bookwyrm/templates/snippets/follow_request_buttons.html:12 msgid "Delete" -msgstr "Supprimer" +msgstr "" #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" -msgstr "Visible :" +msgstr "" #: bookwyrm/templates/settings/announcement.html:38 msgid "True" -msgstr "Vrai" +msgstr "" #: bookwyrm/templates/settings/announcement.html:40 msgid "False" -msgstr "Faux" +msgstr "" #: bookwyrm/templates/settings/announcement.html:47 msgid "Start date:" -msgstr "Date de début :" +msgstr "" #: bookwyrm/templates/settings/announcement.html:54 msgid "End date:" -msgstr "Date de fin :" +msgstr "" #: bookwyrm/templates/settings/announcement.html:60 msgid "Active:" -msgstr "Active :" +msgstr "" #: bookwyrm/templates/settings/announcement_form.html:8 #: bookwyrm/templates/settings/announcements.html:8 msgid "Create Announcement" -msgstr "Ajouter une annonce" +msgstr "" #: bookwyrm/templates/settings/announcements.html:22 msgid "Date added" -msgstr "Date d’ajout" +msgstr "" #: bookwyrm/templates/settings/announcements.html:26 msgid "Preview" -msgstr "Aperçu" +msgstr "" #: bookwyrm/templates/settings/announcements.html:30 msgid "Start date" -msgstr "Date de début" +msgstr "" #: bookwyrm/templates/settings/announcements.html:34 msgid "End date" -msgstr "Date de fin" +msgstr "" #: bookwyrm/templates/settings/announcements.html:38 #: bookwyrm/templates/settings/federation.html:30 @@ -2062,15 +1916,15 @@ msgstr "Date de fin" #: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/user_admin/user_admin.html:34 msgid "Status" -msgstr "Statut" +msgstr "" #: bookwyrm/templates/settings/announcements.html:48 msgid "active" -msgstr "active" +msgstr "" #: bookwyrm/templates/settings/announcements.html:48 msgid "inactive" -msgstr "inactive" +msgstr "" #: bookwyrm/templates/settings/edit_server.html:3 #: bookwyrm/templates/settings/edit_server.html:6 @@ -2080,1415 +1934,982 @@ msgstr "inactive" #: bookwyrm/templates/settings/server_blocklist.html:3 #: bookwyrm/templates/settings/server_blocklist.html:20 msgid "Add server" -msgstr "Ajouter un serveur" +msgstr "" #: bookwyrm/templates/settings/edit_server.html:7 #: bookwyrm/templates/settings/server_blocklist.html:7 msgid "Back to server list" -msgstr "Retour à la liste des serveurs" +msgstr "" #: bookwyrm/templates/settings/edit_server.html:16 #: bookwyrm/templates/settings/server_blocklist.html:16 msgid "Import block list" -msgstr "Importer une liste de blocage" +msgstr "" #: bookwyrm/templates/settings/edit_server.html:30 msgid "Instance:" -msgstr "Instance :" +msgstr "" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 #: bookwyrm/templates/user_admin/user_info.html:34 msgid "Status:" -msgstr "Statut :" +msgstr "" #: bookwyrm/templates/settings/edit_server.html:41 #: bookwyrm/templates/settings/federated_server.html:10 msgid "Blocked" -msgstr "Bloqué" +msgstr "" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 #: bookwyrm/templates/user_admin/user_info.html:26 msgid "Software:" -msgstr "Logiciel :" +msgstr "" #: bookwyrm/templates/settings/edit_server.html:55 #: bookwyrm/templates/settings/federated_server.html:27 #: bookwyrm/templates/user_admin/user_info.html:30 msgid "Version:" -msgstr "Description :" +msgstr "" #: bookwyrm/templates/settings/edit_server.html:64 msgid "Notes:" -msgstr "Remarques :" +msgstr "" #: bookwyrm/templates/settings/federated_server.html:19 msgid "Details" -msgstr "Détails" +msgstr "" #: bookwyrm/templates/settings/federated_server.html:39 #: bookwyrm/templates/user/layout.html:56 msgid "Activity" -msgstr "Activité" +msgstr "" #: bookwyrm/templates/settings/federated_server.html:43 msgid "Users:" -msgstr "Comptes :" +msgstr "" #: bookwyrm/templates/settings/federated_server.html:46 #: bookwyrm/templates/settings/federated_server.html:53 msgid "View all" -msgstr "Voir tous" +msgstr "" #: bookwyrm/templates/settings/federated_server.html:50 msgid "Reports:" -msgstr "Signalements :" +msgstr "" #: bookwyrm/templates/settings/federated_server.html:57 msgid "Followed by us:" -msgstr "Suivi par nous :" +msgstr "" #: bookwyrm/templates/settings/federated_server.html:63 msgid "Followed by them:" -msgstr "Suivi par eux :" +msgstr "" #: bookwyrm/templates/settings/federated_server.html:69 msgid "Blocked by us:" -msgstr "Bloqués par nous :" +msgstr "" #: bookwyrm/templates/settings/federated_server.html:82 #: bookwyrm/templates/user_admin/user_info.html:39 msgid "Notes" -msgstr "Remarques" +msgstr "" #: bookwyrm/templates/settings/federated_server.html:85 msgid "Edit" -msgstr "Modifier" +msgstr "" #: bookwyrm/templates/settings/federated_server.html:105 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3 msgid "Actions" -msgstr "Actions" +msgstr "" #: bookwyrm/templates/settings/federated_server.html:109 #: bookwyrm/templates/snippets/block_button.html:5 msgid "Block" -msgstr "Bloquer" +msgstr "" #: bookwyrm/templates/settings/federated_server.html:110 msgid "All users from this instance will be deactivated." -msgstr "Tous les comptes de cette instance seront désactivés." +msgstr "" #: bookwyrm/templates/settings/federated_server.html:115 #: bookwyrm/templates/snippets/block_button.html:10 msgid "Un-block" -msgstr "Débloquer" +msgstr "" #: bookwyrm/templates/settings/federated_server.html:116 msgid "All users from this instance will be re-activated." -msgstr "Tous les comptes de cette instance seront réactivés." +msgstr "" #: bookwyrm/templates/settings/federation.html:19 #: bookwyrm/templates/user_admin/server_filter.html:5 msgid "Server name" -msgstr "Nom du serveur" +msgstr "" #: bookwyrm/templates/settings/federation.html:23 msgid "Date federated" -msgstr "Date de fédération" +msgstr "" #: bookwyrm/templates/settings/federation.html:27 msgid "Software" -msgstr "Logiciel" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:4 #: bookwyrm/templates/settings/manage_invite_requests.html:11 #: bookwyrm/templates/settings/manage_invite_requests.html:25 #: bookwyrm/templates/settings/manage_invites.html:11 msgid "Invite Requests" -msgstr "Demandes d’invitations" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:23 msgid "Ignored Invite Requests" -msgstr "Invitations ignorées" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:35 msgid "Date requested" -msgstr "Date d’envoi" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:39 msgid "Date accepted" -msgstr "Date de validation" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:42 msgid "Email" -msgstr "Email" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:47 msgid "Action" -msgstr "Action" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:50 msgid "No requests" -msgstr "Aucune demande" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:59 #: bookwyrm/templates/settings/status_filter.html:16 msgid "Accepted" -msgstr "Accepté(e)s" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:61 #: bookwyrm/templates/settings/status_filter.html:12 msgid "Sent" -msgstr "Envoyé(e)s" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:63 #: bookwyrm/templates/settings/status_filter.html:8 msgid "Requested" -msgstr "Demandé(e)s" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:73 msgid "Send invite" -msgstr "Envoyer l’invitation" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:75 msgid "Re-send invite" -msgstr "Envoyer l’invitation de nouveau" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:95 msgid "Ignore" -msgstr "Ignorer" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:97 msgid "Un-ignore" -msgstr "Ne plus ignorer" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:108 msgid "Back to pending requests" -msgstr "Retour aux demandes en attente" +msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:110 msgid "View ignored requests" -msgstr "Voir les demandes ignorées" +msgstr "" #: bookwyrm/templates/settings/manage_invites.html:21 msgid "Generate New Invite" -msgstr "Générer une nouvelle invitation" +msgstr "" #: bookwyrm/templates/settings/manage_invites.html:27 msgid "Expiry:" -msgstr "Expiration :" +msgstr "" #: bookwyrm/templates/settings/manage_invites.html:33 msgid "Use limit:" -msgstr "Limiter à :" +msgstr "" #: bookwyrm/templates/settings/manage_invites.html:40 msgid "Create Invite" -msgstr "Créer une invitation" +msgstr "" #: bookwyrm/templates/settings/manage_invites.html:47 msgid "Link" -msgstr "Lien" +msgstr "" #: bookwyrm/templates/settings/manage_invites.html:48 msgid "Expires" -msgstr "Expiration" +msgstr "" #: bookwyrm/templates/settings/manage_invites.html:49 msgid "Max uses" -msgstr "Nombre maximum d’utilisations" +msgstr "" #: bookwyrm/templates/settings/manage_invites.html:50 msgid "Times used" -msgstr "Nombre de fois utilisée" +msgstr "" #: bookwyrm/templates/settings/manage_invites.html:53 msgid "No active invites" -msgstr "Aucune invitation active" +msgstr "" #: bookwyrm/templates/settings/server_blocklist.html:6 msgid "Import Blocklist" -msgstr "Importer une liste de blocage" +msgstr "" #: bookwyrm/templates/settings/server_blocklist.html:26 #: bookwyrm/templates/snippets/goal_progress.html:7 msgid "Success!" -msgstr "Bravo !" +msgstr "" #: bookwyrm/templates/settings/server_blocklist.html:30 msgid "Successfully blocked:" -msgstr "Blocage réussi :" +msgstr "" #: bookwyrm/templates/settings/server_blocklist.html:32 msgid "Failed:" -msgstr "Échec :" +msgstr "" #: bookwyrm/templates/settings/site.html:15 msgid "Instance Name:" -msgstr "Nom de l’instance :" +msgstr "" #: bookwyrm/templates/settings/site.html:19 msgid "Tagline:" -msgstr "Slogan :" +msgstr "" #: bookwyrm/templates/settings/site.html:23 msgid "Instance description:" -msgstr "Description de l’instance :" +msgstr "" #: bookwyrm/templates/settings/site.html:27 msgid "Code of conduct:" -msgstr "Code de conduite :" +msgstr "" #: bookwyrm/templates/settings/site.html:31 msgid "Privacy Policy:" -msgstr "Politique de vie privée :" +msgstr "" #: bookwyrm/templates/settings/site.html:42 msgid "Logo:" -msgstr "Logo :" +msgstr "" #: bookwyrm/templates/settings/site.html:46 msgid "Logo small:" -msgstr "Logo réduit :" +msgstr "" #: bookwyrm/templates/settings/site.html:50 msgid "Favicon:" -msgstr "Favicon :" +msgstr "" #: bookwyrm/templates/settings/site.html:61 msgid "Support link:" -msgstr "URL pour soutenir l’instance :" +msgstr "" #: bookwyrm/templates/settings/site.html:65 msgid "Support title:" -msgstr "Titre pour soutenir l’instance :" +msgstr "" #: bookwyrm/templates/settings/site.html:69 msgid "Admin email:" -msgstr "Email de l’administrateur :" +msgstr "" #: bookwyrm/templates/settings/site.html:73 msgid "Additional info:" -msgstr "Infos supplémentaires :" +msgstr "" #: bookwyrm/templates/settings/site.html:85 msgid "Allow registration" -msgstr "Autoriser les inscriptions" +msgstr "" #: bookwyrm/templates/settings/site.html:91 msgid "Allow invite requests" -msgstr "Autoriser les demandes d’invitation" +msgstr "" #: bookwyrm/templates/settings/site.html:95 msgid "Registration closed text:" -msgstr "Texte affiché lorsque les enregistrements sont clos :" +msgstr "" #: bookwyrm/templates/snippets/announcement.html:31 #, python-format msgid "Posted by %(username)s" -msgstr "Publiée par %(username)s" +msgstr "" #: bookwyrm/templates/snippets/book_cover.html:31 msgid "No cover" -msgstr "Pas de couverture" +msgstr "" #: bookwyrm/templates/snippets/book_titleby.html:4 #, python-format msgid "%(title)s by " -msgstr "%(title)s par " +msgstr "" #: bookwyrm/templates/snippets/boost_button.html:20 #: bookwyrm/templates/snippets/boost_button.html:21 msgid "Boost" -msgstr "Partager" +msgstr "" #: bookwyrm/templates/snippets/boost_button.html:33 #: bookwyrm/templates/snippets/boost_button.html:34 msgid "Un-boost" -msgstr "Annuler le partage" +msgstr "" #: bookwyrm/templates/snippets/content_warning_field.html:3 msgid "Spoiler alert:" -msgstr "Alerte Spoiler :" +msgstr "" #: bookwyrm/templates/snippets/content_warning_field.html:10 msgid "Spoilers ahead!" -msgstr "Attention spoilers !" +msgstr "" #: bookwyrm/templates/snippets/create_status.html:17 msgid "Review" -msgstr "Critique" +msgstr "" #: bookwyrm/templates/snippets/create_status.html:39 msgid "Quote" -msgstr "Citation" +msgstr "" #: bookwyrm/templates/snippets/create_status_form.html:23 msgid "Comment:" -msgstr "Commentaire :" +msgstr "" #: bookwyrm/templates/snippets/create_status_form.html:25 msgid "Quote:" -msgstr "Citation :" +msgstr "" #: bookwyrm/templates/snippets/create_status_form.html:27 msgid "Review:" -msgstr "Critique :" +msgstr "" #: bookwyrm/templates/snippets/create_status_form.html:56 #: bookwyrm/templates/snippets/status/layout.html:29 #: bookwyrm/templates/snippets/status/layout.html:47 #: bookwyrm/templates/snippets/status/layout.html:48 msgid "Reply" -msgstr "Répondre" +msgstr "" #: bookwyrm/templates/snippets/create_status_form.html:56 msgid "Content" -msgstr "Contenu" +msgstr "" #: bookwyrm/templates/snippets/create_status_form.html:80 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16 msgid "Progress:" -msgstr "Progression :" +msgstr "" #: bookwyrm/templates/snippets/create_status_form.html:88 #: bookwyrm/templates/snippets/readthrough_form.html:22 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30 msgid "pages" -msgstr "pages" +msgstr "" #: bookwyrm/templates/snippets/create_status_form.html:89 #: bookwyrm/templates/snippets/readthrough_form.html:23 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31 msgid "percent" -msgstr "pourcent" +msgstr "" #: bookwyrm/templates/snippets/create_status_form.html:95 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36 #, python-format msgid "of %(pages)s pages" -msgstr "sur %(pages)s pages" +msgstr "" #: bookwyrm/templates/snippets/create_status_form.html:110 msgid "Include spoiler alert" -msgstr "Afficher une alerte spoiler" +msgstr "" #: bookwyrm/templates/snippets/create_status_form.html:117 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:19 msgid "Private" -msgstr "Privé" +msgstr "" #: bookwyrm/templates/snippets/create_status_form.html:128 msgid "Post" -msgstr "Publier" +msgstr "" #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4 msgid "Delete these read dates?" -msgstr "Supprimer ces dates de lecture ?" +msgstr "" #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7 #, python-format -msgid "" -"You are deleting this readthrough and its %(count)s associated progress " -"updates." -msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées." +msgid "You are deleting this readthrough and its %(count)s associated progress updates." +msgstr "" #: bookwyrm/templates/snippets/fav_button.html:10 #: bookwyrm/templates/snippets/fav_button.html:12 msgid "Like" -msgstr "Ajouter aux favoris" +msgstr "" #: bookwyrm/templates/snippets/fav_button.html:18 #: bookwyrm/templates/snippets/fav_button.html:19 msgid "Un-like" -msgstr "Retirer des favoris" +msgstr "" #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7 msgid "Show filters" -msgstr "Afficher les filtres" +msgstr "" #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9 msgid "Hide filters" -msgstr "Masquer les filtres" +msgstr "" #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:22 msgid "Apply filters" -msgstr "Appliquer les filtres" +msgstr "" #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26 msgid "Clear filters" -msgstr "Annuler les filtres" +msgstr "" #: bookwyrm/templates/snippets/follow_button.html:12 msgid "Follow" -msgstr "S’abonner" +msgstr "" #: bookwyrm/templates/snippets/follow_button.html:18 msgid "Undo follow request" -msgstr "Annuler la demande d’abonnement" +msgstr "" #: bookwyrm/templates/snippets/follow_button.html:20 msgid "Unfollow" -msgstr "Se désabonner" +msgstr "" #: bookwyrm/templates/snippets/follow_request_buttons.html:7 msgid "Accept" -msgstr "Accepter" +msgstr "" #: bookwyrm/templates/snippets/form_rate_stars.html:19 #: bookwyrm/templates/snippets/stars.html:13 msgid "No rating" -msgstr "Aucune note" +msgstr "" #: bookwyrm/templates/snippets/form_rate_stars.html:44 #: bookwyrm/templates/snippets/stars.html:7 #, python-format msgid "%(rating)s star" msgid_plural "%(rating)s stars" -msgstr[0] "%(rating)s étoile" -msgstr[1] "%(rating)s étoiles" +msgstr[0] "" +msgstr[1] "" #: bookwyrm/templates/snippets/generated_status/goal.html:1 #, python-format msgid "set a goal to read %(counter)s book in %(year)s" msgid_plural "set a goal to read %(counter)s books in %(year)s" -msgstr[0] "souhaite lire %(counter)s livre en %(year)s" -msgstr[1] "souhaite lire %(counter)s livres en %(year)s" +msgstr[0] "" +msgstr[1] "" #: bookwyrm/templates/snippets/generated_status/rating.html:3 #, python-format -msgid "" -"Rated %(title)s: %(display_rating)s star" -msgid_plural "" -"Rated %(title)s: %(display_rating)s stars" -msgstr[0] "A noté %(title)s : %(display_rating)s star" +msgid "Rated %(title)s: %(display_rating)s star" +msgid_plural "Rated %(title)s: %(display_rating)s stars" +msgstr[0] "" msgstr[1] "" -"A noté %(title)s : %(display_rating)s stars" #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format -msgid "" -"Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" -msgid_plural "" -"Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s" +msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" +msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s" msgstr[0] "" -"Critique de « %(book_title)s » (%(display_rating)s star): %(review_title)s" msgstr[1] "" -"Critique de « %(book_title)s » (%(display_rating)s stars) : %(review_title)s" #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8 #, python-format msgid "Review of \"%(book_title)s\": %(review_title)s" -msgstr "Critique de « %(book_title)s » : %(review_title)s" +msgstr "" #: bookwyrm/templates/snippets/goal_card.html:23 #, python-format -msgid "" -"You can set or change your reading goal any time from your profile page" +msgid "You can set or change your reading goal any time from your profile page" msgstr "" -"Vous pouvez définir ou changer votre défi lecture à n’importe quel moment " -"depuis votre profil" #: bookwyrm/templates/snippets/goal_form.html:9 msgid "Reading goal:" -msgstr "Défi lecture :" +msgstr "" #: bookwyrm/templates/snippets/goal_form.html:14 msgid "books" -msgstr "livres" +msgstr "" #: bookwyrm/templates/snippets/goal_form.html:19 msgid "Goal privacy:" -msgstr "Confidentialité du défi :" +msgstr "" #: bookwyrm/templates/snippets/goal_form.html:26 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20 msgid "Post to feed" -msgstr "Publier sur le fil d’actualité" +msgstr "" #: bookwyrm/templates/snippets/goal_form.html:30 msgid "Set goal" -msgstr "Valider ce défi" +msgstr "" #: bookwyrm/templates/snippets/goal_progress.html:9 #, python-format msgid "%(percent)s%% complete!" -msgstr "%(percent)s%% terminé !" +msgstr "" #: bookwyrm/templates/snippets/goal_progress.html:12 #, python-format -msgid "" -"You've read %(read_count)s of %(goal_count)s books." +msgid "You've read %(read_count)s of %(goal_count)s books." msgstr "" -"Vous avez lu %(read_count)s sur %(goal_count)s livres." #: bookwyrm/templates/snippets/goal_progress.html:14 #, python-format -msgid "" -"%(username)s has read %(read_count)s of %(goal_count)s " -"books." +msgid "%(username)s has read %(read_count)s of %(goal_count)s books." msgstr "" -"%(username)s a lu %(read_count)s sur %(goal_count)s " -"livres." #: bookwyrm/templates/snippets/page_text.html:4 #, python-format msgid "page %(page)s of %(total_pages)s" -msgstr "page %(page)s sur %(total_pages)s pages" +msgstr "" #: bookwyrm/templates/snippets/page_text.html:6 #, python-format msgid "page %(page)s" -msgstr "page %(page)s" +msgstr "" #: bookwyrm/templates/snippets/pagination.html:12 msgid "Previous" -msgstr "Précédente" +msgstr "" #: bookwyrm/templates/snippets/pagination.html:23 msgid "Next" -msgstr "Suivante" +msgstr "" #: bookwyrm/templates/snippets/privacy-icons.html:3 #: bookwyrm/templates/snippets/privacy-icons.html:4 #: bookwyrm/templates/snippets/privacy_select.html:10 msgid "Public" -msgstr "Public" +msgstr "" #: bookwyrm/templates/snippets/privacy-icons.html:7 #: bookwyrm/templates/snippets/privacy-icons.html:8 #: bookwyrm/templates/snippets/privacy_select.html:13 msgid "Unlisted" -msgstr "Non listé" +msgstr "" #: bookwyrm/templates/snippets/privacy-icons.html:12 msgid "Followers-only" -msgstr "Abonnemé(e)s uniquement" +msgstr "" #: bookwyrm/templates/snippets/privacy_select.html:6 msgid "Post privacy" -msgstr "Confidentialité du statut" +msgstr "" #: bookwyrm/templates/snippets/privacy_select.html:16 #: bookwyrm/templates/user/relationships/followers.html:6 #: bookwyrm/templates/user/relationships/layout.html:11 msgid "Followers" -msgstr "Abonné(e)s" +msgstr "" #: bookwyrm/templates/snippets/rate_action.html:4 msgid "Leave a rating" -msgstr "Laisser une note" +msgstr "" #: bookwyrm/templates/snippets/rate_action.html:19 msgid "Rate" -msgstr "Noter" +msgstr "" #: bookwyrm/templates/snippets/readthrough.html:8 msgid "Progress Updates:" -msgstr "Progression :" +msgstr "" #: bookwyrm/templates/snippets/readthrough.html:14 msgid "finished" -msgstr "terminé" +msgstr "" #: bookwyrm/templates/snippets/readthrough.html:25 msgid "Show all updates" -msgstr "Montrer toutes les progressions" +msgstr "" #: bookwyrm/templates/snippets/readthrough.html:41 msgid "Delete this progress update" -msgstr "Supprimer cette mise à jour" +msgstr "" #: bookwyrm/templates/snippets/readthrough.html:52 msgid "started" -msgstr "commencé" +msgstr "" #: bookwyrm/templates/snippets/readthrough.html:59 #: bookwyrm/templates/snippets/readthrough.html:73 msgid "Edit read dates" -msgstr "Modifier les date de lecture" +msgstr "" #: bookwyrm/templates/snippets/readthrough.html:63 msgid "Delete these read dates" -msgstr "Supprimer ces dates de lecture" +msgstr "" #: bookwyrm/templates/snippets/readthrough_form.html:7 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17 msgid "Started reading" -msgstr "Lecture commencée le" +msgstr "" #: bookwyrm/templates/snippets/readthrough_form.html:14 msgid "Progress" -msgstr "Progression" +msgstr "" #: bookwyrm/templates/snippets/readthrough_form.html:30 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25 msgid "Finished reading" -msgstr "Lecture terminée le" +msgstr "" #: bookwyrm/templates/snippets/register_form.html:32 msgid "Sign Up" -msgstr "S’enregistrer" +msgstr "" #: bookwyrm/templates/snippets/report_button.html:6 msgid "Report" -msgstr "Signaler" +msgstr "" #: bookwyrm/templates/snippets/search_result_text.html:36 msgid "Import book" -msgstr "Importer le livre" +msgstr "" #: bookwyrm/templates/snippets/shelf_selector.html:4 msgid "Move book" -msgstr "Déplacer le livre" +msgstr "" #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5 #, python-format msgid "Finish \"%(book_title)s\"" -msgstr "Terminer « %(book_title)s »" +msgstr "" #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 msgid "Update progress" -msgstr "Progression de la mise à jour" +msgstr "" #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 msgid "More shelves" -msgstr "Plus d’étagères" +msgstr "" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10 msgid "Start reading" -msgstr "Commencer la lecture" +msgstr "" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15 msgid "Finish reading" -msgstr "Terminer la lecture" +msgstr "" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26 msgid "Want to read" -msgstr "Je veux le lire" +msgstr "" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47 #, python-format msgid "Remove from %(name)s" -msgstr "Retirer de %(name)s" +msgstr "" #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5 #, python-format msgid "Start \"%(book_title)s\"" -msgstr "Commencer « %(book_title)s »" +msgstr "" #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5 #, python-format msgid "Want to Read \"%(book_title)s\"" -msgstr "Ajouter « %(book_title)s » aux envies de lecture" +msgstr "" #: bookwyrm/templates/snippets/status/content_status.html:71 #: bookwyrm/templates/snippets/trimmed_text.html:15 msgid "Show more" -msgstr "Déplier" +msgstr "" #: bookwyrm/templates/snippets/status/content_status.html:86 #: bookwyrm/templates/snippets/trimmed_text.html:30 msgid "Show less" -msgstr "Replier" +msgstr "" #: bookwyrm/templates/snippets/status/content_status.html:116 msgid "Open image in new window" -msgstr "Ouvrir l’image dans une nouvelle fenêtre" +msgstr "" #: bookwyrm/templates/snippets/status/layout.html:21 #: bookwyrm/templates/snippets/status/status_options.html:17 msgid "Delete status" -msgstr "Supprimer le statut" +msgstr "" #: bookwyrm/templates/snippets/status/layout.html:51 #: bookwyrm/templates/snippets/status/layout.html:52 msgid "Boost status" -msgstr "Partager le statut" +msgstr "" #: bookwyrm/templates/snippets/status/layout.html:55 #: bookwyrm/templates/snippets/status/layout.html:56 msgid "Like status" -msgstr "Ajouter le statut aux favoris" +msgstr "" #: bookwyrm/templates/snippets/status/status.html:10 msgid "boosted" -msgstr "a partagé" +msgstr "" #: bookwyrm/templates/snippets/status/status_header.html:45 #, python-format -msgid "" -"replied to %(username)s's status" +msgid "replied to %(username)s's status" msgstr "" -"a répondu au statut de %(username)s" #: bookwyrm/templates/snippets/status/status_options.html:7 #: bookwyrm/templates/snippets/user_options.html:7 msgid "More options" -msgstr "Plus d’options" +msgstr "" #: bookwyrm/templates/snippets/status/status_options.html:26 msgid "Delete & re-draft" -msgstr "Supprimer & recommencer la rédaction" +msgstr "" #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:13 #: bookwyrm/templates/user_admin/user_moderation_actions.html:6 msgid "Send direct message" -msgstr "Envoyer un message direct" +msgstr "" #: bookwyrm/templates/snippets/switch_edition_button.html:5 msgid "Switch to this edition" -msgstr "Changer vers cette édition" +msgstr "" #: bookwyrm/templates/snippets/table-sort-header.html:6 msgid "Sorted ascending" -msgstr "Trié par ordre croissant" +msgstr "" #: bookwyrm/templates/snippets/table-sort-header.html:10 msgid "Sorted descending" -msgstr "Trié par ordre décroissant" +msgstr "" #: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10 msgid "User Profile" -msgstr "Profil" +msgstr "" #: bookwyrm/templates/user/layout.html:37 msgid "Follow Requests" -msgstr "Demandes d’abonnement" +msgstr "" #: bookwyrm/templates/user/layout.html:62 msgid "Reading Goal" -msgstr "Défi lecture" +msgstr "" #: bookwyrm/templates/user/lists.html:11 #, python-format msgid "Lists: %(username)s" -msgstr "Listes : %(username)s" +msgstr "" #: bookwyrm/templates/user/lists.html:17 bookwyrm/templates/user/lists.html:29 msgid "Create list" -msgstr "Créer une liste" +msgstr "" #: bookwyrm/templates/user/relationships/followers.html:12 #, python-format msgid "%(username)s has no followers" -msgstr "%(username)s n’a pas d’abonné(e)" +msgstr "" #: bookwyrm/templates/user/relationships/following.html:6 #: bookwyrm/templates/user/relationships/layout.html:15 msgid "Following" -msgstr "Comptes suivis" +msgstr "" #: bookwyrm/templates/user/relationships/following.html:12 #, python-format msgid "%(username)s isn't following any users" -msgstr "%(username)s ne suit personne" +msgstr "" #: bookwyrm/templates/user/shelf/books_header.html:5 #, python-format msgid "%(username)s's books" -msgstr "Livres de %(username)s" +msgstr "" #: bookwyrm/templates/user/shelf/create_shelf_form.html:5 #: bookwyrm/templates/user/shelf/create_shelf_form.html:22 msgid "Create Shelf" -msgstr "Créer une étagère" +msgstr "" #: bookwyrm/templates/user/shelf/edit_shelf_form.html:5 msgid "Edit Shelf" -msgstr "Modifier l’étagère" +msgstr "" #: bookwyrm/templates/user/shelf/edit_shelf_form.html:26 msgid "Update shelf" -msgstr "Mettre l’étagère à jour" +msgstr "" #: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56 msgid "All books" -msgstr "Tous les livres" +msgstr "" #: bookwyrm/templates/user/shelf/shelf.html:38 msgid "Create shelf" -msgstr "Créer une étagère" +msgstr "" #: bookwyrm/templates/user/shelf/shelf.html:62 msgid "Edit shelf" -msgstr "Modifier l’étagère" +msgstr "" #: bookwyrm/templates/user/shelf/shelf.html:81 #: bookwyrm/templates/user/shelf/shelf.html:105 msgid "Shelved" -msgstr "Date d’ajout" +msgstr "" #: bookwyrm/templates/user/shelf/shelf.html:82 #: bookwyrm/templates/user/shelf/shelf.html:109 msgid "Started" -msgstr "Commencé" +msgstr "" #: bookwyrm/templates/user/shelf/shelf.html:83 #: bookwyrm/templates/user/shelf/shelf.html:112 msgid "Finished" -msgstr "Terminé" +msgstr "" #: bookwyrm/templates/user/shelf/shelf.html:138 msgid "This shelf is empty." -msgstr "Cette étagère est vide" +msgstr "" #: bookwyrm/templates/user/shelf/shelf.html:144 msgid "Delete shelf" -msgstr "Supprimer l’étagère" +msgstr "" #: bookwyrm/templates/user/user.html:16 msgid "Edit profile" -msgstr "Modifier le profil" +msgstr "" #: bookwyrm/templates/user/user.html:33 #, python-format msgid "View all %(size)s" -msgstr "Voir les %(size)s" +msgstr "" #: bookwyrm/templates/user/user.html:46 msgid "View all books" -msgstr "Voir tous les livres" +msgstr "" #: bookwyrm/templates/user/user.html:59 msgid "User Activity" -msgstr "Activité du compte" +msgstr "" #: bookwyrm/templates/user/user.html:63 msgid "RSS feed" -msgstr "Flux RSS" +msgstr "" #: bookwyrm/templates/user/user.html:74 msgid "No activities yet!" -msgstr "Aucune activité pour l’instant !" +msgstr "" #: bookwyrm/templates/user/user_preview.html:15 #, python-format msgid "Joined %(date)s" -msgstr "A rejoint ce serveur %(date)s" +msgstr "" #: bookwyrm/templates/user/user_preview.html:19 #, python-format msgid "%(counter)s follower" msgid_plural "%(counter)s followers" -msgstr[0] "%(counter)s abonné(e)" -msgstr[1] "%(counter)s abonné(e)s" +msgstr[0] "" +msgstr[1] "" #: bookwyrm/templates/user/user_preview.html:20 #, python-format msgid "%(counter)s following" -msgstr "%(counter)s abonnements" +msgstr "" #: bookwyrm/templates/user/user_preview.html:26 #, python-format msgid "%(mutuals_display)s follower you follow" msgid_plural "%(mutuals_display)s followers you follow" -msgstr[0] "%(mutuals_display)s abonné(e) que vous suivez" -msgstr[1] "%(mutuals_display)s abonné(e)s que vous suivez" +msgstr[0] "" +msgstr[1] "" #: bookwyrm/templates/user_admin/user.html:9 msgid "Back to users" -msgstr "Retour aux comptes" +msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:7 #, python-format msgid "Users: %(server_name)s" -msgstr "Comptes : %(server_name)s" +msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:22 #: bookwyrm/templates/user_admin/username_filter.html:5 msgid "Username" -msgstr "Nom du compte" +msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:26 msgid "Date Added" -msgstr "Date d’ajout" +msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:30 msgid "Last Active" -msgstr "Dernière activité" +msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:38 msgid "Remote server" -msgstr "Serveur distant" +msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:47 msgid "Active" -msgstr "Actif" +msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:47 msgid "Inactive" -msgstr "Inactif" +msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:52 #: bookwyrm/templates/user_admin/user_info.html:49 msgid "Not set" -msgstr "Non défini" +msgstr "" #: bookwyrm/templates/user_admin/user_info.html:5 msgid "User details" -msgstr "Détails du compte" +msgstr "" #: bookwyrm/templates/user_admin/user_info.html:14 msgid "View user profile" -msgstr "Voir le profil" +msgstr "" #: bookwyrm/templates/user_admin/user_info.html:20 msgid "Instance details" -msgstr "Détails de l’instance" +msgstr "" #: bookwyrm/templates/user_admin/user_info.html:46 msgid "View instance" -msgstr "Voir l’instance" +msgstr "" #: bookwyrm/templates/user_admin/user_moderation_actions.html:11 msgid "Suspend user" -msgstr "Suspendre le compte" +msgstr "" #: bookwyrm/templates/user_admin/user_moderation_actions.html:13 msgid "Un-suspend user" -msgstr "Rétablir le compte" +msgstr "" #: bookwyrm/templates/user_admin/user_moderation_actions.html:21 msgid "Access level:" -msgstr "Niveau d’accès :" +msgstr "" #: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22 msgid "File exceeds maximum size: 10MB" -msgstr "Ce fichier dépasse la taille limite : 10 Mo" +msgstr "" #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" -msgstr "Fichier CSV non valide" +msgstr "" #: bookwyrm/views/password.py:32 msgid "No user with that email address was found." -msgstr "Aucun compte avec cette adresse email n’a été trouvé." +msgstr "" #: bookwyrm/views/password.py:41 #, python-format msgid "A password reset link sent to %s" -msgstr "Un lien de réinitialisation a été envoyé à %s." - -#~ msgid "Remove %(name)s" -#~ msgstr "Supprimer %(name)s" - -#, fuzzy -#~| msgid "BookWyrm users" -#~ msgid "BookWyrm\\" -#~ msgstr "Comptes BookWyrm" - -#, fuzzy -#~| msgid "Show more" -#~ msgid "Show" -#~ msgstr "Déplier" - -#, fuzzy -#~| msgid "All messages" -#~ msgid "Messages" -#~ msgstr "Tous les messages" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "Enter a valid URL." -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "Enter a valid integer." -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "Enter a valid email address." -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "Enter a valid IPv4 address." -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "Enter a valid IPv6 address." -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "Enter a valid IPv4 or IPv6 address." -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "Series number:" -#~ msgid "Enter a number." -#~ msgstr "Numéro dans la série :" - -#, fuzzy -#~| msgid "A user with this email already exists." -#~ msgid "%(model_name)s with this %(field_labels)s already exists." -#~ msgstr "Cet email est déjà associé à un compte." - -#, fuzzy -#~| msgid "%(value)s is not a valid remote_id" -#~ msgid "Value %(value)r is not a valid choice." -#~ msgstr "%(value)s n’est pas une remote_id valide." - -#, fuzzy -#~| msgid "This shelf is empty." -#~ msgid "This field cannot be null." -#~ msgstr "Cette étagère est vide" - -#, fuzzy -#~| msgid "A user with this email already exists." -#~ msgid "%(model_name)s with this %(field_label)s already exists." -#~ msgstr "Cet email est déjà associé à un compte." - -#, fuzzy -#~| msgid "No active invites" -#~ msgid "Comma-separated integers" -#~ msgstr "Aucune invitation active" - -#, fuzzy -#~| msgid "Series number:" -#~ msgid "Decimal number" -#~ msgstr "Numéro dans la série :" - -#, fuzzy -#~| msgid "List curation:" -#~ msgid "Duration" -#~ msgstr "Modération de la liste :" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "Email address" -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "No active invites" -#~ msgid "Big (8 byte) integer" -#~ msgstr "Aucune invitation active" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "IPv4 address" -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "IP address" -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "No active invites" -#~ msgid "Positive integer" -#~ msgstr "Aucune invitation active" - -#, fuzzy -#~| msgid "No active invites" -#~ msgid "Positive small integer" -#~ msgstr "Aucune invitation active" - -#, fuzzy -#~| msgid "%(value)s is not a valid username" -#~ msgid "“%(value)s” is not a valid UUID." -#~ msgstr "%(value)s n’est pas un nom de compte valide." - -#, fuzzy -#~| msgid "Images" -#~ msgid "Image" -#~ msgstr "Images" - -#, fuzzy -#~| msgid "Relationships" -#~ msgid "One-to-one relationship" -#~ msgstr "Relations" - -#, fuzzy -#~| msgid "Relationships" -#~ msgid "%(from)s-%(to)s relationship" -#~ msgstr "Relations" - -#, fuzzy -#~| msgid "Relationships" -#~ msgid "%(from)s-%(to)s relationships" -#~ msgstr "Relations" - -#, fuzzy -#~| msgid "Relationships" -#~ msgid "Many-to-many relationship" -#~ msgstr "Relations" - -#, fuzzy -#~| msgid "This shelf is empty." -#~ msgid "This field is required." -#~ msgstr "Cette étagère est vide" - -#, fuzzy -#~| msgid "Series number:" -#~ msgid "Enter a whole number." -#~ msgstr "Numéro dans la série :" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "Enter a valid date." -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "Enter a valid time." -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "Enter a valid date/time." -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "Enter a valid duration." -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "This shelf is empty." -#~ msgid "The submitted file is empty." -#~ msgstr "Cette étagère est vide" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "Enter a list of values." -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "Enter a valid UUID." -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "Order by" -#~ msgid "Order" -#~ msgstr "Trier par" - -#, fuzzy -#~| msgid "%(value)s is not a valid username" -#~ msgid "“%(pk)s” is not a valid value." -#~ msgstr "%(value)s n’est pas un nom de compte valide." - -#, fuzzy -#~| msgid "Started reading" -#~ msgid "Currently" -#~ msgstr "Commencer la lecture" - -#, fuzzy -#~| msgid "Change shelf" -#~ msgid "Change" -#~ msgstr "Changer d’étagère" - -#, fuzzy -#~| msgid "Status" -#~ msgid "Sat" -#~ msgstr "Statut" - -#, fuzzy -#~| msgid "Search" -#~ msgid "March" -#~ msgstr "Chercher" - -#, fuzzy -#~| msgid "Series number:" -#~ msgid "September" -#~ msgstr "Numéro dans la série :" - -#, fuzzy -#~| msgid "Series number:" -#~ msgid "December" -#~ msgstr "Numéro dans la série :" - -#, fuzzy -#~| msgid "Search" -#~ msgctxt "abbrev. month" -#~ msgid "March" -#~ msgstr "Chercher" - -#, fuzzy -#~| msgid "Search" -#~ msgctxt "alt. month" -#~ msgid "March" -#~ msgstr "Chercher" - -#, fuzzy -#~| msgid "Series number:" -#~ msgctxt "alt. month" -#~ msgid "September" -#~ msgstr "Numéro dans la série :" - -#, fuzzy -#~| msgid "Series number:" -#~ msgctxt "alt. month" -#~ msgid "December" -#~ msgstr "Numéro dans la série :" - -#, fuzzy -#~| msgid "Email address:" -#~ msgid "This is not a valid IPv6 address." -#~ msgstr "Adresse email :" - -#, fuzzy -#~| msgid "No books found matching the query \"%(query)s\"" -#~ msgid "No %(verbose_name)s found matching the query" -#~ msgstr "Aucun livre trouvé pour la requête « %(query)s »" - -#, fuzzy -#~| msgid "Community" -#~ msgid "Django Community" -#~ msgstr "Communauté" - -#~ msgid "Didn't find what you were looking for?" -#~ msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?" - -#~ msgid "Hide results from other catalogues" -#~ msgstr "Masquer les résultats d’autres catalogues" - -#~ msgid "Matching Users" -#~ msgstr "Comptes correspondants" - -#~ msgid "Set a reading goal for %(year)s" -#~ msgstr "Définir un défi lecture pour %(year)s" - -#~ msgid "by %(author)s" -#~ msgstr "par %(author)s" - -#~ msgid "Deactivate user" -#~ msgstr "Désactiver le compte" - -#~ msgid "Reactivate user" -#~ msgstr "Réactiver le compte" - -#~ msgid "" -#~ "replied to %(username)s's review" -#~ msgstr "" -#~ "a répondu à la critique de %(username)s" - -#~ msgid "" -#~ "replied to %(username)s's comment" -#~ msgstr "" -#~ "a répondu au commentaire de %(username)s" - -#~ msgid "" -#~ "replied to %(username)s's quote" -#~ msgstr "" -#~ "a répondu à la citation de %(username)s" - -#~ msgid "Remove tag" -#~ msgstr "Supprimer le tag" - -#~ msgid "Add tag" -#~ msgstr "Ajouter un tag" - -#~ msgid "Books tagged \"%(tag.name)s\"" -#~ msgstr "Livres tagués « %(tag.name)s »" - -#, fuzzy -#~| msgid "Started" -#~ msgid "Getting Started" -#~ msgstr "Commencé" - -#, fuzzy -#~| msgid "No users found for \"%(query)s\"" -#~ msgid "No users were found for \"%(query)s\"" -#~ msgstr "Aucun compte trouvé pour « %(query)s »" - -#~ msgid "Tags" -#~ msgstr "Tags" - -#~ msgid "Your lists" -#~ msgstr "Vos listes" - -#, fuzzy -#~| msgid "See all %(size)s" -#~ msgid "See all %(size)s lists" -#~ msgstr "Voir les %(size)s" - -#~ msgid "Recent Lists" -#~ msgstr "Listes récentes" - -#~ msgid "Published" -#~ msgstr "Publié" - -#~ msgid "External links" -#~ msgstr "Liens externes" - -#~ msgid "OpenLibrary" -#~ msgstr "OpenLibrary" - -#~ msgid "Change shelf" -#~ msgstr "Changer d’étagère" - -#~ msgid "Unshelve" -#~ msgstr "Enlever de l’étagère" - -#~ msgid "Your Shelves" -#~ msgstr "Vos étagères" - -#~ msgid "%(username)s: Shelves" -#~ msgstr "%(username)s : Étagères" - -#~ msgid "Shelves" -#~ msgstr "Étagères" - -#~ msgid "See all %(shelf_count)s shelves" -#~ msgstr "Voir les %(shelf_count)s étagères" - -#~ msgid "Send follow request" -#~ msgstr "Envoyer une demande d’abonnement" - -#~ msgid "Site Configuration" -#~ msgstr "Configuration du site" - -#~ msgid "Follow request already sent." -#~ msgstr "Demande d’abonnement déjà envoyée" - -#~ msgid "Created and curated by" -#~ msgstr "Créée et modérée par" - -#~ msgid "Created by" -#~ msgstr "Créée par" - -#~ msgid "Create New Shelf" -#~ msgstr "Créer une nouvelle étagère" - -#, fuzzy -#~| msgid "Create list" -#~ msgid "Create new list" -#~ msgstr "Créer une nouvelle liste" - -#~ msgid "Added by" -#~ msgstr "Ajouté par" - -#~ msgid "suggested adding" -#~ msgstr "a suggéré l’ajout de" - -#~ msgid "Change password" -#~ msgstr "Changer le mot de passe" - -#~ msgid "%(year)s reading goal" -#~ msgstr "Défi lecture pour %(year)s" +msgstr "" From 34ef6d57ce07c6a4f59ad6c42600e166ff10194f Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 6 Jun 2021 18:48:15 +0200 Subject: [PATCH 056/130] Update django.po --- locale/fr_FR/LC_MESSAGES/django.po | 1709 +++++++++++++++++----------- 1 file changed, 1069 insertions(+), 640 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index aefdbdd67..5bacc9aa5 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -1,235 +1,255 @@ +# French language text for the bookwyrm UI +# Copyright (C) 2021 Mouse Reeve +# This file is distributed under the same license as the bookwyrm package. +# Mouse Reeve , 2021 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: 0.1.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-06-05 20:35+0000\n" +"PO-Revision-Date: 2021-04-05 12:44+0100\n" +"Last-Translator: Fabien Basmaison \n" +"Language-Team: Mouse Reeve \n" +"Language: fr_FR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + #: bookwyrm/forms.py:224 msgid "A user with this email already exists." -msgstr "" +msgstr "Cet email est déjà associé à un compte." #: bookwyrm/forms.py:238 msgid "One Day" -msgstr "" +msgstr "Un jour" #: bookwyrm/forms.py:239 msgid "One Week" -msgstr "" +msgstr "Une semaine" #: bookwyrm/forms.py:240 msgid "One Month" -msgstr "" +msgstr "Un mois" #: bookwyrm/forms.py:241 msgid "Does Not Expire" -msgstr "" +msgstr "Sans expiration" #: bookwyrm/forms.py:246 #, python-format msgid "%(count)d uses" -msgstr "" +msgstr "%(count)d utilisations" #: bookwyrm/forms.py:249 msgid "Unlimited" -msgstr "" +msgstr "Sans limite" #: bookwyrm/forms.py:299 msgid "List Order" -msgstr "" +msgstr "Ordre de la liste" #: bookwyrm/forms.py:300 msgid "Book Title" -msgstr "" +msgstr "Titre du livre" #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34 #: bookwyrm/templates/user/shelf/shelf.html:85 #: bookwyrm/templates/user/shelf/shelf.html:116 msgid "Rating" -msgstr "" +msgstr "Note" #: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107 msgid "Sort By" -msgstr "" +msgstr "Trier par" #: bookwyrm/forms.py:307 msgid "Ascending" -msgstr "" +msgstr "Ordre croissant" #: bookwyrm/forms.py:308 msgid "Descending" -msgstr "" +msgstr "Ordre décroissant" #: bookwyrm/models/fields.py:25 #, python-format msgid "%(value)s is not a valid remote_id" -msgstr "" +msgstr "%(value)s n’est pas une remote_id valide." #: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43 #, python-format msgid "%(value)s is not a valid username" -msgstr "" +msgstr "%(value)s n’est pas un nom de compte valide." #: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152 msgid "username" -msgstr "" +msgstr "nom du compte :" #: bookwyrm/models/fields.py:171 msgid "A user with that username already exists." -msgstr "" +msgstr "Ce nom est déjà associé à un compte." #: bookwyrm/settings.py:160 msgid "English" -msgstr "" +msgstr "English" #: bookwyrm/settings.py:161 msgid "German" -msgstr "" +msgstr "Deutsch" #: bookwyrm/settings.py:162 msgid "Spanish" -msgstr "" +msgstr "Español" #: bookwyrm/settings.py:163 msgid "French" -msgstr "" +msgstr "Français" #: bookwyrm/settings.py:164 msgid "Simplified Chinese" -msgstr "" +msgstr "简化字" #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" -msgstr "" +msgstr "Introuvable" #: bookwyrm/templates/404.html:9 msgid "The page you requested doesn't seem to exist!" -msgstr "" +msgstr "Il semblerait que la page que vous avez demandée n’existe pas !" #: bookwyrm/templates/500.html:4 msgid "Oops!" -msgstr "" +msgstr "Oups !" #: bookwyrm/templates/500.html:8 msgid "Server Error" -msgstr "" +msgstr "Erreur côté serveur" #: bookwyrm/templates/500.html:9 msgid "Something went wrong! Sorry about that." -msgstr "" +msgstr "Une erreur s’est produite ; désolé !" #: bookwyrm/templates/author/author.html:17 #: bookwyrm/templates/author/author.html:18 msgid "Edit Author" -msgstr "" +msgstr "Modifier l’auteur ou autrice" #: bookwyrm/templates/author/author.html:34 #: bookwyrm/templates/author/edit_author.html:41 msgid "Aliases:" -msgstr "" +msgstr "Pseudonymes :" #: bookwyrm/templates/author/author.html:45 msgid "Born:" -msgstr "" +msgstr "Naissance :" #: bookwyrm/templates/author/author.html:52 msgid "Died:" -msgstr "" +msgstr "Décès :" #: bookwyrm/templates/author/author.html:61 msgid "Wikipedia" -msgstr "" +msgstr "Wikipedia" #: bookwyrm/templates/author/author.html:69 #: bookwyrm/templates/book/book.html:78 msgid "View on OpenLibrary" -msgstr "" +msgstr "Voir sur OpenLibrary" #: bookwyrm/templates/author/author.html:77 #: bookwyrm/templates/book/book.html:81 msgid "View on Inventaire" -msgstr "" +msgstr "Voir sur Inventaire" #: bookwyrm/templates/author/author.html:85 msgid "View on LibraryThing" -msgstr "" +msgstr "Voir sur LibraryThing" #: bookwyrm/templates/author/author.html:93 msgid "View on Goodreads" -msgstr "" +msgstr "Voir sur Goodreads" #: bookwyrm/templates/author/author.html:108 #, python-format msgid "Books by %(name)s" -msgstr "" +msgstr "Livres par %(name)s" #: bookwyrm/templates/author/edit_author.html:5 msgid "Edit Author:" -msgstr "" +msgstr "Modifier l’auteur ou l’autrice :" #: bookwyrm/templates/author/edit_author.html:13 #: bookwyrm/templates/book/edit_book.html:19 msgid "Added:" -msgstr "" +msgstr "Ajouté :" #: bookwyrm/templates/author/edit_author.html:14 #: bookwyrm/templates/book/edit_book.html:24 msgid "Updated:" -msgstr "" +msgstr "Mis à jour :" #: bookwyrm/templates/author/edit_author.html:15 #: bookwyrm/templates/book/edit_book.html:30 msgid "Last edited by:" -msgstr "" +msgstr "Dernière modification par :" #: bookwyrm/templates/author/edit_author.html:31 #: bookwyrm/templates/book/edit_book.html:117 msgid "Metadata" -msgstr "" +msgstr "Métadonnées" #: bookwyrm/templates/author/edit_author.html:33 #: bookwyrm/templates/lists/form.html:8 #: bookwyrm/templates/user/shelf/create_shelf_form.html:13 #: bookwyrm/templates/user/shelf/edit_shelf_form.html:14 msgid "Name:" -msgstr "" +msgstr "Nom :" #: bookwyrm/templates/author/edit_author.html:43 #: bookwyrm/templates/book/edit_book.html:162 #: bookwyrm/templates/book/edit_book.html:171 #: bookwyrm/templates/book/edit_book.html:214 msgid "Separate multiple values with commas." -msgstr "" +msgstr "Séparez plusieurs valeurs par une virgule." #: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" -msgstr "" +msgstr "Bio :" #: bookwyrm/templates/author/edit_author.html:57 msgid "Wikipedia link:" -msgstr "" +msgstr "Wikipedia :" #: bookwyrm/templates/author/edit_author.html:63 msgid "Birth date:" -msgstr "" +msgstr "Date de naissance :" #: bookwyrm/templates/author/edit_author.html:71 msgid "Death date:" -msgstr "" +msgstr "Date de décès :" #: bookwyrm/templates/author/edit_author.html:79 msgid "Author Identifiers" -msgstr "" +msgstr "Identifiants de l’auteur ou autrice" #: bookwyrm/templates/author/edit_author.html:81 msgid "Openlibrary key:" -msgstr "" +msgstr "Clé Openlibrary :" #: bookwyrm/templates/author/edit_author.html:89 #: bookwyrm/templates/book/edit_book.html:293 msgid "Inventaire ID:" -msgstr "" +msgstr "Identifiant Inventaire :" #: bookwyrm/templates/author/edit_author.html:97 msgid "Librarything key:" -msgstr "" +msgstr "Clé Librarything :" #: bookwyrm/templates/author/edit_author.html:105 msgid "Goodreads key:" -msgstr "" +msgstr "Clé Goodreads :" #: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:124 @@ -246,7 +266,7 @@ msgstr "" #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34 #: bookwyrm/templates/user_admin/user_moderation_actions.html:38 msgid "Save" -msgstr "" +msgstr "Enregistrer" #: bookwyrm/templates/author/edit_author.html:117 #: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174 @@ -262,98 +282,98 @@ msgstr "" #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28 msgid "Cancel" -msgstr "" +msgstr "Annuler" #: bookwyrm/templates/book/book.html:31 #: bookwyrm/templates/discover/large-book.html:25 #: bookwyrm/templates/discover/small-book.html:19 msgid "by" -msgstr "" +msgstr "par" #: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40 msgid "Edit Book" -msgstr "" +msgstr "Modifier le livre" #: bookwyrm/templates/book/book.html:57 #: bookwyrm/templates/book/cover_modal.html:5 msgid "Add cover" -msgstr "" +msgstr "Ajouter une couverture" #: bookwyrm/templates/book/book.html:61 msgid "Failed to load cover" -msgstr "" +msgstr "La couverture n’a pu être chargée" #: bookwyrm/templates/book/book.html:101 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "(%(review_count)s critique)" +msgstr[1] "(%(review_count)s critiques)" #: bookwyrm/templates/book/book.html:113 msgid "Add Description" -msgstr "" +msgstr "Ajouter une description" #: bookwyrm/templates/book/book.html:120 #: bookwyrm/templates/book/edit_book.html:136 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" -msgstr "" +msgstr "Description :" #: bookwyrm/templates/book/book.html:134 #, python-format msgid "%(count)s editions" -msgstr "" +msgstr "%(count)s éditions" #: bookwyrm/templates/book/book.html:142 #, python-format msgid "This edition is on your %(shelf_name)s shelf." -msgstr "" +msgstr "Cette édition est sur votre étagère %(shelf_name)s." #: bookwyrm/templates/book/book.html:148 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." -msgstr "" +msgstr "Une édition différente de ce livre existe sur votre étagère %(shelf_name)s." #: bookwyrm/templates/book/book.html:159 msgid "Your reading activity" -msgstr "" +msgstr "Votre activité de lecture" #: bookwyrm/templates/book/book.html:162 msgid "Add read dates" -msgstr "" +msgstr "Ajouter des dates de lecture" #: bookwyrm/templates/book/book.html:171 msgid "Create" -msgstr "" +msgstr "Créer" #: bookwyrm/templates/book/book.html:181 msgid "You don't have any reading activity for this book." -msgstr "" +msgstr "Vous n’avez aucune activité de lecture pour ce livre" #: bookwyrm/templates/book/book.html:200 msgid "Reviews" -msgstr "" +msgstr "Critiques" #: bookwyrm/templates/book/book.html:205 msgid "Your reviews" -msgstr "" +msgstr "Vos critiques" #: bookwyrm/templates/book/book.html:211 msgid "Your comments" -msgstr "" +msgstr "Vos commentaires" #: bookwyrm/templates/book/book.html:217 msgid "Your quotes" -msgstr "" +msgstr "Vos citations" #: bookwyrm/templates/book/book.html:253 msgid "Subjects" -msgstr "" +msgstr "Sujets" #: bookwyrm/templates/book/book.html:265 msgid "Places" -msgstr "" +msgstr "Lieux" #: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 @@ -361,239 +381,239 @@ msgstr "" #: bookwyrm/templates/search/layout.html:50 #: bookwyrm/templates/user/layout.html:68 msgid "Lists" -msgstr "" +msgstr "Listes" #: bookwyrm/templates/book/book.html:287 msgid "Add to list" -msgstr "" +msgstr "Ajouter à la liste" #: bookwyrm/templates/book/book.html:297 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:179 msgid "Add" -msgstr "" +msgstr "Ajouter" #: bookwyrm/templates/book/book_identifiers.html:7 msgid "ISBN:" -msgstr "" +msgstr "ISBN :" #: bookwyrm/templates/book/book_identifiers.html:14 #: bookwyrm/templates/book/edit_book.html:301 msgid "OCLC Number:" -msgstr "" +msgstr "Numéro OCLC :" #: bookwyrm/templates/book/book_identifiers.html:21 #: bookwyrm/templates/book/edit_book.html:309 msgid "ASIN:" -msgstr "" +msgstr "ASIN :" #: bookwyrm/templates/book/cover_modal.html:17 #: bookwyrm/templates/book/edit_book.html:229 msgid "Upload cover:" -msgstr "" +msgstr "Charger une couverture :" #: bookwyrm/templates/book/cover_modal.html:23 #: bookwyrm/templates/book/edit_book.html:235 msgid "Load cover from url:" -msgstr "" +msgstr "Charger la couverture depuis une URL :" #: bookwyrm/templates/book/edit_book.html:5 #: bookwyrm/templates/book/edit_book.html:11 #, python-format msgid "Edit \"%(book_title)s\"" -msgstr "" +msgstr "Modifier « %(book_title)s »" #: bookwyrm/templates/book/edit_book.html:5 #: bookwyrm/templates/book/edit_book.html:13 msgid "Add Book" -msgstr "" +msgstr "Ajouter un livre" #: bookwyrm/templates/book/edit_book.html:54 msgid "Confirm Book Info" -msgstr "" +msgstr "Confirmer les informations de ce livre" #: bookwyrm/templates/book/edit_book.html:62 #, python-format msgid "Is \"%(name)s\" an existing author?" -msgstr "" +msgstr "Est‑ce que l’auteur/autrice « %(name)s » existe déjà ?" #: bookwyrm/templates/book/edit_book.html:71 #, python-format msgid "Author of %(book_title)s" -msgstr "" +msgstr "Auteur/autrice de %(book_title)s" #: bookwyrm/templates/book/edit_book.html:75 msgid "This is a new author" -msgstr "" +msgstr "Il s’agit d’un nouvel auteur ou d’une nouvelle autrice." #: bookwyrm/templates/book/edit_book.html:82 #, python-format msgid "Creating a new author: %(name)s" -msgstr "" +msgstr "Création d’un nouvel auteur/autrice : %(name)s" #: bookwyrm/templates/book/edit_book.html:89 msgid "Is this an edition of an existing work?" -msgstr "" +msgstr "Est‑ce l’édition d’un ouvrage existant ?" #: bookwyrm/templates/book/edit_book.html:97 msgid "This is a new work" -msgstr "" +msgstr "Il s’agit d’un nouvel ouvrage." #: bookwyrm/templates/book/edit_book.html:104 #: bookwyrm/templates/password_reset.html:30 msgid "Confirm" -msgstr "" +msgstr "Confirmer" #: bookwyrm/templates/book/edit_book.html:106 #: bookwyrm/templates/feed/status.html:8 msgid "Back" -msgstr "" +msgstr "Retour" #: bookwyrm/templates/book/edit_book.html:120 msgid "Title:" -msgstr "" +msgstr "Titre :" #: bookwyrm/templates/book/edit_book.html:128 msgid "Subtitle:" -msgstr "" +msgstr "Sous‑titre :" #: bookwyrm/templates/book/edit_book.html:144 msgid "Series:" -msgstr "" +msgstr "Série :" #: bookwyrm/templates/book/edit_book.html:152 msgid "Series number:" -msgstr "" +msgstr "Numéro dans la série :" #: bookwyrm/templates/book/edit_book.html:160 msgid "Languages:" -msgstr "" +msgstr "Langues :" #: bookwyrm/templates/book/edit_book.html:169 msgid "Publisher:" -msgstr "" +msgstr "Éditeur :" #: bookwyrm/templates/book/edit_book.html:178 msgid "First published date:" -msgstr "" +msgstr "Première date de publication :" #: bookwyrm/templates/book/edit_book.html:186 msgid "Published date:" -msgstr "" +msgstr "Date de publication :" #: bookwyrm/templates/book/edit_book.html:195 msgid "Authors" -msgstr "" +msgstr "Auteurs ou autrices" #: bookwyrm/templates/book/edit_book.html:202 #, python-format msgid "Remove %(name)s" -msgstr "" +msgstr "Retirer %(name)s" #: bookwyrm/templates/book/edit_book.html:205 #, python-format msgid "Author page for %(name)s" -msgstr "" +msgstr "Page de %(name)s" #: bookwyrm/templates/book/edit_book.html:212 msgid "Add Authors:" -msgstr "" +msgstr "Ajouter des auteurs ou autrices :" #: bookwyrm/templates/book/edit_book.html:213 msgid "John Doe, Jane Smith" -msgstr "" +msgstr "Claude Dupont, Dominique Durand" #: bookwyrm/templates/book/edit_book.html:220 #: bookwyrm/templates/user/shelf/shelf.html:78 msgid "Cover" -msgstr "" +msgstr "Couverture" #: bookwyrm/templates/book/edit_book.html:248 msgid "Physical Properties" -msgstr "" +msgstr "Propriétés physiques" #: bookwyrm/templates/book/edit_book.html:250 #: bookwyrm/templates/book/format_filter.html:5 msgid "Format:" -msgstr "" +msgstr "Format :" #: bookwyrm/templates/book/edit_book.html:258 msgid "Pages:" -msgstr "" +msgstr "Pages :" #: bookwyrm/templates/book/edit_book.html:267 msgid "Book Identifiers" -msgstr "" +msgstr "Identifiants du livre" #: bookwyrm/templates/book/edit_book.html:269 msgid "ISBN 13:" -msgstr "" +msgstr "ISBN 13 :" #: bookwyrm/templates/book/edit_book.html:277 msgid "ISBN 10:" -msgstr "" +msgstr "ISBN 10 :" #: bookwyrm/templates/book/edit_book.html:285 msgid "Openlibrary ID:" -msgstr "" +msgstr "Identifiant Openlibrary :" #: bookwyrm/templates/book/editions.html:4 #, python-format msgid "Editions of %(book_title)s" -msgstr "" +msgstr "Éditions de %(book_title)s" #: bookwyrm/templates/book/editions.html:8 #, python-format msgid "Editions of \"%(work_title)s\"" -msgstr "" +msgstr "Éditions de « %(work_title)s »" #: bookwyrm/templates/book/format_filter.html:8 #: bookwyrm/templates/book/language_filter.html:8 msgid "Any" -msgstr "" +msgstr "Tou(te)s" #: bookwyrm/templates/book/language_filter.html:5 msgid "Language:" -msgstr "" +msgstr "Langue :" #: bookwyrm/templates/book/publisher_info.html:22 #, python-format msgid "%(format)s" -msgstr "" +msgstr "%(format)s" #: bookwyrm/templates/book/publisher_info.html:24 #, python-format msgid "%(format)s, %(pages)s pages" -msgstr "" +msgstr "%(format)s, %(pages)s pages" #: bookwyrm/templates/book/publisher_info.html:26 #, python-format msgid "%(pages)s pages" -msgstr "" +msgstr "%(pages)s pages" #: bookwyrm/templates/book/publisher_info.html:38 #, python-format msgid "%(languages)s language" -msgstr "" +msgstr "Langue : %(languages)s" #: bookwyrm/templates/book/publisher_info.html:64 #, python-format msgid "Published %(date)s by %(publisher)s." -msgstr "" +msgstr "Publié %(date)s par %(publisher)s." #: bookwyrm/templates/book/publisher_info.html:66 #, python-format msgid "Published %(date)s" -msgstr "" +msgstr "Publié %(date)s" #: bookwyrm/templates/book/publisher_info.html:68 #, python-format msgid "Published by %(publisher)s." -msgstr "" +msgstr "Publié par %(publisher)s." #: bookwyrm/templates/book/rating.html:13 msgid "rated it" -msgstr "" +msgstr "l’a noté" #: bookwyrm/templates/components/inline_form.html:8 #: bookwyrm/templates/components/modal.html:11 @@ -603,202 +623,202 @@ msgstr "" #: bookwyrm/templates/search/book.html:32 #: bookwyrm/templates/snippets/announcement.html:18 msgid "Close" -msgstr "" +msgstr "Fermer" #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8 msgid "Compose status" -msgstr "" +msgstr "Rédiger un statut" #: bookwyrm/templates/directory/community_filter.html:5 msgid "Community" -msgstr "" +msgstr "Communauté" #: bookwyrm/templates/directory/community_filter.html:8 msgid "Local users" -msgstr "" +msgstr "Comptes locaux" #: bookwyrm/templates/directory/community_filter.html:12 msgid "Federated community" -msgstr "" +msgstr "Communauté fédérée" #: bookwyrm/templates/directory/directory.html:4 #: bookwyrm/templates/directory/directory.html:9 #: bookwyrm/templates/layout.html:64 msgid "Directory" -msgstr "" +msgstr "Répertoire" #: bookwyrm/templates/directory/directory.html:17 msgid "Make your profile discoverable to other BookWyrm users." -msgstr "" +msgstr "Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir votre profil." #: bookwyrm/templates/directory/directory.html:24 #, python-format msgid "You can opt-out at any time in your profile settings." -msgstr "" +msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos paramètres de profil." #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/snippets/announcement.html:34 #: bookwyrm/templates/snippets/goal_card.html:22 msgid "Dismiss message" -msgstr "" +msgstr "Fermer le message" #: bookwyrm/templates/directory/sort_filter.html:5 msgid "Order by" -msgstr "" +msgstr "Trier par" #: bookwyrm/templates/directory/sort_filter.html:8 msgid "Suggested" -msgstr "" +msgstr "Suggéré" #: bookwyrm/templates/directory/sort_filter.html:9 msgid "Recently active" -msgstr "" +msgstr "Actif récemment" #: bookwyrm/templates/directory/user_card.html:33 msgid "follower you follow" msgid_plural "followers you follow" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "compte que vous suivez" +msgstr[1] "comptes que vous suivez" #: bookwyrm/templates/directory/user_card.html:40 msgid "book on your shelves" msgid_plural "books on your shelves" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "livre sur vos étagères" +msgstr[1] "livres sur vos étagères" #: bookwyrm/templates/directory/user_card.html:48 msgid "posts" -msgstr "" +msgstr "publications" #: bookwyrm/templates/directory/user_card.html:54 msgid "last active" -msgstr "" +msgstr "dernière activité" #: bookwyrm/templates/directory/user_type_filter.html:5 msgid "User type" -msgstr "" +msgstr "Type de compte" #: bookwyrm/templates/directory/user_type_filter.html:8 msgid "BookWyrm users" -msgstr "" +msgstr "Comptes BookWyrm" #: bookwyrm/templates/directory/user_type_filter.html:12 msgid "All known users" -msgstr "" +msgstr "Tous les comptes connus" #: bookwyrm/templates/discover/about.html:7 #, python-format msgid "About %(site_name)s" -msgstr "" +msgstr "À propos de %(site_name)s" #: bookwyrm/templates/discover/about.html:10 #: bookwyrm/templates/discover/about.html:20 msgid "Code of Conduct" -msgstr "" +msgstr "Code de conduite" #: bookwyrm/templates/discover/about.html:13 #: bookwyrm/templates/discover/about.html:29 msgid "Privacy Policy" -msgstr "" +msgstr "Politique de vie privée" #: bookwyrm/templates/discover/discover.html:6 msgid "Recent Books" -msgstr "" +msgstr "Livres récents" #: bookwyrm/templates/discover/landing_layout.html:5 #: bookwyrm/templates/get_started/layout.html:4 msgid "Welcome" -msgstr "" +msgstr "Bienvenue" #: bookwyrm/templates/discover/landing_layout.html:17 msgid "Decentralized" -msgstr "" +msgstr "Décentralisé" #: bookwyrm/templates/discover/landing_layout.html:23 msgid "Friendly" -msgstr "" +msgstr "Sympa" #: bookwyrm/templates/discover/landing_layout.html:29 msgid "Anti-Corporate" -msgstr "" +msgstr "Anti‑commercial" #: bookwyrm/templates/discover/landing_layout.html:44 #, python-format msgid "Join %(name)s" -msgstr "" +msgstr "Rejoignez %(name)s" #: bookwyrm/templates/discover/landing_layout.html:51 #: bookwyrm/templates/login.html:51 msgid "This instance is closed" -msgstr "" +msgstr "Cette instance est fermée" #: bookwyrm/templates/discover/landing_layout.html:57 msgid "Thank you! Your request has been received." -msgstr "" +msgstr "Merci ! Votre demande a bien été reçue." #: bookwyrm/templates/discover/landing_layout.html:60 msgid "Request an Invitation" -msgstr "" +msgstr "Demander une invitation" #: bookwyrm/templates/discover/landing_layout.html:64 #: bookwyrm/templates/password_reset_request.html:18 #: bookwyrm/templates/preferences/edit_user.html:38 #: bookwyrm/templates/snippets/register_form.html:13 msgid "Email address:" -msgstr "" +msgstr "Adresse email :" #: bookwyrm/templates/discover/landing_layout.html:70 #: bookwyrm/templates/moderation/report_modal.html:33 msgid "Submit" -msgstr "" +msgstr "Valider" #: bookwyrm/templates/discover/landing_layout.html:79 msgid "Your Account" -msgstr "" +msgstr "Votre compte" #: bookwyrm/templates/email/html_layout.html:15 #: bookwyrm/templates/email/text_layout.html:2 msgid "Hi there," -msgstr "" +msgstr "Bien le bonjour," #: bookwyrm/templates/email/html_layout.html:21 #, python-format msgid "BookWyrm hosted on %(site_name)s" -msgstr "" +msgstr "BookWyrm, hébergé par %(site_name)s" #: bookwyrm/templates/email/html_layout.html:23 msgid "Email preference" -msgstr "" +msgstr "Paramètres d’email" #: bookwyrm/templates/email/invite/html_content.html:6 #: bookwyrm/templates/email/invite/subject.html:2 #, python-format msgid "You're invited to join %(site_name)s!" -msgstr "" +msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s !" #: bookwyrm/templates/email/invite/html_content.html:9 msgid "Join Now" -msgstr "" +msgstr "S’enregistrer maintenant" #: bookwyrm/templates/email/invite/html_content.html:15 #, python-format msgid "Learn more about this instance." -msgstr "" +msgstr "En savoir plus sur cette instance." #: bookwyrm/templates/email/invite/text_content.html:4 #, python-format msgid "You're invited to join %(site_name)s! Click the link below to create an account." -msgstr "" +msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien suivant pour créer un compte." #: bookwyrm/templates/email/invite/text_content.html:8 msgid "Learn more about this instance:" -msgstr "" +msgstr "En savoir plus sur cete instance :" #: bookwyrm/templates/email/password_reset/html_content.html:6 #: bookwyrm/templates/email/password_reset/text_content.html:4 #, python-format msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account." -msgstr "" +msgstr "Une demande de réinitialisation de votre mot de passe sur %(site_name)s a été initialisée. Cliquez le lien suivant pour définir un nouveau mot de passe et vous connecter à votre compte." #: bookwyrm/templates/email/password_reset/html_content.html:9 #: bookwyrm/templates/password_reset.html:4 @@ -806,148 +826,148 @@ msgstr "" #: bookwyrm/templates/password_reset_request.html:4 #: bookwyrm/templates/password_reset_request.html:10 msgid "Reset Password" -msgstr "" +msgstr "Changez le mot de passe" #: bookwyrm/templates/email/password_reset/html_content.html:13 #: bookwyrm/templates/email/password_reset/text_content.html:8 msgid "If you didn't request to reset your password, you can ignore this email." -msgstr "" +msgstr "Si vous n’avez pas demandé la réinitialisation de votre mot de passe, vous pouvez ignorer cet email." #: bookwyrm/templates/email/password_reset/subject.html:2 #, python-format msgid "Reset your %(site_name)s password" -msgstr "" +msgstr "Réinitialiser votre mot de passe sur %(site_name)s" #: bookwyrm/templates/feed/direct_messages.html:8 #, python-format msgid "Direct Messages with %(username)s" -msgstr "" +msgstr "Messages directs avec %(username)s" #: bookwyrm/templates/feed/direct_messages.html:10 #: bookwyrm/templates/layout.html:92 msgid "Direct Messages" -msgstr "" +msgstr "Messages directs" #: bookwyrm/templates/feed/direct_messages.html:13 msgid "All messages" -msgstr "" +msgstr "Tous les messages" #: bookwyrm/templates/feed/direct_messages.html:22 msgid "You have no messages right now." -msgstr "" +msgstr "Vous n’avez aucun message pour l’instant." #: bookwyrm/templates/feed/feed.html:8 msgid "Home Timeline" -msgstr "" +msgstr "Mon fil d’actualité" #: bookwyrm/templates/feed/feed.html:10 msgid "Local Timeline" -msgstr "" +msgstr "Fil d’actualité local" #: bookwyrm/templates/feed/feed.html:12 msgid "Federated Timeline" -msgstr "" +msgstr "Fil d’actualité des instances fédérées" #: bookwyrm/templates/feed/feed.html:18 msgid "Home" -msgstr "" +msgstr "Accueil" #: bookwyrm/templates/feed/feed.html:21 msgid "Local" -msgstr "" +msgstr "Local" #: bookwyrm/templates/feed/feed.html:24 #: bookwyrm/templates/settings/edit_server.html:40 msgid "Federated" -msgstr "" +msgstr "Fédéré" #: bookwyrm/templates/feed/feed.html:32 #, python-format msgid "load 0 unread status(es)" -msgstr "" +msgstr "charger le(s) 0 statut(s) non lu(s)" #: bookwyrm/templates/feed/feed.html:47 msgid "There aren't any activities right now! Try following a user to get started" -msgstr "" +msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer" #: bookwyrm/templates/feed/feed.html:55 #: bookwyrm/templates/get_started/users.html:6 msgid "Who to follow" -msgstr "" +msgstr "À qui s’abonner" #: bookwyrm/templates/feed/feed_layout.html:4 msgid "Updates" -msgstr "" +msgstr "Mises à jour" #: bookwyrm/templates/feed/feed_layout.html:10 #: bookwyrm/templates/user/shelf/books_header.html:3 msgid "Your books" -msgstr "" +msgstr "Vos livres" #: bookwyrm/templates/feed/feed_layout.html:12 msgid "There are no books here right now! Try searching for a book to get started" -msgstr "" +msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer" #: bookwyrm/templates/feed/feed_layout.html:23 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "To Read" -msgstr "" +msgstr "À lire" #: bookwyrm/templates/feed/feed_layout.html:24 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Currently Reading" -msgstr "" +msgstr "Lectures en cours" #: bookwyrm/templates/feed/feed_layout.html:25 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13 #: bookwyrm/templates/user/shelf/shelf.html:29 msgid "Read" -msgstr "" +msgstr "Lu" #: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26 #: bookwyrm/templates/snippets/goal_card.html:6 #, python-format msgid "%(year)s Reading Goal" -msgstr "" +msgstr "Défi lecture pour %(year)s" #: bookwyrm/templates/feed/suggested_users.html:16 #, python-format msgid "%(mutuals)s follower you follow" msgid_plural "%(mutuals)s followers you follow" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(mutuals)s abonné(e) que vous suivez" +msgstr[1] "%(mutuals)s abonné(e)s que vous suivez" #: bookwyrm/templates/feed/suggested_users.html:19 #, python-format msgid "%(shared_books)s book on your shelves" msgid_plural "%(shared_books)s books on your shelves" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(shared_books)s livre sur vos étagères" +msgstr[1] "%(shared_books)s livres sur vos étagères" #: bookwyrm/templates/get_started/book_preview.html:6 #, python-format msgid "Have you read %(book_title)s?" -msgstr "" +msgstr "Avez‑vous lu « %(book_title)s » ?" #: bookwyrm/templates/get_started/books.html:6 msgid "What are you reading?" -msgstr "" +msgstr "Que lisez‑vous ?" #: bookwyrm/templates/get_started/books.html:9 #: bookwyrm/templates/lists/list.html:135 msgid "Search for a book" -msgstr "" +msgstr "Chercher un livre" #: bookwyrm/templates/get_started/books.html:11 #: bookwyrm/templates/isbn_search_results.html:17 #, python-format msgid "No books found for \"%(query)s\"" -msgstr "" +msgstr "Aucun livre trouvé pour « %(query)s »" #: bookwyrm/templates/get_started/books.html:11 #, python-format msgid "You can add books when you start using %(site_name)s." -msgstr "" +msgstr "Vous pourrez ajouter des livres lorsque vous commencerez à utiliser %(site_name)s." #: bookwyrm/templates/get_started/books.html:16 #: bookwyrm/templates/get_started/books.html:17 @@ -958,280 +978,280 @@ msgstr "" #: bookwyrm/templates/search/layout.html:4 #: bookwyrm/templates/search/layout.html:9 msgid "Search" -msgstr "" +msgstr "Chercher" #: bookwyrm/templates/get_started/books.html:27 msgid "Suggested Books" -msgstr "" +msgstr "Suggérer des livres" #: bookwyrm/templates/get_started/books.html:46 #, python-format msgid "Popular on %(site_name)s" -msgstr "" +msgstr "Populaire sur %(site_name)s" #: bookwyrm/templates/get_started/books.html:58 #: bookwyrm/templates/lists/list.html:152 msgid "No books found" -msgstr "" +msgstr "Aucun livre trouvé" #: bookwyrm/templates/get_started/books.html:63 #: bookwyrm/templates/get_started/profile.html:54 msgid "Save & continue" -msgstr "" +msgstr "Enregistrer & continuer" #: bookwyrm/templates/get_started/layout.html:14 #, python-format msgid "Welcome to %(site_name)s!" -msgstr "" +msgstr "Bienvenue sur %(site_name)s !" #: bookwyrm/templates/get_started/layout.html:16 msgid "These are some first steps to get you started." -msgstr "" +msgstr "Voici quelques étapes pour commencer votre profil." #: bookwyrm/templates/get_started/layout.html:30 #: bookwyrm/templates/get_started/profile.html:6 msgid "Create your profile" -msgstr "" +msgstr "Créez votre profil" #: bookwyrm/templates/get_started/layout.html:34 msgid "Add books" -msgstr "" +msgstr "Ajoutez des livres" #: bookwyrm/templates/get_started/layout.html:38 msgid "Find friends" -msgstr "" +msgstr "Établissez des contacts" #: bookwyrm/templates/get_started/layout.html:44 msgid "Skip this step" -msgstr "" +msgstr "Passer cette étape" #: bookwyrm/templates/get_started/layout.html:48 msgid "Finish" -msgstr "" +msgstr "Terminer" #: bookwyrm/templates/get_started/profile.html:15 #: bookwyrm/templates/preferences/edit_user.html:24 msgid "Display name:" -msgstr "" +msgstr "Nom affiché :" #: bookwyrm/templates/get_started/profile.html:22 #: bookwyrm/templates/preferences/edit_user.html:31 msgid "Summary:" -msgstr "" +msgstr "Résumé :" #: bookwyrm/templates/get_started/profile.html:23 msgid "A little bit about you" -msgstr "" +msgstr "Parlez‑nous de vous" #: bookwyrm/templates/get_started/profile.html:32 #: bookwyrm/templates/preferences/edit_user.html:17 msgid "Avatar:" -msgstr "" +msgstr "Avatar :" #: bookwyrm/templates/get_started/profile.html:42 #: bookwyrm/templates/preferences/edit_user.html:52 msgid "Manually approve followers:" -msgstr "" +msgstr "Autoriser les abonnements manuellement :" #: bookwyrm/templates/get_started/profile.html:48 #: bookwyrm/templates/preferences/edit_user.html:58 msgid "Show this account in suggested users:" -msgstr "" +msgstr "Afficher ce compte dans ceux suggérés :" #: bookwyrm/templates/get_started/profile.html:52 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." -msgstr "" +msgstr "Votre compte sera listé dans le répertoire et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm." #: bookwyrm/templates/get_started/users.html:11 msgid "Search for a user" -msgstr "" +msgstr "Chercher un compte" #: bookwyrm/templates/get_started/users.html:13 #, python-format msgid "No users found for \"%(query)s\"" -msgstr "" +msgstr "Aucun compte trouvé pour « %(query)s »" #: bookwyrm/templates/goal.html:7 #, python-format msgid "%(year)s Reading Progress" -msgstr "" +msgstr "Progression de lecture pour %(year)s" #: bookwyrm/templates/goal.html:11 msgid "Edit Goal" -msgstr "" +msgstr "Modifier le défi" #: bookwyrm/templates/goal.html:30 #: bookwyrm/templates/snippets/goal_card.html:13 #, python-format msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year." -msgstr "" +msgstr "Définissez un nombre de livre à lire comme objectif pour %(year)s, et suivezvotre progression au fil de l’année." #: bookwyrm/templates/goal.html:39 #, python-format msgid "%(name)s hasn't set a reading goal for %(year)s." -msgstr "" +msgstr "%(name)s n’a aucun défi lecture pour %(year)s." #: bookwyrm/templates/goal.html:51 #, python-format msgid "Your %(year)s Books" -msgstr "" +msgstr "Vos livres en %(year)s" #: bookwyrm/templates/goal.html:53 #, python-format msgid "%(username)s's %(year)s Books" -msgstr "" +msgstr "Livres de %(username)s en %(year)s" #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 #: bookwyrm/templates/user/shelf/shelf.html:40 msgid "Import Books" -msgstr "" +msgstr "Importer des livres" #: bookwyrm/templates/import.html:16 msgid "Data source:" -msgstr "" +msgstr "Source de données :" #: bookwyrm/templates/import.html:32 msgid "Data file:" -msgstr "" +msgstr "Fichier de données :" #: bookwyrm/templates/import.html:40 msgid "Include reviews" -msgstr "" +msgstr "Importer les critiques" #: bookwyrm/templates/import.html:45 msgid "Privacy setting for imported reviews:" -msgstr "" +msgstr "Confidentialité des critiques importées :" #: bookwyrm/templates/import.html:51 #: bookwyrm/templates/settings/server_blocklist.html:64 msgid "Import" -msgstr "" +msgstr "Importer" #: bookwyrm/templates/import.html:56 msgid "Recent Imports" -msgstr "" +msgstr "Importations récentes" #: bookwyrm/templates/import.html:58 msgid "No recent imports" -msgstr "" +msgstr "Aucune importation récente" #: bookwyrm/templates/import_status.html:5 #: bookwyrm/templates/import_status.html:9 msgid "Import Status" -msgstr "" +msgstr "Statut de l’importation" #: bookwyrm/templates/import_status.html:13 msgid "Import started:" -msgstr "" +msgstr "Début de l’importation :" #: bookwyrm/templates/import_status.html:18 msgid "Import completed:" -msgstr "" +msgstr "Fin de l’importation :" #: bookwyrm/templates/import_status.html:23 msgid "TASK FAILED" -msgstr "" +msgstr "la tâche a échoué" #: bookwyrm/templates/import_status.html:30 msgid "Import still in progress." -msgstr "" +msgstr "L’importation est toujours en cours" #: bookwyrm/templates/import_status.html:32 msgid "(Hit reload to update!)" -msgstr "" +msgstr "(Rechargez la page pour la mettre à jour !)" #: bookwyrm/templates/import_status.html:39 msgid "Failed to load" -msgstr "" +msgstr "Éléments non importés" #: bookwyrm/templates/import_status.html:48 #, python-format msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import." -msgstr "" +msgstr "Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant pu être importés." #: bookwyrm/templates/import_status.html:60 #, python-format msgid "Line %(index)s: %(title)s by %(author)s" -msgstr "" +msgstr "Ligne %(index)s : %(title)s par %(author)s" #: bookwyrm/templates/import_status.html:80 msgid "Select all" -msgstr "" +msgstr "Tout sélectionner" #: bookwyrm/templates/import_status.html:83 msgid "Retry items" -msgstr "" +msgstr "Réessayer l’importation de ces éléments" #: bookwyrm/templates/import_status.html:109 msgid "Successfully imported" -msgstr "" +msgstr "Importation réussie" #: bookwyrm/templates/import_status.html:113 msgid "Book" -msgstr "" +msgstr "Livre" #: bookwyrm/templates/import_status.html:116 #: bookwyrm/templates/snippets/create_status_form.html:13 #: bookwyrm/templates/user/shelf/shelf.html:79 #: bookwyrm/templates/user/shelf/shelf.html:99 msgid "Title" -msgstr "" +msgstr "Titre" #: bookwyrm/templates/import_status.html:119 #: bookwyrm/templates/user/shelf/shelf.html:80 #: bookwyrm/templates/user/shelf/shelf.html:102 msgid "Author" -msgstr "" +msgstr "Auteur/autrice" #: bookwyrm/templates/import_status.html:142 msgid "Imported" -msgstr "" +msgstr "Importé" #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 #: bookwyrm/templates/login.html:46 msgid "Create an Account" -msgstr "" +msgstr "Créer un compte" #: bookwyrm/templates/invite.html:21 msgid "Permission Denied" -msgstr "" +msgstr "Autorisation refusée" #: bookwyrm/templates/invite.html:22 msgid "Sorry! This invite code is no longer valid." -msgstr "" +msgstr "Cette invitation n’est plus valide ; désolé !" #: bookwyrm/templates/isbn_search_results.html:4 msgid "Search Results" -msgstr "" +msgstr "Résultats de recherche" #: bookwyrm/templates/isbn_search_results.html:9 #, python-format msgid "Search Results for \"%(query)s\"" -msgstr "" +msgstr "Résultats de recherche pour « %(query)s »" #: bookwyrm/templates/isbn_search_results.html:14 msgid "Matching Books" -msgstr "" +msgstr "Livres correspondants" #: bookwyrm/templates/layout.html:33 msgid "Search for a book or user" -msgstr "" +msgstr "Chercher un livre ou un compte" #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48 msgid "Main navigation menu" -msgstr "" +msgstr "Menu de navigation principal " #: bookwyrm/templates/layout.html:58 msgid "Feed" -msgstr "" +msgstr "Fil d’actualité" #: bookwyrm/templates/layout.html:87 msgid "Your Books" -msgstr "" +msgstr "Vos Livres" #: bookwyrm/templates/layout.html:97 msgid "Settings" -msgstr "" +msgstr "Paramètres" #: bookwyrm/templates/layout.html:106 #: bookwyrm/templates/settings/admin_layout.html:31 @@ -1239,547 +1259,547 @@ msgstr "" #: bookwyrm/templates/settings/manage_invites.html:3 #: bookwyrm/templates/settings/manage_invites.html:15 msgid "Invites" -msgstr "" +msgstr "Invitations" #: bookwyrm/templates/layout.html:113 msgid "Admin" -msgstr "" +msgstr "Admin" #: bookwyrm/templates/layout.html:120 msgid "Log out" -msgstr "" +msgstr "Se déconnecter" #: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129 #: bookwyrm/templates/notifications.html:6 #: bookwyrm/templates/notifications.html:11 msgid "Notifications" -msgstr "" +msgstr "Notifications" #: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155 #: bookwyrm/templates/login.html:17 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" -msgstr "" +msgstr "Nom du compte :" #: bookwyrm/templates/layout.html:156 msgid "password" -msgstr "" +msgstr "Mot de passe" #: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36 msgid "Forgot your password?" -msgstr "" +msgstr "Mot de passe oublié ?" #: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10 #: bookwyrm/templates/login.html:33 msgid "Log in" -msgstr "" +msgstr "Se connecter" #: bookwyrm/templates/layout.html:168 msgid "Join" -msgstr "" +msgstr "Rejoindre" #: bookwyrm/templates/layout.html:206 msgid "About this server" -msgstr "" +msgstr "À propos de ce serveur" #: bookwyrm/templates/layout.html:210 msgid "Contact site admin" -msgstr "" +msgstr "Contacter l’administrateur du site" #: bookwyrm/templates/layout.html:214 msgid "Documentation" -msgstr "" +msgstr "Documentation" #: bookwyrm/templates/layout.html:221 #, python-format msgid "Support %(site_name)s on %(support_title)s" -msgstr "" +msgstr "Soutenez %(site_name)s avec %(support_title)s" #: bookwyrm/templates/layout.html:225 msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub." -msgstr "" +msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via GitHub." #: bookwyrm/templates/lists/create_form.html:5 #: bookwyrm/templates/lists/lists.html:20 msgid "Create List" -msgstr "" +msgstr "Créer une liste" #: bookwyrm/templates/lists/created_text.html:5 #, python-format msgid "Created and curated by %(username)s" -msgstr "" +msgstr "Créée et modérée par %(username)s" #: bookwyrm/templates/lists/created_text.html:7 #, python-format msgid "Created by %(username)s" -msgstr "" +msgstr "Créée par %(username)s" #: bookwyrm/templates/lists/curate.html:8 msgid "Pending Books" -msgstr "" +msgstr "Livres en attente de modération" #: bookwyrm/templates/lists/curate.html:11 msgid "Go to list" -msgstr "" +msgstr "Aller à la liste" #: bookwyrm/templates/lists/curate.html:15 msgid "You're all set!" -msgstr "" +msgstr "Aucun livre en attente de validation !" #: bookwyrm/templates/lists/curate.html:45 msgid "Suggested by" -msgstr "" +msgstr "Suggéré par" #: bookwyrm/templates/lists/curate.html:57 msgid "Approve" -msgstr "" +msgstr "Approuver" #: bookwyrm/templates/lists/curate.html:63 msgid "Discard" -msgstr "" +msgstr "Rejeter" #: bookwyrm/templates/lists/edit_form.html:5 #: bookwyrm/templates/lists/list_layout.html:16 msgid "Edit List" -msgstr "" +msgstr "Modifier la liste" #: bookwyrm/templates/lists/form.html:18 msgid "List curation:" -msgstr "" +msgstr "Modération de la liste :" #: bookwyrm/templates/lists/form.html:21 msgid "Closed" -msgstr "" +msgstr "Fermée" #: bookwyrm/templates/lists/form.html:22 msgid "Only you can add and remove books to this list" -msgstr "" +msgstr "Vous seulement pouvez ajouter ou retirer des livres dans cette liste" #: bookwyrm/templates/lists/form.html:26 msgid "Curated" -msgstr "" +msgstr "Modérée" #: bookwyrm/templates/lists/form.html:27 msgid "Anyone can suggest books, subject to your approval" -msgstr "" +msgstr "N’importe qui peut suggérer des livres, soumis à votre approbation" #: bookwyrm/templates/lists/form.html:31 #: bookwyrm/templates/moderation/reports.html:25 #: bookwyrm/templates/search/book.html:30 #: bookwyrm/templates/snippets/announcement.html:16 msgid "Open" -msgstr "" +msgstr "Ouverte" #: bookwyrm/templates/lists/form.html:32 msgid "Anyone can add books to this list" -msgstr "" +msgstr "N’importe qui peut suggérer des livres" #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" -msgstr "" +msgstr "Vous avez suggéré un livre à cette liste !" #: bookwyrm/templates/lists/list.html:22 msgid "You successfully added a book to this list!" -msgstr "" +msgstr "Vous avez ajouté un livre à cette liste !" #: bookwyrm/templates/lists/list.html:28 msgid "This list is currently empty" -msgstr "" +msgstr "Cette liste est actuellement vide" #: bookwyrm/templates/lists/list.html:66 #, python-format msgid "Added by %(username)s" -msgstr "" +msgstr "Ajouté par %(username)s" #: bookwyrm/templates/lists/list.html:74 msgid "List position" -msgstr "" +msgstr "Position" #: bookwyrm/templates/lists/list.html:81 msgid "Set" -msgstr "" +msgstr "Appliquer" #: bookwyrm/templates/lists/list.html:89 #: bookwyrm/templates/snippets/shelf_selector.html:26 msgid "Remove" -msgstr "" +msgstr "Retirer" #: bookwyrm/templates/lists/list.html:103 #: bookwyrm/templates/lists/list.html:120 msgid "Sort List" -msgstr "" +msgstr "Trier la liste" #: bookwyrm/templates/lists/list.html:113 msgid "Direction" -msgstr "" +msgstr "Direction" #: bookwyrm/templates/lists/list.html:127 msgid "Add Books" -msgstr "" +msgstr "Ajouter des livres" #: bookwyrm/templates/lists/list.html:129 msgid "Suggest Books" -msgstr "" +msgstr "Suggérer des livres" #: bookwyrm/templates/lists/list.html:140 msgid "search" -msgstr "" +msgstr "chercher" #: bookwyrm/templates/lists/list.html:146 msgid "Clear search" -msgstr "" +msgstr "Vider la requête" #: bookwyrm/templates/lists/list.html:151 #, python-format msgid "No books found matching the query \"%(query)s\"" -msgstr "" +msgstr "Aucun livre trouvé pour la requête « %(query)s »" #: bookwyrm/templates/lists/list.html:179 msgid "Suggest" -msgstr "" +msgstr "Suggérer" #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9 msgid "Your Lists" -msgstr "" +msgstr "Vos listes" #: bookwyrm/templates/login.html:4 msgid "Login" -msgstr "" +msgstr "Connexion" #: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17 #: bookwyrm/templates/snippets/register_form.html:22 msgid "Password:" -msgstr "" +msgstr "Mot de passe :" #: bookwyrm/templates/login.html:52 msgid "Contact an administrator to get an invite" -msgstr "" +msgstr "Contacter un administrateur pour obtenir une invitation" #: bookwyrm/templates/login.html:63 msgid "More about this site" -msgstr "" +msgstr "En savoir plus sur ce site" #: bookwyrm/templates/moderation/report.html:5 #: bookwyrm/templates/moderation/report.html:6 #: bookwyrm/templates/moderation/report_preview.html:6 #, python-format msgid "Report #%(report_id)s: %(username)s" -msgstr "" +msgstr "Signalement #%(report_id)s : %(username)s" #: bookwyrm/templates/moderation/report.html:10 msgid "Back to reports" -msgstr "" +msgstr "Retour aux signalements" #: bookwyrm/templates/moderation/report.html:22 msgid "Moderator Comments" -msgstr "" +msgstr "Commentaires de l’équipe de modération" #: bookwyrm/templates/moderation/report.html:40 #: bookwyrm/templates/snippets/create_status.html:28 #: bookwyrm/templates/snippets/create_status_form.html:66 msgid "Comment" -msgstr "" +msgstr "Commentaire" #: bookwyrm/templates/moderation/report.html:45 msgid "Reported statuses" -msgstr "" +msgstr "Statuts signalés" #: bookwyrm/templates/moderation/report.html:47 msgid "No statuses reported" -msgstr "" +msgstr "Aucun statut signalé" #: bookwyrm/templates/moderation/report.html:53 msgid "Status has been deleted" -msgstr "" +msgstr "Le statut a été supprimé" #: bookwyrm/templates/moderation/report_modal.html:6 #, python-format msgid "Report @%(username)s" -msgstr "" +msgstr "Signaler @%(username)s" #: bookwyrm/templates/moderation/report_modal.html:23 #, python-format msgid "This report will be sent to %(site_name)s's moderators for review." -msgstr "" +msgstr "Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour traitement." #: bookwyrm/templates/moderation/report_modal.html:24 msgid "More info about this report:" -msgstr "" +msgstr "En savoir plus sur ce signalement :" #: bookwyrm/templates/moderation/report_preview.html:13 msgid "No notes provided" -msgstr "" +msgstr "Aucune note fournie" #: bookwyrm/templates/moderation/report_preview.html:20 #, python-format msgid "Reported by %(username)s" -msgstr "" +msgstr "Signalé par %(username)s" #: bookwyrm/templates/moderation/report_preview.html:30 msgid "Re-open" -msgstr "" +msgstr "Réouvrir" #: bookwyrm/templates/moderation/report_preview.html:32 msgid "Resolve" -msgstr "" +msgstr "Résoudre" #: bookwyrm/templates/moderation/reports.html:6 #, python-format msgid "Reports: %(server_name)s" -msgstr "" +msgstr "Signalements : %(server_name)s" #: bookwyrm/templates/moderation/reports.html:8 #: bookwyrm/templates/moderation/reports.html:17 #: bookwyrm/templates/settings/admin_layout.html:35 msgid "Reports" -msgstr "" +msgstr "Signalements" #: bookwyrm/templates/moderation/reports.html:14 #, python-format msgid "Reports: %(server_name)s" -msgstr "" +msgstr "Signalements: %(server_name)s" #: bookwyrm/templates/moderation/reports.html:28 msgid "Resolved" -msgstr "" +msgstr "Résolus" #: bookwyrm/templates/moderation/reports.html:37 msgid "No reports found." -msgstr "" +msgstr "Aucun signalement trouvé." #: bookwyrm/templates/notifications.html:16 msgid "Delete notifications" -msgstr "" +msgstr "Supprimer les notifications" #: bookwyrm/templates/notifications.html:25 msgid "All" -msgstr "" +msgstr "Toutes" #: bookwyrm/templates/notifications.html:29 msgid "Mentions" -msgstr "" +msgstr "Mentions" #: bookwyrm/templates/notifications.html:70 #, python-format msgid "favorited your review of %(book_title)s" -msgstr "" +msgstr "a ajouté votre critique de %(book_title)s à ses favoris" #: bookwyrm/templates/notifications.html:72 #, python-format msgid "favorited your comment on %(book_title)s" -msgstr "" +msgstr "a ajouté votre commentaire sur %(book_title)s à ses favoris" #: bookwyrm/templates/notifications.html:74 #, python-format msgid "favorited your quote from %(book_title)s" -msgstr "" +msgstr "a ajouté votre citation de %(book_title)s à ses favoris" #: bookwyrm/templates/notifications.html:76 #, python-format msgid "favorited your status" -msgstr "" +msgstr "a ajouté votre statut à ses favoris" #: bookwyrm/templates/notifications.html:81 #, python-format msgid "mentioned you in a review of %(book_title)s" -msgstr "" +msgstr "vous a mentionné dans sa critique de %(book_title)s" #: bookwyrm/templates/notifications.html:83 #, python-format msgid "mentioned you in a comment on %(book_title)s" -msgstr "" +msgstr "vous a mentionné dans son commentaire sur %(book_title)s" #: bookwyrm/templates/notifications.html:85 #, python-format msgid "mentioned you in a quote from %(book_title)s" -msgstr "" +msgstr "vous a mentionné dans sa citation de %(book_title)s" #: bookwyrm/templates/notifications.html:87 #, python-format msgid "mentioned you in a status" -msgstr "" +msgstr "vous a mentionné dans son statut" #: bookwyrm/templates/notifications.html:92 #, python-format msgid "replied to your review of %(book_title)s" -msgstr "" +msgstr "a répondu à votre critique de %(book_title)s" #: bookwyrm/templates/notifications.html:94 #, python-format msgid "replied to your comment on %(book_title)s" -msgstr "" +msgstr "a répondu à votre commentaire sur %(book_title)s" #: bookwyrm/templates/notifications.html:96 #, python-format msgid "replied to your quote from %(book_title)s" -msgstr "" +msgstr "a répondu à votre citation de %(book_title)s" #: bookwyrm/templates/notifications.html:98 #, python-format msgid "replied to your status" -msgstr "" +msgstr "a répondu à votre statut" #: bookwyrm/templates/notifications.html:102 msgid "followed you" -msgstr "" +msgstr "vous suit" #: bookwyrm/templates/notifications.html:105 msgid "sent you a follow request" -msgstr "" +msgstr "vous a envoyé une demande d’abonnement" #: bookwyrm/templates/notifications.html:111 #, python-format msgid "boosted your review of %(book_title)s" -msgstr "" +msgstr "a partagé votre critique de %(book_title)s" #: bookwyrm/templates/notifications.html:113 #, python-format msgid "boosted your comment on%(book_title)s" -msgstr "" +msgstr "a partagé votre commentaire sur %(book_title)s" #: bookwyrm/templates/notifications.html:115 #, python-format msgid "boosted your quote from %(book_title)s" -msgstr "" +msgstr "a partagé votre citation de %(book_title)s" #: bookwyrm/templates/notifications.html:117 #, python-format msgid "boosted your status" -msgstr "" +msgstr "a partagé votre statut" #: bookwyrm/templates/notifications.html:121 #, python-format msgid " added %(book_title)s to your list \"%(list_name)s\"" -msgstr "" +msgstr " a ajouté %(book_title)s à votre liste « %(list_name)s »" #: bookwyrm/templates/notifications.html:123 #, python-format msgid " suggested adding %(book_title)s to your list \"%(list_name)s\"" -msgstr "" +msgstr " a suggégré l’ajout de %(book_title)s à votre liste « %(list_name)s »" #: bookwyrm/templates/notifications.html:128 #, python-format msgid "Your import completed." -msgstr "" +msgstr "Votre importation est terminée." #: bookwyrm/templates/notifications.html:131 #, python-format msgid "A new report needs moderation." -msgstr "" +msgstr "Un nouveau signalement a besoin d’être traité." #: bookwyrm/templates/notifications.html:157 msgid "You're all caught up!" -msgstr "" +msgstr "Aucune nouvelle notification !" #: bookwyrm/templates/password_reset.html:23 #: bookwyrm/templates/preferences/change_password.html:18 msgid "Confirm password:" -msgstr "" +msgstr "Confirmez le mot de passe :" #: bookwyrm/templates/password_reset_request.html:14 msgid "A link to reset your password will be sent to your email address" -msgstr "" +msgstr "Un lien pour changer votre mot de passe sera envoyé à votre addresse email" #: bookwyrm/templates/password_reset_request.html:28 msgid "Reset password" -msgstr "" +msgstr "Changer de mot de passe" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 #: bookwyrm/templates/preferences/preferences_layout.html:26 msgid "Blocked Users" -msgstr "" +msgstr "Comptes bloqués" #: bookwyrm/templates/preferences/blocks.html:12 msgid "No users currently blocked." -msgstr "" +msgstr "Aucun compte bloqué actuellement" #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 #: bookwyrm/templates/preferences/change_password.html:21 #: bookwyrm/templates/preferences/preferences_layout.html:19 msgid "Change Password" -msgstr "" +msgstr "Changer le mot de passe" #: bookwyrm/templates/preferences/change_password.html:14 msgid "New password:" -msgstr "" +msgstr "Nouveau mot de passe :" #: bookwyrm/templates/preferences/edit_user.html:4 #: bookwyrm/templates/preferences/edit_user.html:7 msgid "Edit Profile" -msgstr "" +msgstr "Modifier le profil" #: bookwyrm/templates/preferences/edit_user.html:46 msgid "Show set reading goal prompt in feed:" -msgstr "" +msgstr "Afficher le message pour définir un défi lecture dans le fil d’actualité :" #: bookwyrm/templates/preferences/edit_user.html:62 #, python-format msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." -msgstr "" +msgstr "Votre compte sera listé dans le répertoire et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm." #: bookwyrm/templates/preferences/edit_user.html:65 msgid "Preferred Timezone: " -msgstr "" +msgstr "Fuseau horaire préféré" #: bookwyrm/templates/preferences/preferences_layout.html:11 msgid "Account" -msgstr "" +msgstr "Compte" #: bookwyrm/templates/preferences/preferences_layout.html:15 msgid "Profile" -msgstr "" +msgstr "Profil" #: bookwyrm/templates/preferences/preferences_layout.html:22 msgid "Relationships" -msgstr "" +msgstr "Relations" #: bookwyrm/templates/rss/title.html:5 #: bookwyrm/templates/snippets/status/status_header.html:35 msgid "rated" -msgstr "" +msgstr "a noté" #: bookwyrm/templates/rss/title.html:7 #: bookwyrm/templates/snippets/status/status_header.html:37 msgid "reviewed" -msgstr "" +msgstr "a écrit une critique de" #: bookwyrm/templates/rss/title.html:9 #: bookwyrm/templates/snippets/status/status_header.html:39 msgid "commented on" -msgstr "" +msgstr "a commenté" #: bookwyrm/templates/rss/title.html:11 #: bookwyrm/templates/snippets/status/status_header.html:41 msgid "quoted" -msgstr "" +msgstr "a cité" #: bookwyrm/templates/search/book.html:64 msgid "Load results from other catalogues" -msgstr "" +msgstr "Charger les résultats d’autres catalogues" #: bookwyrm/templates/search/book.html:68 msgid "Manually add book" -msgstr "" +msgstr "Ajouter un livre manuellement" #: bookwyrm/templates/search/book.html:73 msgid "Log in to import or add books." -msgstr "" +msgstr "Authentifiez-vous pour importer ou ajouter des livres." #: bookwyrm/templates/search/layout.html:16 msgid "Search query" -msgstr "" +msgstr "Requête" #: bookwyrm/templates/search/layout.html:19 msgid "Search type" -msgstr "" +msgstr "Type de recherche" #: bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:74 msgid "Books" -msgstr "" +msgstr "Livres" #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:46 @@ -1787,128 +1807,128 @@ msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:3 #: bookwyrm/templates/user_admin/user_admin.html:10 msgid "Users" -msgstr "" +msgstr "Comptes" #: bookwyrm/templates/search/layout.html:58 #, python-format msgid "No results found for \"%(query)s\"" -msgstr "" +msgstr "Aucun résultat pour « %(query)s »" #: bookwyrm/templates/settings/admin_layout.html:4 msgid "Administration" -msgstr "" +msgstr "Administration" #: bookwyrm/templates/settings/admin_layout.html:22 msgid "Manage Users" -msgstr "" +msgstr "Gérer les comptes" #: bookwyrm/templates/settings/admin_layout.html:39 #: bookwyrm/templates/settings/federation.html:3 #: bookwyrm/templates/settings/federation.html:5 msgid "Federated Servers" -msgstr "" +msgstr "Serveurs fédérés" #: bookwyrm/templates/settings/admin_layout.html:44 msgid "Instance Settings" -msgstr "" +msgstr "Paramètres de l’instance" #: bookwyrm/templates/settings/admin_layout.html:48 #: bookwyrm/templates/settings/announcements.html:3 #: bookwyrm/templates/settings/announcements.html:5 msgid "Announcements" -msgstr "" +msgstr "Annonces" #: bookwyrm/templates/settings/admin_layout.html:52 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" -msgstr "" +msgstr "Paramètres du site" #: bookwyrm/templates/settings/admin_layout.html:55 #: bookwyrm/templates/settings/site.html:13 msgid "Instance Info" -msgstr "" +msgstr "Information sur l’instance" #: bookwyrm/templates/settings/admin_layout.html:56 #: bookwyrm/templates/settings/site.html:39 msgid "Images" -msgstr "" +msgstr "Images" #: bookwyrm/templates/settings/admin_layout.html:57 #: bookwyrm/templates/settings/site.html:59 msgid "Footer Content" -msgstr "" +msgstr "Contenu du pied de page" #: bookwyrm/templates/settings/admin_layout.html:58 #: bookwyrm/templates/settings/site.html:81 msgid "Registration" -msgstr "" +msgstr "Enregistrement" #: bookwyrm/templates/settings/announcement.html:3 #: bookwyrm/templates/settings/announcement.html:6 msgid "Announcement" -msgstr "" +msgstr "Annonce" #: bookwyrm/templates/settings/announcement.html:7 #: bookwyrm/templates/settings/federated_server.html:13 msgid "Back to list" -msgstr "" +msgstr "Retour à la liste" #: bookwyrm/templates/settings/announcement.html:11 #: bookwyrm/templates/settings/announcement_form.html:6 msgid "Edit Announcement" -msgstr "" +msgstr "Modifier l’annonce" #: bookwyrm/templates/settings/announcement.html:20 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 #: bookwyrm/templates/snippets/follow_request_buttons.html:12 msgid "Delete" -msgstr "" +msgstr "Supprimer" #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" -msgstr "" +msgstr "Visible :" #: bookwyrm/templates/settings/announcement.html:38 msgid "True" -msgstr "" +msgstr "Vrai" #: bookwyrm/templates/settings/announcement.html:40 msgid "False" -msgstr "" +msgstr "Faux" #: bookwyrm/templates/settings/announcement.html:47 msgid "Start date:" -msgstr "" +msgstr "Date de début :" #: bookwyrm/templates/settings/announcement.html:54 msgid "End date:" -msgstr "" +msgstr "Date de fin :" #: bookwyrm/templates/settings/announcement.html:60 msgid "Active:" -msgstr "" +msgstr "Active :" #: bookwyrm/templates/settings/announcement_form.html:8 #: bookwyrm/templates/settings/announcements.html:8 msgid "Create Announcement" -msgstr "" +msgstr "Ajouter une annonce" #: bookwyrm/templates/settings/announcements.html:22 msgid "Date added" -msgstr "" +msgstr "Date d’ajout" #: bookwyrm/templates/settings/announcements.html:26 msgid "Preview" -msgstr "" +msgstr "Aperçu" #: bookwyrm/templates/settings/announcements.html:30 msgid "Start date" -msgstr "" +msgstr "Date de début" #: bookwyrm/templates/settings/announcements.html:34 msgid "End date" -msgstr "" +msgstr "Date de fin" #: bookwyrm/templates/settings/announcements.html:38 #: bookwyrm/templates/settings/federation.html:30 @@ -1916,15 +1936,15 @@ msgstr "" #: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/user_admin/user_admin.html:34 msgid "Status" -msgstr "" +msgstr "Statut" #: bookwyrm/templates/settings/announcements.html:48 msgid "active" -msgstr "" +msgstr "active" #: bookwyrm/templates/settings/announcements.html:48 msgid "inactive" -msgstr "" +msgstr "inactive" #: bookwyrm/templates/settings/edit_server.html:3 #: bookwyrm/templates/settings/edit_server.html:6 @@ -1934,982 +1954,1391 @@ msgstr "" #: bookwyrm/templates/settings/server_blocklist.html:3 #: bookwyrm/templates/settings/server_blocklist.html:20 msgid "Add server" -msgstr "" +msgstr "Ajouter un serveur" #: bookwyrm/templates/settings/edit_server.html:7 #: bookwyrm/templates/settings/server_blocklist.html:7 msgid "Back to server list" -msgstr "" +msgstr "Retour à la liste des serveurs" #: bookwyrm/templates/settings/edit_server.html:16 #: bookwyrm/templates/settings/server_blocklist.html:16 msgid "Import block list" -msgstr "" +msgstr "Importer une liste de blocage" #: bookwyrm/templates/settings/edit_server.html:30 msgid "Instance:" -msgstr "" +msgstr "Instance :" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 #: bookwyrm/templates/user_admin/user_info.html:34 msgid "Status:" -msgstr "" +msgstr "Statut :" #: bookwyrm/templates/settings/edit_server.html:41 #: bookwyrm/templates/settings/federated_server.html:10 msgid "Blocked" -msgstr "" +msgstr "Bloqué" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 #: bookwyrm/templates/user_admin/user_info.html:26 msgid "Software:" -msgstr "" +msgstr "Logiciel :" #: bookwyrm/templates/settings/edit_server.html:55 #: bookwyrm/templates/settings/federated_server.html:27 #: bookwyrm/templates/user_admin/user_info.html:30 msgid "Version:" -msgstr "" +msgstr "Description :" #: bookwyrm/templates/settings/edit_server.html:64 msgid "Notes:" -msgstr "" +msgstr "Remarques :" #: bookwyrm/templates/settings/federated_server.html:19 msgid "Details" -msgstr "" +msgstr "Détails" #: bookwyrm/templates/settings/federated_server.html:39 #: bookwyrm/templates/user/layout.html:56 msgid "Activity" -msgstr "" +msgstr "Activité" #: bookwyrm/templates/settings/federated_server.html:43 msgid "Users:" -msgstr "" +msgstr "Comptes :" #: bookwyrm/templates/settings/federated_server.html:46 #: bookwyrm/templates/settings/federated_server.html:53 msgid "View all" -msgstr "" +msgstr "Voir tous" #: bookwyrm/templates/settings/federated_server.html:50 msgid "Reports:" -msgstr "" +msgstr "Signalements :" #: bookwyrm/templates/settings/federated_server.html:57 msgid "Followed by us:" -msgstr "" +msgstr "Suivi par nous :" #: bookwyrm/templates/settings/federated_server.html:63 msgid "Followed by them:" -msgstr "" +msgstr "Suivi par eux :" #: bookwyrm/templates/settings/federated_server.html:69 msgid "Blocked by us:" -msgstr "" +msgstr "Bloqués par nous :" #: bookwyrm/templates/settings/federated_server.html:82 #: bookwyrm/templates/user_admin/user_info.html:39 msgid "Notes" -msgstr "" +msgstr "Remarques" #: bookwyrm/templates/settings/federated_server.html:85 msgid "Edit" -msgstr "" +msgstr "Modifier" #: bookwyrm/templates/settings/federated_server.html:105 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3 msgid "Actions" -msgstr "" +msgstr "Actions" #: bookwyrm/templates/settings/federated_server.html:109 #: bookwyrm/templates/snippets/block_button.html:5 msgid "Block" -msgstr "" +msgstr "Bloquer" #: bookwyrm/templates/settings/federated_server.html:110 msgid "All users from this instance will be deactivated." -msgstr "" +msgstr "Tous les comptes de cette instance seront désactivés." #: bookwyrm/templates/settings/federated_server.html:115 #: bookwyrm/templates/snippets/block_button.html:10 msgid "Un-block" -msgstr "" +msgstr "Débloquer" #: bookwyrm/templates/settings/federated_server.html:116 msgid "All users from this instance will be re-activated." -msgstr "" +msgstr "Tous les comptes de cette instance seront réactivés." #: bookwyrm/templates/settings/federation.html:19 #: bookwyrm/templates/user_admin/server_filter.html:5 msgid "Server name" -msgstr "" +msgstr "Nom du serveur" #: bookwyrm/templates/settings/federation.html:23 msgid "Date federated" -msgstr "" +msgstr "Date de fédération" #: bookwyrm/templates/settings/federation.html:27 msgid "Software" -msgstr "" +msgstr "Logiciel" #: bookwyrm/templates/settings/manage_invite_requests.html:4 #: bookwyrm/templates/settings/manage_invite_requests.html:11 #: bookwyrm/templates/settings/manage_invite_requests.html:25 #: bookwyrm/templates/settings/manage_invites.html:11 msgid "Invite Requests" -msgstr "" +msgstr "Demandes d’invitations" #: bookwyrm/templates/settings/manage_invite_requests.html:23 msgid "Ignored Invite Requests" -msgstr "" +msgstr "Invitations ignorées" #: bookwyrm/templates/settings/manage_invite_requests.html:35 msgid "Date requested" -msgstr "" +msgstr "Date d’envoi" #: bookwyrm/templates/settings/manage_invite_requests.html:39 msgid "Date accepted" -msgstr "" +msgstr "Date de validation" #: bookwyrm/templates/settings/manage_invite_requests.html:42 msgid "Email" -msgstr "" +msgstr "Email" #: bookwyrm/templates/settings/manage_invite_requests.html:47 msgid "Action" -msgstr "" +msgstr "Action" #: bookwyrm/templates/settings/manage_invite_requests.html:50 msgid "No requests" -msgstr "" +msgstr "Aucune demande" #: bookwyrm/templates/settings/manage_invite_requests.html:59 #: bookwyrm/templates/settings/status_filter.html:16 msgid "Accepted" -msgstr "" +msgstr "Accepté(e)s" #: bookwyrm/templates/settings/manage_invite_requests.html:61 #: bookwyrm/templates/settings/status_filter.html:12 msgid "Sent" -msgstr "" +msgstr "Envoyé(e)s" #: bookwyrm/templates/settings/manage_invite_requests.html:63 #: bookwyrm/templates/settings/status_filter.html:8 msgid "Requested" -msgstr "" +msgstr "Demandé(e)s" #: bookwyrm/templates/settings/manage_invite_requests.html:73 msgid "Send invite" -msgstr "" +msgstr "Envoyer l’invitation" #: bookwyrm/templates/settings/manage_invite_requests.html:75 msgid "Re-send invite" -msgstr "" +msgstr "Envoyer l’invitation de nouveau" #: bookwyrm/templates/settings/manage_invite_requests.html:95 msgid "Ignore" -msgstr "" +msgstr "Ignorer" #: bookwyrm/templates/settings/manage_invite_requests.html:97 msgid "Un-ignore" -msgstr "" +msgstr "Ne plus ignorer" #: bookwyrm/templates/settings/manage_invite_requests.html:108 msgid "Back to pending requests" -msgstr "" +msgstr "Retour aux demandes en attente" #: bookwyrm/templates/settings/manage_invite_requests.html:110 msgid "View ignored requests" -msgstr "" +msgstr "Voir les demandes ignorées" #: bookwyrm/templates/settings/manage_invites.html:21 msgid "Generate New Invite" -msgstr "" +msgstr "Générer une nouvelle invitation" #: bookwyrm/templates/settings/manage_invites.html:27 msgid "Expiry:" -msgstr "" +msgstr "Expiration :" #: bookwyrm/templates/settings/manage_invites.html:33 msgid "Use limit:" -msgstr "" +msgstr "Limiter à :" #: bookwyrm/templates/settings/manage_invites.html:40 msgid "Create Invite" -msgstr "" +msgstr "Créer une invitation" #: bookwyrm/templates/settings/manage_invites.html:47 msgid "Link" -msgstr "" +msgstr "Lien" #: bookwyrm/templates/settings/manage_invites.html:48 msgid "Expires" -msgstr "" +msgstr "Expiration" #: bookwyrm/templates/settings/manage_invites.html:49 msgid "Max uses" -msgstr "" +msgstr "Nombre maximum d’utilisations" #: bookwyrm/templates/settings/manage_invites.html:50 msgid "Times used" -msgstr "" +msgstr "Nombre de fois utilisée" #: bookwyrm/templates/settings/manage_invites.html:53 msgid "No active invites" -msgstr "" +msgstr "Aucune invitation active" #: bookwyrm/templates/settings/server_blocklist.html:6 msgid "Import Blocklist" -msgstr "" +msgstr "Importer une liste de blocage" #: bookwyrm/templates/settings/server_blocklist.html:26 #: bookwyrm/templates/snippets/goal_progress.html:7 msgid "Success!" -msgstr "" +msgstr "Bravo !" #: bookwyrm/templates/settings/server_blocklist.html:30 msgid "Successfully blocked:" -msgstr "" +msgstr "Blocage réussi :" #: bookwyrm/templates/settings/server_blocklist.html:32 msgid "Failed:" -msgstr "" +msgstr "Échec :" #: bookwyrm/templates/settings/site.html:15 msgid "Instance Name:" -msgstr "" +msgstr "Nom de l’instance :" #: bookwyrm/templates/settings/site.html:19 msgid "Tagline:" -msgstr "" +msgstr "Slogan :" #: bookwyrm/templates/settings/site.html:23 msgid "Instance description:" -msgstr "" +msgstr "Description de l’instance :" #: bookwyrm/templates/settings/site.html:27 msgid "Code of conduct:" -msgstr "" +msgstr "Code de conduite :" #: bookwyrm/templates/settings/site.html:31 msgid "Privacy Policy:" -msgstr "" +msgstr "Politique de vie privée :" #: bookwyrm/templates/settings/site.html:42 msgid "Logo:" -msgstr "" +msgstr "Logo :" #: bookwyrm/templates/settings/site.html:46 msgid "Logo small:" -msgstr "" +msgstr "Logo réduit :" #: bookwyrm/templates/settings/site.html:50 msgid "Favicon:" -msgstr "" +msgstr "Favicon :" #: bookwyrm/templates/settings/site.html:61 msgid "Support link:" -msgstr "" +msgstr "URL pour soutenir l’instance :" #: bookwyrm/templates/settings/site.html:65 msgid "Support title:" -msgstr "" +msgstr "Titre pour soutenir l’instance :" #: bookwyrm/templates/settings/site.html:69 msgid "Admin email:" -msgstr "" +msgstr "Email de l’administrateur :" #: bookwyrm/templates/settings/site.html:73 msgid "Additional info:" -msgstr "" +msgstr "Infos supplémentaires :" #: bookwyrm/templates/settings/site.html:85 msgid "Allow registration" -msgstr "" +msgstr "Autoriser les inscriptions" #: bookwyrm/templates/settings/site.html:91 msgid "Allow invite requests" -msgstr "" +msgstr "Autoriser les demandes d’invitation" #: bookwyrm/templates/settings/site.html:95 msgid "Registration closed text:" -msgstr "" +msgstr "Texte affiché lorsque les enregistrements sont clos :" #: bookwyrm/templates/snippets/announcement.html:31 #, python-format msgid "Posted by %(username)s" -msgstr "" +msgstr "Publiée par %(username)s" #: bookwyrm/templates/snippets/book_cover.html:31 msgid "No cover" -msgstr "" +msgstr "Pas de couverture" #: bookwyrm/templates/snippets/book_titleby.html:4 #, python-format msgid "%(title)s by " -msgstr "" +msgstr "%(title)s par " #: bookwyrm/templates/snippets/boost_button.html:20 #: bookwyrm/templates/snippets/boost_button.html:21 msgid "Boost" -msgstr "" +msgstr "Partager" #: bookwyrm/templates/snippets/boost_button.html:33 #: bookwyrm/templates/snippets/boost_button.html:34 msgid "Un-boost" -msgstr "" +msgstr "Annuler le partage" #: bookwyrm/templates/snippets/content_warning_field.html:3 msgid "Spoiler alert:" -msgstr "" +msgstr "Alerte Spoiler :" #: bookwyrm/templates/snippets/content_warning_field.html:10 msgid "Spoilers ahead!" -msgstr "" +msgstr "Attention spoilers !" #: bookwyrm/templates/snippets/create_status.html:17 msgid "Review" -msgstr "" +msgstr "Critique" #: bookwyrm/templates/snippets/create_status.html:39 msgid "Quote" -msgstr "" +msgstr "Citation" #: bookwyrm/templates/snippets/create_status_form.html:23 msgid "Comment:" -msgstr "" +msgstr "Commentaire :" #: bookwyrm/templates/snippets/create_status_form.html:25 msgid "Quote:" -msgstr "" +msgstr "Citation :" #: bookwyrm/templates/snippets/create_status_form.html:27 msgid "Review:" -msgstr "" +msgstr "Critique :" #: bookwyrm/templates/snippets/create_status_form.html:56 #: bookwyrm/templates/snippets/status/layout.html:29 #: bookwyrm/templates/snippets/status/layout.html:47 #: bookwyrm/templates/snippets/status/layout.html:48 msgid "Reply" -msgstr "" +msgstr "Répondre" #: bookwyrm/templates/snippets/create_status_form.html:56 msgid "Content" -msgstr "" +msgstr "Contenu" #: bookwyrm/templates/snippets/create_status_form.html:80 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16 msgid "Progress:" -msgstr "" +msgstr "Progression :" #: bookwyrm/templates/snippets/create_status_form.html:88 #: bookwyrm/templates/snippets/readthrough_form.html:22 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30 msgid "pages" -msgstr "" +msgstr "pages" #: bookwyrm/templates/snippets/create_status_form.html:89 #: bookwyrm/templates/snippets/readthrough_form.html:23 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31 msgid "percent" -msgstr "" +msgstr "pourcent" #: bookwyrm/templates/snippets/create_status_form.html:95 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36 #, python-format msgid "of %(pages)s pages" -msgstr "" +msgstr "sur %(pages)s pages" #: bookwyrm/templates/snippets/create_status_form.html:110 msgid "Include spoiler alert" -msgstr "" +msgstr "Afficher une alerte spoiler" #: bookwyrm/templates/snippets/create_status_form.html:117 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 #: bookwyrm/templates/snippets/privacy_select.html:19 msgid "Private" -msgstr "" +msgstr "Privé" #: bookwyrm/templates/snippets/create_status_form.html:128 msgid "Post" -msgstr "" +msgstr "Publier" #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4 msgid "Delete these read dates?" -msgstr "" +msgstr "Supprimer ces dates de lecture ?" #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7 #, python-format msgid "You are deleting this readthrough and its %(count)s associated progress updates." -msgstr "" +msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées." #: bookwyrm/templates/snippets/fav_button.html:10 #: bookwyrm/templates/snippets/fav_button.html:12 msgid "Like" -msgstr "" +msgstr "Ajouter aux favoris" #: bookwyrm/templates/snippets/fav_button.html:18 #: bookwyrm/templates/snippets/fav_button.html:19 msgid "Un-like" -msgstr "" +msgstr "Retirer des favoris" #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7 msgid "Show filters" -msgstr "" +msgstr "Afficher les filtres" #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9 msgid "Hide filters" -msgstr "" +msgstr "Masquer les filtres" #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:22 msgid "Apply filters" -msgstr "" +msgstr "Appliquer les filtres" #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26 msgid "Clear filters" -msgstr "" +msgstr "Annuler les filtres" #: bookwyrm/templates/snippets/follow_button.html:12 msgid "Follow" -msgstr "" +msgstr "S’abonner" #: bookwyrm/templates/snippets/follow_button.html:18 msgid "Undo follow request" -msgstr "" +msgstr "Annuler la demande d’abonnement" #: bookwyrm/templates/snippets/follow_button.html:20 msgid "Unfollow" -msgstr "" +msgstr "Se désabonner" #: bookwyrm/templates/snippets/follow_request_buttons.html:7 msgid "Accept" -msgstr "" +msgstr "Accepter" #: bookwyrm/templates/snippets/form_rate_stars.html:19 #: bookwyrm/templates/snippets/stars.html:13 msgid "No rating" -msgstr "" +msgstr "Aucune note" #: bookwyrm/templates/snippets/form_rate_stars.html:44 #: bookwyrm/templates/snippets/stars.html:7 #, python-format msgid "%(rating)s star" msgid_plural "%(rating)s stars" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(rating)s étoile" +msgstr[1] "%(rating)s étoiles" #: bookwyrm/templates/snippets/generated_status/goal.html:1 #, python-format msgid "set a goal to read %(counter)s book in %(year)s" msgid_plural "set a goal to read %(counter)s books in %(year)s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "souhaite lire %(counter)s livre en %(year)s" +msgstr[1] "souhaite lire %(counter)s livres en %(year)s" #: bookwyrm/templates/snippets/generated_status/rating.html:3 #, python-format msgid "Rated %(title)s: %(display_rating)s star" msgid_plural "Rated %(title)s: %(display_rating)s stars" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "A noté %(title)s : %(display_rating)s star" +msgstr[1] "A noté %(title)s : %(display_rating)s stars" #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Critique de « %(book_title)s » (%(display_rating)s star): %(review_title)s" +msgstr[1] "Critique de « %(book_title)s » (%(display_rating)s stars) : %(review_title)s" #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8 #, python-format msgid "Review of \"%(book_title)s\": %(review_title)s" -msgstr "" +msgstr "Critique de « %(book_title)s » : %(review_title)s" #: bookwyrm/templates/snippets/goal_card.html:23 #, python-format msgid "You can set or change your reading goal any time from your profile page" -msgstr "" +msgstr "Vous pouvez définir ou changer votre défi lecture à n’importe quel moment depuis votre profil" #: bookwyrm/templates/snippets/goal_form.html:9 msgid "Reading goal:" -msgstr "" +msgstr "Défi lecture :" #: bookwyrm/templates/snippets/goal_form.html:14 msgid "books" -msgstr "" +msgstr "livres" #: bookwyrm/templates/snippets/goal_form.html:19 msgid "Goal privacy:" -msgstr "" +msgstr "Confidentialité du défi :" #: bookwyrm/templates/snippets/goal_form.html:26 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20 msgid "Post to feed" -msgstr "" +msgstr "Publier sur le fil d’actualité" #: bookwyrm/templates/snippets/goal_form.html:30 msgid "Set goal" -msgstr "" +msgstr "Valider ce défi" #: bookwyrm/templates/snippets/goal_progress.html:9 #, python-format msgid "%(percent)s%% complete!" -msgstr "" +msgstr "%(percent)s%% terminé !" #: bookwyrm/templates/snippets/goal_progress.html:12 #, python-format msgid "You've read %(read_count)s of %(goal_count)s books." -msgstr "" +msgstr "Vous avez lu %(read_count)s sur %(goal_count)s livres." #: bookwyrm/templates/snippets/goal_progress.html:14 #, python-format msgid "%(username)s has read %(read_count)s of %(goal_count)s books." -msgstr "" +msgstr "%(username)s a lu %(read_count)s sur %(goal_count)s livres." #: bookwyrm/templates/snippets/page_text.html:4 #, python-format msgid "page %(page)s of %(total_pages)s" -msgstr "" +msgstr "page %(page)s sur %(total_pages)s pages" #: bookwyrm/templates/snippets/page_text.html:6 #, python-format msgid "page %(page)s" -msgstr "" +msgstr "page %(page)s" #: bookwyrm/templates/snippets/pagination.html:12 msgid "Previous" -msgstr "" +msgstr "Précédente" #: bookwyrm/templates/snippets/pagination.html:23 msgid "Next" -msgstr "" +msgstr "Suivante" #: bookwyrm/templates/snippets/privacy-icons.html:3 #: bookwyrm/templates/snippets/privacy-icons.html:4 #: bookwyrm/templates/snippets/privacy_select.html:10 msgid "Public" -msgstr "" +msgstr "Public" #: bookwyrm/templates/snippets/privacy-icons.html:7 #: bookwyrm/templates/snippets/privacy-icons.html:8 #: bookwyrm/templates/snippets/privacy_select.html:13 msgid "Unlisted" -msgstr "" +msgstr "Non listé" #: bookwyrm/templates/snippets/privacy-icons.html:12 msgid "Followers-only" -msgstr "" +msgstr "Abonnemé(e)s uniquement" #: bookwyrm/templates/snippets/privacy_select.html:6 msgid "Post privacy" -msgstr "" +msgstr "Confidentialité du statut" #: bookwyrm/templates/snippets/privacy_select.html:16 #: bookwyrm/templates/user/relationships/followers.html:6 #: bookwyrm/templates/user/relationships/layout.html:11 msgid "Followers" -msgstr "" +msgstr "Abonné(e)s" #: bookwyrm/templates/snippets/rate_action.html:4 msgid "Leave a rating" -msgstr "" +msgstr "Laisser une note" #: bookwyrm/templates/snippets/rate_action.html:19 msgid "Rate" -msgstr "" +msgstr "Noter" #: bookwyrm/templates/snippets/readthrough.html:8 msgid "Progress Updates:" -msgstr "" +msgstr "Progression :" #: bookwyrm/templates/snippets/readthrough.html:14 msgid "finished" -msgstr "" +msgstr "terminé" #: bookwyrm/templates/snippets/readthrough.html:25 msgid "Show all updates" -msgstr "" +msgstr "Montrer toutes les progressions" #: bookwyrm/templates/snippets/readthrough.html:41 msgid "Delete this progress update" -msgstr "" +msgstr "Supprimer cette mise à jour" #: bookwyrm/templates/snippets/readthrough.html:52 msgid "started" -msgstr "" +msgstr "commencé" #: bookwyrm/templates/snippets/readthrough.html:59 #: bookwyrm/templates/snippets/readthrough.html:73 msgid "Edit read dates" -msgstr "" +msgstr "Modifier les date de lecture" #: bookwyrm/templates/snippets/readthrough.html:63 msgid "Delete these read dates" -msgstr "" +msgstr "Supprimer ces dates de lecture" #: bookwyrm/templates/snippets/readthrough_form.html:7 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17 msgid "Started reading" -msgstr "" +msgstr "Lecture commencée le" #: bookwyrm/templates/snippets/readthrough_form.html:14 msgid "Progress" -msgstr "" +msgstr "Progression" #: bookwyrm/templates/snippets/readthrough_form.html:30 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25 msgid "Finished reading" -msgstr "" +msgstr "Lecture terminée le" #: bookwyrm/templates/snippets/register_form.html:32 msgid "Sign Up" -msgstr "" +msgstr "S’enregistrer" #: bookwyrm/templates/snippets/report_button.html:6 msgid "Report" -msgstr "" +msgstr "Signaler" #: bookwyrm/templates/snippets/search_result_text.html:36 msgid "Import book" -msgstr "" +msgstr "Importer le livre" #: bookwyrm/templates/snippets/shelf_selector.html:4 msgid "Move book" -msgstr "" +msgstr "Déplacer le livre" #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5 #, python-format msgid "Finish \"%(book_title)s\"" -msgstr "" +msgstr "Terminer « %(book_title)s »" #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 msgid "Update progress" -msgstr "" +msgstr "Progression de la mise à jour" #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 msgid "More shelves" -msgstr "" +msgstr "Plus d’étagères" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10 msgid "Start reading" -msgstr "" +msgstr "Commencer la lecture" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15 msgid "Finish reading" -msgstr "" +msgstr "Terminer la lecture" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26 msgid "Want to read" -msgstr "" +msgstr "Je veux le lire" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47 #, python-format msgid "Remove from %(name)s" -msgstr "" +msgstr "Retirer de %(name)s" #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5 #, python-format msgid "Start \"%(book_title)s\"" -msgstr "" +msgstr "Commencer « %(book_title)s »" #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5 #, python-format msgid "Want to Read \"%(book_title)s\"" -msgstr "" +msgstr "Ajouter « %(book_title)s » aux envies de lecture" #: bookwyrm/templates/snippets/status/content_status.html:71 #: bookwyrm/templates/snippets/trimmed_text.html:15 msgid "Show more" -msgstr "" +msgstr "Déplier" #: bookwyrm/templates/snippets/status/content_status.html:86 #: bookwyrm/templates/snippets/trimmed_text.html:30 msgid "Show less" -msgstr "" +msgstr "Replier" #: bookwyrm/templates/snippets/status/content_status.html:116 msgid "Open image in new window" -msgstr "" +msgstr "Ouvrir l’image dans une nouvelle fenêtre" #: bookwyrm/templates/snippets/status/layout.html:21 #: bookwyrm/templates/snippets/status/status_options.html:17 msgid "Delete status" -msgstr "" +msgstr "Supprimer le statut" #: bookwyrm/templates/snippets/status/layout.html:51 #: bookwyrm/templates/snippets/status/layout.html:52 msgid "Boost status" -msgstr "" +msgstr "Partager le statut" #: bookwyrm/templates/snippets/status/layout.html:55 #: bookwyrm/templates/snippets/status/layout.html:56 msgid "Like status" -msgstr "" +msgstr "Ajouter le statut aux favoris" #: bookwyrm/templates/snippets/status/status.html:10 msgid "boosted" -msgstr "" +msgstr "a partagé" #: bookwyrm/templates/snippets/status/status_header.html:45 #, python-format msgid "replied to %(username)s's status" -msgstr "" +msgstr "a répondu au statut de %(username)s" #: bookwyrm/templates/snippets/status/status_options.html:7 #: bookwyrm/templates/snippets/user_options.html:7 msgid "More options" -msgstr "" +msgstr "Plus d’options" #: bookwyrm/templates/snippets/status/status_options.html:26 msgid "Delete & re-draft" -msgstr "" +msgstr "Supprimer & recommencer la rédaction" #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:13 #: bookwyrm/templates/user_admin/user_moderation_actions.html:6 msgid "Send direct message" -msgstr "" +msgstr "Envoyer un message direct" #: bookwyrm/templates/snippets/switch_edition_button.html:5 msgid "Switch to this edition" -msgstr "" +msgstr "Changer vers cette édition" #: bookwyrm/templates/snippets/table-sort-header.html:6 msgid "Sorted ascending" -msgstr "" +msgstr "Trié par ordre croissant" #: bookwyrm/templates/snippets/table-sort-header.html:10 msgid "Sorted descending" -msgstr "" +msgstr "Trié par ordre décroissant" #: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10 msgid "User Profile" -msgstr "" +msgstr "Profil" #: bookwyrm/templates/user/layout.html:37 msgid "Follow Requests" -msgstr "" +msgstr "Demandes d’abonnement" #: bookwyrm/templates/user/layout.html:62 msgid "Reading Goal" -msgstr "" +msgstr "Défi lecture" #: bookwyrm/templates/user/lists.html:11 #, python-format msgid "Lists: %(username)s" -msgstr "" +msgstr "Listes : %(username)s" #: bookwyrm/templates/user/lists.html:17 bookwyrm/templates/user/lists.html:29 msgid "Create list" -msgstr "" +msgstr "Créer une liste" #: bookwyrm/templates/user/relationships/followers.html:12 #, python-format msgid "%(username)s has no followers" -msgstr "" +msgstr "%(username)s n’a pas d’abonné(e)" #: bookwyrm/templates/user/relationships/following.html:6 #: bookwyrm/templates/user/relationships/layout.html:15 msgid "Following" -msgstr "" +msgstr "Comptes suivis" #: bookwyrm/templates/user/relationships/following.html:12 #, python-format msgid "%(username)s isn't following any users" -msgstr "" +msgstr "%(username)s ne suit personne" #: bookwyrm/templates/user/shelf/books_header.html:5 #, python-format msgid "%(username)s's books" -msgstr "" +msgstr "Livres de %(username)s" #: bookwyrm/templates/user/shelf/create_shelf_form.html:5 #: bookwyrm/templates/user/shelf/create_shelf_form.html:22 msgid "Create Shelf" -msgstr "" +msgstr "Créer une étagère" #: bookwyrm/templates/user/shelf/edit_shelf_form.html:5 msgid "Edit Shelf" -msgstr "" +msgstr "Modifier l’étagère" #: bookwyrm/templates/user/shelf/edit_shelf_form.html:26 msgid "Update shelf" -msgstr "" +msgstr "Mettre l’étagère à jour" #: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56 msgid "All books" -msgstr "" +msgstr "Tous les livres" #: bookwyrm/templates/user/shelf/shelf.html:38 msgid "Create shelf" -msgstr "" +msgstr "Créer une étagère" #: bookwyrm/templates/user/shelf/shelf.html:62 msgid "Edit shelf" -msgstr "" +msgstr "Modifier l’étagère" #: bookwyrm/templates/user/shelf/shelf.html:81 #: bookwyrm/templates/user/shelf/shelf.html:105 msgid "Shelved" -msgstr "" +msgstr "Date d’ajout" #: bookwyrm/templates/user/shelf/shelf.html:82 #: bookwyrm/templates/user/shelf/shelf.html:109 msgid "Started" -msgstr "" +msgstr "Commencé" #: bookwyrm/templates/user/shelf/shelf.html:83 #: bookwyrm/templates/user/shelf/shelf.html:112 msgid "Finished" -msgstr "" +msgstr "Terminé" #: bookwyrm/templates/user/shelf/shelf.html:138 msgid "This shelf is empty." -msgstr "" +msgstr "Cette étagère est vide" #: bookwyrm/templates/user/shelf/shelf.html:144 msgid "Delete shelf" -msgstr "" +msgstr "Supprimer l’étagère" #: bookwyrm/templates/user/user.html:16 msgid "Edit profile" -msgstr "" +msgstr "Modifier le profil" #: bookwyrm/templates/user/user.html:33 #, python-format msgid "View all %(size)s" -msgstr "" +msgstr "Voir les %(size)s" #: bookwyrm/templates/user/user.html:46 msgid "View all books" -msgstr "" +msgstr "Voir tous les livres" #: bookwyrm/templates/user/user.html:59 msgid "User Activity" -msgstr "" +msgstr "Activité du compte" #: bookwyrm/templates/user/user.html:63 msgid "RSS feed" -msgstr "" +msgstr "Flux RSS" #: bookwyrm/templates/user/user.html:74 msgid "No activities yet!" -msgstr "" +msgstr "Aucune activité pour l’instant !" #: bookwyrm/templates/user/user_preview.html:15 #, python-format msgid "Joined %(date)s" -msgstr "" +msgstr "A rejoint ce serveur %(date)s" #: bookwyrm/templates/user/user_preview.html:19 #, python-format msgid "%(counter)s follower" msgid_plural "%(counter)s followers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(counter)s abonné(e)" +msgstr[1] "%(counter)s abonné(e)s" #: bookwyrm/templates/user/user_preview.html:20 #, python-format msgid "%(counter)s following" -msgstr "" +msgstr "%(counter)s abonnements" #: bookwyrm/templates/user/user_preview.html:26 #, python-format msgid "%(mutuals_display)s follower you follow" msgid_plural "%(mutuals_display)s followers you follow" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(mutuals_display)s abonné(e) que vous suivez" +msgstr[1] "%(mutuals_display)s abonné(e)s que vous suivez" #: bookwyrm/templates/user_admin/user.html:9 msgid "Back to users" -msgstr "" +msgstr "Retour aux comptes" #: bookwyrm/templates/user_admin/user_admin.html:7 #, python-format msgid "Users: %(server_name)s" -msgstr "" +msgstr "Comptes : %(server_name)s" #: bookwyrm/templates/user_admin/user_admin.html:22 #: bookwyrm/templates/user_admin/username_filter.html:5 msgid "Username" -msgstr "" +msgstr "Nom du compte" #: bookwyrm/templates/user_admin/user_admin.html:26 msgid "Date Added" -msgstr "" +msgstr "Date d’ajout" #: bookwyrm/templates/user_admin/user_admin.html:30 msgid "Last Active" -msgstr "" +msgstr "Dernière activité" #: bookwyrm/templates/user_admin/user_admin.html:38 msgid "Remote server" -msgstr "" +msgstr "Serveur distant" #: bookwyrm/templates/user_admin/user_admin.html:47 msgid "Active" -msgstr "" +msgstr "Actif" #: bookwyrm/templates/user_admin/user_admin.html:47 msgid "Inactive" -msgstr "" +msgstr "Inactif" #: bookwyrm/templates/user_admin/user_admin.html:52 #: bookwyrm/templates/user_admin/user_info.html:49 msgid "Not set" -msgstr "" +msgstr "Non défini" #: bookwyrm/templates/user_admin/user_info.html:5 msgid "User details" -msgstr "" +msgstr "Détails du compte" #: bookwyrm/templates/user_admin/user_info.html:14 msgid "View user profile" -msgstr "" +msgstr "Voir le profil" #: bookwyrm/templates/user_admin/user_info.html:20 msgid "Instance details" -msgstr "" +msgstr "Détails de l’instance" #: bookwyrm/templates/user_admin/user_info.html:46 msgid "View instance" -msgstr "" +msgstr "Voir l’instance" #: bookwyrm/templates/user_admin/user_moderation_actions.html:11 msgid "Suspend user" -msgstr "" +msgstr "Suspendre le compte" #: bookwyrm/templates/user_admin/user_moderation_actions.html:13 msgid "Un-suspend user" -msgstr "" +msgstr "Rétablir le compte" #: bookwyrm/templates/user_admin/user_moderation_actions.html:21 msgid "Access level:" -msgstr "" +msgstr "Niveau d’accès :" #: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22 msgid "File exceeds maximum size: 10MB" -msgstr "" +msgstr "Ce fichier dépasse la taille limite : 10 Mo" #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" -msgstr "" +msgstr "Fichier CSV non valide" #: bookwyrm/views/password.py:32 msgid "No user with that email address was found." -msgstr "" +msgstr "Aucun compte avec cette adresse email n’a été trouvé." #: bookwyrm/views/password.py:41 #, python-format msgid "A password reset link sent to %s" -msgstr "" +msgstr "Un lien de réinitialisation a été envoyé à %s." + +#~ msgid "Remove %(name)s" +#~ msgstr "Supprimer %(name)s" + +#, fuzzy +#~| msgid "BookWyrm users" +#~ msgid "BookWyrm\\" +#~ msgstr "Comptes BookWyrm" + +#, fuzzy +#~| msgid "Show more" +#~ msgid "Show" +#~ msgstr "Déplier" + +#, fuzzy +#~| msgid "All messages" +#~ msgid "Messages" +#~ msgstr "Tous les messages" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "Enter a valid URL." +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "Enter a valid integer." +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "Enter a valid email address." +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "Enter a valid IPv4 address." +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "Enter a valid IPv6 address." +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "Enter a valid IPv4 or IPv6 address." +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "Series number:" +#~ msgid "Enter a number." +#~ msgstr "Numéro dans la série :" + +#, fuzzy +#~| msgid "A user with this email already exists." +#~ msgid "%(model_name)s with this %(field_labels)s already exists." +#~ msgstr "Cet email est déjà associé à un compte." + +#, fuzzy +#~| msgid "%(value)s is not a valid remote_id" +#~ msgid "Value %(value)r is not a valid choice." +#~ msgstr "%(value)s n’est pas une remote_id valide." + +#, fuzzy +#~| msgid "This shelf is empty." +#~ msgid "This field cannot be null." +#~ msgstr "Cette étagère est vide" + +#, fuzzy +#~| msgid "A user with this email already exists." +#~ msgid "%(model_name)s with this %(field_label)s already exists." +#~ msgstr "Cet email est déjà associé à un compte." + +#, fuzzy +#~| msgid "No active invites" +#~ msgid "Comma-separated integers" +#~ msgstr "Aucune invitation active" + +#, fuzzy +#~| msgid "Series number:" +#~ msgid "Decimal number" +#~ msgstr "Numéro dans la série :" + +#, fuzzy +#~| msgid "List curation:" +#~ msgid "Duration" +#~ msgstr "Modération de la liste :" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "Email address" +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "No active invites" +#~ msgid "Big (8 byte) integer" +#~ msgstr "Aucune invitation active" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "IPv4 address" +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "IP address" +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "No active invites" +#~ msgid "Positive integer" +#~ msgstr "Aucune invitation active" + +#, fuzzy +#~| msgid "No active invites" +#~ msgid "Positive small integer" +#~ msgstr "Aucune invitation active" + +#, fuzzy +#~| msgid "%(value)s is not a valid username" +#~ msgid "“%(value)s” is not a valid UUID." +#~ msgstr "%(value)s n’est pas un nom de compte valide." + +#, fuzzy +#~| msgid "Images" +#~ msgid "Image" +#~ msgstr "Images" + +#, fuzzy +#~| msgid "Relationships" +#~ msgid "One-to-one relationship" +#~ msgstr "Relations" + +#, fuzzy +#~| msgid "Relationships" +#~ msgid "%(from)s-%(to)s relationship" +#~ msgstr "Relations" + +#, fuzzy +#~| msgid "Relationships" +#~ msgid "%(from)s-%(to)s relationships" +#~ msgstr "Relations" + +#, fuzzy +#~| msgid "Relationships" +#~ msgid "Many-to-many relationship" +#~ msgstr "Relations" + +#, fuzzy +#~| msgid "This shelf is empty." +#~ msgid "This field is required." +#~ msgstr "Cette étagère est vide" + +#, fuzzy +#~| msgid "Series number:" +#~ msgid "Enter a whole number." +#~ msgstr "Numéro dans la série :" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "Enter a valid date." +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "Enter a valid time." +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "Enter a valid date/time." +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "Enter a valid duration." +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "This shelf is empty." +#~ msgid "The submitted file is empty." +#~ msgstr "Cette étagère est vide" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "Enter a list of values." +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "Enter a valid UUID." +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "Order by" +#~ msgid "Order" +#~ msgstr "Trier par" + +#, fuzzy +#~| msgid "%(value)s is not a valid username" +#~ msgid "“%(pk)s” is not a valid value." +#~ msgstr "%(value)s n’est pas un nom de compte valide." + +#, fuzzy +#~| msgid "Started reading" +#~ msgid "Currently" +#~ msgstr "Commencer la lecture" + +#, fuzzy +#~| msgid "Change shelf" +#~ msgid "Change" +#~ msgstr "Changer d’étagère" + +#, fuzzy +#~| msgid "Status" +#~ msgid "Sat" +#~ msgstr "Statut" + +#, fuzzy +#~| msgid "Search" +#~ msgid "March" +#~ msgstr "Chercher" + +#, fuzzy +#~| msgid "Series number:" +#~ msgid "September" +#~ msgstr "Numéro dans la série :" + +#, fuzzy +#~| msgid "Series number:" +#~ msgid "December" +#~ msgstr "Numéro dans la série :" + +#, fuzzy +#~| msgid "Search" +#~ msgctxt "abbrev. month" +#~ msgid "March" +#~ msgstr "Chercher" + +#, fuzzy +#~| msgid "Search" +#~ msgctxt "alt. month" +#~ msgid "March" +#~ msgstr "Chercher" + +#, fuzzy +#~| msgid "Series number:" +#~ msgctxt "alt. month" +#~ msgid "September" +#~ msgstr "Numéro dans la série :" + +#, fuzzy +#~| msgid "Series number:" +#~ msgctxt "alt. month" +#~ msgid "December" +#~ msgstr "Numéro dans la série :" + +#, fuzzy +#~| msgid "Email address:" +#~ msgid "This is not a valid IPv6 address." +#~ msgstr "Adresse email :" + +#, fuzzy +#~| msgid "No books found matching the query \"%(query)s\"" +#~ msgid "No %(verbose_name)s found matching the query" +#~ msgstr "Aucun livre trouvé pour la requête « %(query)s »" + +#, fuzzy +#~| msgid "Community" +#~ msgid "Django Community" +#~ msgstr "Communauté" + +#~ msgid "Didn't find what you were looking for?" +#~ msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?" + +#~ msgid "Hide results from other catalogues" +#~ msgstr "Masquer les résultats d’autres catalogues" + +#~ msgid "Matching Users" +#~ msgstr "Comptes correspondants" + +#~ msgid "Set a reading goal for %(year)s" +#~ msgstr "Définir un défi lecture pour %(year)s" + +#~ msgid "by %(author)s" +#~ msgstr "par %(author)s" + +#~ msgid "Deactivate user" +#~ msgstr "Désactiver le compte" + +#~ msgid "Reactivate user" +#~ msgstr "Réactiver le compte" + +#~ msgid "" +#~ "replied to %(username)s's review" +#~ msgstr "" +#~ "a répondu à la critique de %(username)s" + +#~ msgid "" +#~ "replied to %(username)s's comment" +#~ msgstr "" +#~ "a répondu au commentaire de %(username)s" + +#~ msgid "" +#~ "replied to %(username)s's quote" +#~ msgstr "" +#~ "a répondu à la citation de %(username)s" + +#~ msgid "Remove tag" +#~ msgstr "Supprimer le tag" + +#~ msgid "Add tag" +#~ msgstr "Ajouter un tag" + +#~ msgid "Books tagged \"%(tag.name)s\"" +#~ msgstr "Livres tagués « %(tag.name)s »" + +#, fuzzy +#~| msgid "Started" +#~ msgid "Getting Started" +#~ msgstr "Commencé" + +#, fuzzy +#~| msgid "No users found for \"%(query)s\"" +#~ msgid "No users were found for \"%(query)s\"" +#~ msgstr "Aucun compte trouvé pour « %(query)s »" + +#~ msgid "Tags" +#~ msgstr "Tags" + +#~ msgid "Your lists" +#~ msgstr "Vos listes" + +#, fuzzy +#~| msgid "See all %(size)s" +#~ msgid "See all %(size)s lists" +#~ msgstr "Voir les %(size)s" + +#~ msgid "Recent Lists" +#~ msgstr "Listes récentes" + +#~ msgid "Published" +#~ msgstr "Publié" + +#~ msgid "External links" +#~ msgstr "Liens externes" + +#~ msgid "OpenLibrary" +#~ msgstr "OpenLibrary" + +#~ msgid "Change shelf" +#~ msgstr "Changer d’étagère" + +#~ msgid "Unshelve" +#~ msgstr "Enlever de l’étagère" + +#~ msgid "Your Shelves" +#~ msgstr "Vos étagères" + +#~ msgid "%(username)s: Shelves" +#~ msgstr "%(username)s : Étagères" + +#~ msgid "Shelves" +#~ msgstr "Étagères" + +#~ msgid "See all %(shelf_count)s shelves" +#~ msgstr "Voir les %(shelf_count)s étagères" + +#~ msgid "Send follow request" +#~ msgstr "Envoyer une demande d’abonnement" + +#~ msgid "Site Configuration" +#~ msgstr "Configuration du site" + +#~ msgid "Follow request already sent." +#~ msgstr "Demande d’abonnement déjà envoyée" + +#~ msgid "Created and curated by" +#~ msgstr "Créée et modérée par" + +#~ msgid "Created by" +#~ msgstr "Créée par" + +#~ msgid "Create New Shelf" +#~ msgstr "Créer une nouvelle étagère" + +#, fuzzy +#~| msgid "Create list" +#~ msgid "Create new list" +#~ msgstr "Créer une nouvelle liste" + +#~ msgid "Added by" +#~ msgstr "Ajouté par" + +#~ msgid "suggested adding" +#~ msgstr "a suggéré l’ajout de" + +#~ msgid "Change password" +#~ msgstr "Changer le mot de passe" + +#~ msgid "%(year)s reading goal" +#~ msgstr "Défi lecture pour %(year)s" From 37f92140ad8c5991491559051a32d333b8476fef Mon Sep 17 00:00:00 2001 From: Joachim Date: Mon, 7 Jun 2021 16:10:00 +0200 Subject: [PATCH 057/130] Update django.po --- locale/fr_FR/LC_MESSAGES/django.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 804728e3d..cef6a7bcc 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-06 20:52+0000\n" +"POT-Creation-Date: 2021-06-07 14:09+0000\n" "PO-Revision-Date: 2021-04-05 12:44+0100\n" "Last-Translator: Fabien Basmaison \n" "Language-Team: Mouse Reeve \n" @@ -2917,7 +2917,7 @@ msgstr "Rétablir le compte" msgid "Access level:" msgstr "Niveau d’accès :" -#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:3 +#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22 msgid "File exceeds maximum size: 10MB" msgstr "Ce fichier dépasse la taille limite : 10 Mo" From ac90cf7420f1418129da76dd5b31429828569981 Mon Sep 17 00:00:00 2001 From: Joachim Date: Mon, 7 Jun 2021 16:16:07 +0200 Subject: [PATCH 058/130] Apply suggestions from feedback --- locale/fr_FR/LC_MESSAGES/django.mo | Bin 45541 -> 45874 bytes locale/fr_FR/LC_MESSAGES/django.po | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index 67be885b694e3f176b18948d4185f089a082e43d..fa138f7853a2b9fa56548ad14535f214aeb7ec5c 100644 GIT binary patch delta 14265 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 E0Ij=ijsO4v delta 13911 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 Date: Tue, 8 Jun 2021 11:10:39 -0700 Subject: [PATCH 059/130] Convert start and finish reading into view classes --- bookwyrm/views/__init__.py | 2 +- bookwyrm/views/reading.py | 155 ++++++++++++++++++++----------------- bookwyrm/views/shelf.py | 2 +- 3 files changed, 84 insertions(+), 75 deletions(-) diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 8bfaa7dac..9ed4e4bdc 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -25,7 +25,7 @@ from .list import Lists, List, Curate, UserLists from .notifications import Notifications from .outbox import Outbox from .reading import edit_readthrough, create_readthrough, delete_readthrough -from .reading import start_reading, finish_reading, delete_progressupdate +from .reading import StartReading, FinishReading, delete_progressupdate from .reports import Report, Reports, make_report, resolve_report, suspend_user from .rss_feed import RssFeed from .password import PasswordResetRequest, PasswordReset, ChangePassword diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py index 65ca717d4..067336cd7 100644 --- a/bookwyrm/views/reading.py +++ b/bookwyrm/views/reading.py @@ -7,6 +7,8 @@ from dateutil.parser import ParserError from django.contrib.auth.decorators import login_required from django.http import HttpResponseBadRequest, HttpResponseNotFound from django.shortcuts import get_object_or_404, redirect +from django.utils.decorators import method_decorator +from django.views import View from django.views.decorators.http import require_POST from bookwyrm import models @@ -14,88 +16,95 @@ from .helpers import get_edition, handle_reading_status from .shelf import handle_unshelve -# pylint: disable= no-self-use -@login_required -@require_POST -def start_reading(request, book_id): - """begin reading a book""" - book = get_edition(book_id) - reading_shelf = models.Shelf.objects.filter( - identifier=models.Shelf.READING, user=request.user - ).first() +@method_decorator(login_required, name="dispatch") +# pylint: disable=no-self-use +class StartReading(View): + """begin a book""" - # create a readthrough - readthrough = update_readthrough(request, book=book) - if readthrough: - readthrough.save() + def post(self, request, book_id): + """begin reading a book""" + book = get_edition(book_id) + reading_shelf = models.Shelf.objects.filter( + identifier=models.Shelf.READING, user=request.user + ).first() - # create a progress update if we have a page - readthrough.create_update() + # create a readthrough + readthrough = update_readthrough(request, book=book) + if readthrough: + readthrough.save() - current_status_shelfbook = ( - models.ShelfBook.objects.select_related("shelf") - .filter( - shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS, - user=request.user, - book=book, + # create a progress update if we have a page + readthrough.create_update() + + current_status_shelfbook = ( + models.ShelfBook.objects.select_related("shelf") + .filter( + shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS, + user=request.user, + book=book, + ) + .first() ) - .first() - ) - if current_status_shelfbook is not None: - if current_status_shelfbook.shelf.identifier != models.Shelf.READING: - handle_unshelve(book, current_status_shelfbook.shelf) - else: # It already was on the shelf - return redirect(request.headers.get("Referer", "/")) + if current_status_shelfbook is not None: + if current_status_shelfbook.shelf.identifier != models.Shelf.READING: + handle_unshelve(book, current_status_shelfbook.shelf) + else: # It already was on the shelf + return redirect(request.headers.get("Referer", "/")) - models.ShelfBook.objects.create(book=book, shelf=reading_shelf, user=request.user) - - # post about it (if you want) - if request.POST.get("post-status"): - privacy = request.POST.get("privacy") - handle_reading_status(request.user, reading_shelf, book, privacy) - - return redirect(request.headers.get("Referer", "/")) - - -@login_required -@require_POST -def finish_reading(request, book_id): - """a user completed a book, yay""" - book = get_edition(book_id) - finished_read_shelf = models.Shelf.objects.filter( - identifier=models.Shelf.READ_FINISHED, user=request.user - ).first() - - # update or create a readthrough - readthrough = update_readthrough(request, book=book) - if readthrough: - readthrough.save() - - current_status_shelfbook = ( - models.ShelfBook.objects.select_related("shelf") - .filter( - shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS, - user=request.user, - book=book, + models.ShelfBook.objects.create( + book=book, shelf=reading_shelf, user=request.user ) - .first() - ) - if current_status_shelfbook is not None: - if current_status_shelfbook.shelf.identifier != models.Shelf.READ_FINISHED: - handle_unshelve(book, current_status_shelfbook.shelf) - else: # It already was on the shelf - return redirect(request.headers.get("Referer", "/")) - models.ShelfBook.objects.create( - book=book, shelf=finished_read_shelf, user=request.user - ) + # post about it (if you want) + if request.POST.get("post-status"): + privacy = request.POST.get("privacy") + handle_reading_status(request.user, reading_shelf, book, privacy) - # post about it (if you want) - if request.POST.get("post-status"): - privacy = request.POST.get("privacy") - handle_reading_status(request.user, finished_read_shelf, book, privacy) + return redirect(request.headers.get("Referer", "/")) - return redirect(request.headers.get("Referer", "/")) + +@method_decorator(login_required, name="dispatch") +# pylint: disable=no-self-use +class FinishReading(View): + """finish a book""" + + def post(self, request, book_id): + """a user completed a book, yay""" + book = get_edition(book_id) + finished_read_shelf = models.Shelf.objects.filter( + identifier=models.Shelf.READ_FINISHED, user=request.user + ).first() + + # update or create a readthrough + readthrough = update_readthrough(request, book=book) + if readthrough: + readthrough.save() + + current_status_shelfbook = ( + models.ShelfBook.objects.select_related("shelf") + .filter( + shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS, + user=request.user, + book=book, + ) + .first() + ) + if current_status_shelfbook is not None: + if current_status_shelfbook.shelf.identifier != models.Shelf.READ_FINISHED: + handle_unshelve(book, current_status_shelfbook.shelf) + else: # It already was on the shelf + return redirect(request.headers.get("Referer", "/")) + + models.ShelfBook.objects.create( + book=book, shelf=finished_read_shelf, user=request.user + ) + + # post about it (if you want) + if request.POST.get("post-status"): + privacy = request.POST.get("privacy") + handle_reading_status(request.user, finished_read_shelf, book, privacy) + + return redirect(request.headers.get("Referer", "/")) @login_required diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py index 538a8e343..4c6f94a2a 100644 --- a/bookwyrm/views/shelf.py +++ b/bookwyrm/views/shelf.py @@ -20,7 +20,7 @@ from .helpers import is_api_request, get_edition, get_user_from_username from .helpers import handle_reading_status, privacy_filter -# pylint: disable= no-self-use +# pylint: disable=no-self-use class Shelf(View): """shelf page""" From 1231d40e80f6351885615d8a8d28b590fa4ab1f1 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 8 Jun 2021 11:23:53 -0700 Subject: [PATCH 060/130] Want to read view --- bookwyrm/templates/components/modal.html | 2 +- .../templates/reading_progress/start.html | 14 +++++ .../shelve_button/finish_reading_modal.html | 2 +- .../shelve_button/start_reading_modal.html | 6 ++- .../shelve_button/want_to_read_modal.html | 2 +- bookwyrm/urls.py | 8 +-- bookwyrm/views/__init__.py | 2 +- bookwyrm/views/reading.py | 51 ++++++++++++++++--- bookwyrm/views/shelf.py | 5 -- 9 files changed, 72 insertions(+), 20 deletions(-) create mode 100644 bookwyrm/templates/reading_progress/start.html diff --git a/bookwyrm/templates/components/modal.html b/bookwyrm/templates/components/modal.html index 74dcadacd..b29ff8d91 100644 --- a/bookwyrm/templates/components/modal.html +++ b/bookwyrm/templates/components/modal.html @@ -1,7 +1,7 @@ {% load i18n %}
+{% endblock %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index a027ed5fb..bfdcd9fc0 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -253,7 +253,7 @@ urlpatterns = [ views.ChangePassword.as_view(), name="prefs-password", ), - re_path(r"^preferences/delete/?$", views.DeleteAccount.as_view(), name="prefs-delete"), + re_path(r"^preferences/delete/?$", views.DeleteUser.as_view(), name="prefs-delete"), re_path(r"^preferences/block/?$", views.Block.as_view(), name="prefs-block"), re_path(r"^block/(?P\d+)/?$", views.Block.as_view()), re_path(r"^unblock/(?P\d+)/?$", views.unblock), diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 7beff8317..41bb64e54 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -6,7 +6,7 @@ from .block import Block, unblock from .books import Book, EditBook, ConfirmEditBook, Editions from .books import upload_cover, add_description, switch_edition, resolve_book from .directory import Directory -from .edit_user import EditUser +from .edit_user import EditUser, DeleteUser from .federation import Federation, FederatedServer from .federation import AddFederatedServer, ImportServerBlocklist from .federation import block_server, unblock_server diff --git a/bookwyrm/views/edit_user.py b/bookwyrm/views/edit_user.py index 43b7018cd..e00f62fdb 100644 --- a/bookwyrm/views/edit_user.py +++ b/bookwyrm/views/edit_user.py @@ -3,6 +3,7 @@ from io import BytesIO from uuid import uuid4 from PIL import Image +from django.contrib.auth import logout from django.contrib.auth.decorators import login_required from django.core.files.base import ContentFile from django.shortcuts import redirect @@ -10,7 +11,7 @@ from django.template.response import TemplateResponse from django.utils.decorators import method_decorator from django.views import View -from bookwyrm import forms +from bookwyrm import forms, models # pylint: disable=no-self-use @@ -38,6 +39,36 @@ class EditUser(View): return redirect(user.local_path) +# pylint: disable=no-self-use +@method_decorator(login_required, name="dispatch") +class DeleteUser(View): + """delete user view""" + + def get(self, request): + """delete page for a user""" + data = { + "form": forms.DeleteUserForm(), + "user": request.user, + } + return TemplateResponse(request, "preferences/delete_user.html", data) + + def post(self, request): + """les get fancy with images""" + form = forms.DeleteUserForm(request.POST, instance=request.user) + form.is_valid() + # idk why but I couldn't get check_password to work on request.user + user = models.User.objects.get(id=request.user.id) + if form.is_valid() and user.check_password(form.cleaned_data["password"]): + request.user.delete() + logout(request) + return redirect("/") + + form.errors["password"] = ["Invalid password"] + data = {"form": form, "user": request.user} + return TemplateResponse(request, "preferences/delete_user.html", data) + + + def save_user_form(form): """special handling for the user form""" user = form.save(commit=False) From 557aa2005b1e5249a3f862e7311ebbf146464828 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 11:15:00 -0700 Subject: [PATCH 083/130] Adds test for delete view --- bookwyrm/tests/views/test_edit_user.py | 39 ++++++++++++++++++++++++++ bookwyrm/views/edit_user.py | 1 - 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py index 64aa139d6..0ea66eb7d 100644 --- a/bookwyrm/tests/views/test_edit_user.py +++ b/bookwyrm/tests/views/test_edit_user.py @@ -1,9 +1,11 @@ """ test for app action functionality """ +import json import pathlib from unittest.mock import patch from PIL import Image from django.contrib.auth.models import AnonymousUser +from django.contrib.sessions.middleware import SessionMiddleware from django.core.files.base import ContentFile from django.core.files.uploadedfile import SimpleUploadedFile from django.template.response import TemplateResponse @@ -108,3 +110,40 @@ class EditUserViews(TestCase): self.assertIsInstance(result, ContentFile) image_result = Image.open(result) self.assertEqual(image_result.size, (120, 120)) + + def test_delete_user_page(self): + """there are so many views, this just makes sure it LOADS""" + view = views.DeleteUser.as_view() + request = self.factory.get("") + request.user = self.local_user + result = view(request) + self.assertIsInstance(result, TemplateResponse) + result.render() + self.assertEqual(result.status_code, 200) + + def test_delete_user(self): + """use a form to update a user""" + view = views.DeleteUser.as_view() + form = forms.DeleteUserForm() + form.data["password"] = "password" + request = self.factory.post("", form.data) + request.user = self.local_user + middleware = SessionMiddleware() + middleware.process_request(request) + request.session.save() + + + self.assertIsNone(self.local_user.name) + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + view(request) + self.assertEqual(delay_mock.call_count, 1) + activity = json.loads(delay_mock.call_args[0][1]) + self.assertEqual(activity["type"], "Delete") + self.assertEqual(activity["actor"], self.local_user.remote_id) + self.assertEqual( + activity["cc"][0], "https://www.w3.org/ns/activitystreams#Public" + ) + + self.assertFalse(self.local_user.is_active) diff --git a/bookwyrm/views/edit_user.py b/bookwyrm/views/edit_user.py index e00f62fdb..3b255c686 100644 --- a/bookwyrm/views/edit_user.py +++ b/bookwyrm/views/edit_user.py @@ -68,7 +68,6 @@ class DeleteUser(View): return TemplateResponse(request, "preferences/delete_user.html", data) - def save_user_form(form): """special handling for the user form""" user = form.save(commit=False) From 607bfa9160e05ce638e0be05eb9b6788b3aa231b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 11:16:41 -0700 Subject: [PATCH 084/130] Python formatting --- bookwyrm/tests/views/test_edit_user.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py index 0ea66eb7d..4796610f5 100644 --- a/bookwyrm/tests/views/test_edit_user.py +++ b/bookwyrm/tests/views/test_edit_user.py @@ -132,7 +132,6 @@ class EditUserViews(TestCase): middleware.process_request(request) request.session.save() - self.assertIsNone(self.local_user.name) with patch( "bookwyrm.models.activitypub_mixin.broadcast_task.delay" From e98138e84fdc1572566b07e76587dda26b14442b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 11:35:06 -0700 Subject: [PATCH 085/130] Show users as deleted in admin view --- .../templates/user_admin/user_moderation_actions.html | 9 +++++++++ bookwyrm/tests/views/test_edit_user.py | 4 +++- bookwyrm/views/edit_user.py | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/user_admin/user_moderation_actions.html b/bookwyrm/templates/user_admin/user_moderation_actions.html index 816e787a2..e4460a687 100644 --- a/bookwyrm/templates/user_admin/user_moderation_actions.html +++ b/bookwyrm/templates/user_admin/user_moderation_actions.html @@ -1,6 +1,12 @@ {% load i18n %}
+ {% if not user.is_active and user.deactivation_reason == "self_deletion" %} +
+ {% trans "Permanently deleted" %} +
+ {% else %}

{% trans "Actions" %}

+

{% trans "Send direct message" %} @@ -14,6 +20,7 @@ {% endif %}

+ {% if user.local %}
@@ -39,4 +46,6 @@
{% endif %} + + {% endif %}
diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py index 4796610f5..e3b9d4635 100644 --- a/bookwyrm/tests/views/test_edit_user.py +++ b/bookwyrm/tests/views/test_edit_user.py @@ -106,7 +106,7 @@ class EditUserViews(TestCase): ) image = Image.open(image_file) - result = views.user.crop_avatar(image) + result = views.edit_user.crop_avatar(image) self.assertIsInstance(result, ContentFile) image_result = Image.open(result) self.assertEqual(image_result.size, (120, 120)) @@ -145,4 +145,6 @@ class EditUserViews(TestCase): activity["cc"][0], "https://www.w3.org/ns/activitystreams#Public" ) + self.local_user.refresh_from_db() self.assertFalse(self.local_user.is_active) + self.assertEqual(self.local_user.deactivation_reason, "self_deletion") diff --git a/bookwyrm/views/edit_user.py b/bookwyrm/views/edit_user.py index 3b255c686..c74b00c9d 100644 --- a/bookwyrm/views/edit_user.py +++ b/bookwyrm/views/edit_user.py @@ -59,7 +59,8 @@ class DeleteUser(View): # idk why but I couldn't get check_password to work on request.user user = models.User.objects.get(id=request.user.id) if form.is_valid() and user.check_password(form.cleaned_data["password"]): - request.user.delete() + user.deactivation_reason = "self_deletion" + user.delete() logout(request) return redirect("/") From 9a67c61487a2294db2d22d1f8a910fd5a4426e12 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 11:59:44 -0700 Subject: [PATCH 086/130] Clarifies wording on pending imports Fixes #1118 --- bookwyrm/templates/import_status.html | 5 +++++ bookwyrm/views/import_data.py | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html index ff80ad71c..11ff47f19 100644 --- a/bookwyrm/templates/import_status.html +++ b/bookwyrm/templates/import_status.html @@ -7,6 +7,7 @@ {% block content %}{% spaceless %}

{% trans "Import Status" %}

+ {% trans "Back to imports" %}
@@ -106,7 +107,11 @@ {% endif %}
+ {% if job.complete %}

{% trans "Successfully imported" %}

+ {% else %} +

{% trans "Import Progress" %}

+ {% endif %}
diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py index 62dcce73b..b2b88a2eb 100644 --- a/bookwyrm/views/import_data.py +++ b/bookwyrm/views/import_data.py @@ -78,13 +78,15 @@ class ImportStatus(View): def get(self, request, job_id): """status of an import job""" - job = models.ImportJob.objects.get(id=job_id) + job = get_object_or_404(models.ImportJob, id=job_id) if job.user != request.user: raise PermissionDenied + try: task = app.AsyncResult(job.task_id) except ValueError: task = None + items = job.items.order_by("index").all() failed_items = [i for i in items if i.fail_reason] items = [i for i in items if not i.fail_reason] From 46be7292fde320df25ab65b5aa5a929bacce3a4f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 12:30:43 -0700 Subject: [PATCH 087/130] Don't try title/author search when isbn search fails --- bookwyrm/models/import_job.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py index c8130af26..f29938469 100644 --- a/bookwyrm/models/import_job.py +++ b/bookwyrm/models/import_job.py @@ -75,7 +75,12 @@ class ImportItem(models.Model): def resolve(self): """try various ways to lookup a book""" - self.book = self.get_book_from_isbn() or self.get_book_from_title_author() + if self.isbn: + self.book = self.get_book_from_isbn() + else: + # don't fall back on title/author search is isbn is present. + # you're too likely to mismatch + self.get_book_from_title_author() def get_book_from_isbn(self): """search by isbn""" From 6e6354bcce08602c64c0e21ef23d2fdb62c331b2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 12:34:11 -0700 Subject: [PATCH 088/130] Fixes trailing space in series text Fixes #1145 --- bookwyrm/templates/book/book.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index af2230200..a48120e94 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -20,8 +20,7 @@ - ({{ book.series }} - {% if book.series_number %} #{{ book.series_number }}{% endif %}) + ({{ book.series }}{% if book.series_number %} #{{ book.series_number }}{% endif %})
{% endif %} From 52adfbf5da882461cb84f81bcbb944cf24b2091e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 14:47:59 -0700 Subject: [PATCH 089/130] Don't show duplicated statuses after boosts --- bookwyrm/activitystreams.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index ff3c55fbd..a49a7ce4d 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -201,6 +201,19 @@ def add_status_on_create(sender, instance, created, *args, **kwargs): for stream in streams.values(): stream.add_status(instance) + if sender != models.Boost: + return + # remove the original post and other, earlier boosts + boosted = instance.boost.boosted_status + old_versions = models.Boost.objects.filter( + boosted_status__id=boosted.id, + created_date__lt=instance.created_date, + ) + for stream in streams.values(): + stream.remove_object_from_related_stores(boosted) + for status in old_versions: + stream.remove_object_from_related_stores(status) + @receiver(signals.post_delete, sender=models.Boost) # pylint: disable=unused-argument @@ -208,7 +221,10 @@ def remove_boost_on_delete(sender, instance, *args, **kwargs): """boosts are deleted""" # we're only interested in new statuses for stream in streams.values(): + # remove the boost stream.remove_object_from_related_stores(instance) + # re-add the original status + stream.add_status(instance.boosted_status) @receiver(signals.post_save, sender=models.UserFollows) From 290a99bf176a441261ba0d755c1e2d014c7db240 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 15:19:54 -0700 Subject: [PATCH 090/130] Fixes renaming images on save --- bookwyrm/models/fields.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index caa22fcd3..70ba4a5b1 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -1,5 +1,6 @@ """ activitypub-aware django model fields """ from dataclasses import MISSING +import imghdr import re from uuid import uuid4 @@ -9,7 +10,7 @@ from django.contrib.postgres.fields import ArrayField as DjangoArrayField from django.core.exceptions import ValidationError from django.core.files.base import ContentFile from django.db import models -from django.forms import ClearableFileInput, ImageField +from django.forms import ClearableFileInput, ImageField as DjangoImageField from django.utils import timezone from django.utils.translation import gettext_lazy as _ from bookwyrm import activitypub @@ -334,10 +335,12 @@ class TagField(ManyToManyField): class ClearableFileInputWithWarning(ClearableFileInput): + """max file size warning""" template_name = "widgets/clearable_file_input_with_warning.html" -class CustomImageField(ImageField): +class CustomImageField(DjangoImageField): + """overwrites image field for form""" widget = ClearableFileInputWithWarning @@ -400,11 +403,12 @@ class ImageField(ActivitypubFieldMixin, models.ImageField): if not response: return None - image_name = str(uuid4()) + "." + url.split(".")[-1] image_content = ContentFile(response.content) + image_name = str(uuid4()) + "." + imghdr.what(None, image_content.read()) return [image_name, image_content] def formfield(self, **kwargs): + """ special case for forms """ return super().formfield( **{ "form_class": CustomImageField, From 2a606eec3e6307be33a5af0ed91c210838c830b8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 15:27:37 -0700 Subject: [PATCH 091/130] scroll horizontally on user page shelf preview --- bookwyrm/templates/user/user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html index d2e9be3e2..c86eb631f 100644 --- a/bookwyrm/templates/user/user.html +++ b/bookwyrm/templates/user/user.html @@ -26,7 +26,7 @@

{% include 'user/shelf/books_header.html' %}

-
+
{% for shelf in shelves %}

{{ shelf.name }} From cd014e43ad7cb4b223fac7e00f52c13fd97b71d4 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 15:29:07 -0700 Subject: [PATCH 092/130] Python formatting --- bookwyrm/models/fields.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index 70ba4a5b1..379323b90 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -336,11 +336,13 @@ class TagField(ManyToManyField): class ClearableFileInputWithWarning(ClearableFileInput): """max file size warning""" + template_name = "widgets/clearable_file_input_with_warning.html" class CustomImageField(DjangoImageField): """overwrites image field for form""" + widget = ClearableFileInputWithWarning @@ -408,7 +410,7 @@ class ImageField(ActivitypubFieldMixin, models.ImageField): return [image_name, image_content] def formfield(self, **kwargs): - """ special case for forms """ + """special case for forms""" return super().formfield( **{ "form_class": CustomImageField, From 5a236e333f6b13e058b61d31690d2f7b5db70af6 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 15:33:03 -0700 Subject: [PATCH 093/130] Fixes directory profile link --- bookwyrm/templates/directory/directory.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/directory/directory.html b/bookwyrm/templates/directory/directory.html index 88a7b15c3..b900cb188 100644 --- a/bookwyrm/templates/directory/directory.html +++ b/bookwyrm/templates/directory/directory.html @@ -20,8 +20,8 @@ {% csrf_token %}

- {% url 'settings-profile' as path %} - {% blocktrans %}You can opt-out at any time in your profile settings.{% endblocktrans %} + {% url 'prefs-profile' as path %} + {% blocktrans with path=path %}You can opt-out at any time in your profile settings.{% endblocktrans %}

From f307edf73236b82bb4b6fe09fa94cbb456b06472 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 15:39:54 -0700 Subject: [PATCH 094/130] Use elided page range for invites --- bookwyrm/views/invite.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py index 92f930f45..3b9fd17c5 100644 --- a/bookwyrm/views/invite.py +++ b/bookwyrm/views/invite.py @@ -37,8 +37,12 @@ class ManageInvites(View): PAGE_LENGTH, ) + page = paginated.get_page(request.GET.get("page")) data = { - "invites": paginated.get_page(request.GET.get("page")), + "invites": page, + "page_range": paginated.get_elided_page_range( + page.number, on_each_side=2, on_ends=1 + ), "form": forms.CreateInviteForm(), } return TemplateResponse(request, "settings/manage_invites.html", data) @@ -118,15 +122,16 @@ class ManageInviteRequests(View): reduce(operator.or_, (Q(**f) for f in filters)) ).distinct() - paginated = Paginator( - requests, - PAGE_LENGTH, - ) + paginated = Paginator(requests, PAGE_LENGTH) + page = paginated.get_page(request.GET.get("page")) data = { "ignored": ignored, "count": paginated.count, - "requests": paginated.get_page(request.GET.get("page")), + "requests": page, + "page_range": paginated.get_elided_page_range( + page.number, on_each_side=2, on_ends=1 + ), "sort": sort, } return TemplateResponse(request, "settings/manage_invite_requests.html", data) From fe2309f0bc64c446c972bac4490e59b3a51d15ae Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 15:45:39 -0700 Subject: [PATCH 095/130] Fixes orientation of edition want to read menu --- bookwyrm/templates/book/editions.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html index 0d5c10447..e2a0bdda5 100644 --- a/bookwyrm/templates/book/editions.html +++ b/bookwyrm/templates/book/editions.html @@ -40,7 +40,7 @@
- {% include 'snippets/shelve_button/shelve_button.html' with book=book switch_mode=True %} + {% include 'snippets/shelve_button/shelve_button.html' with book=book switch_mode=True right=True %}
{% endfor %} From a82bf99bd602e3aa7679ad3ce66279112e3621a4 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 15:55:26 -0700 Subject: [PATCH 096/130] Icon-only link display on mobile for text links --- bookwyrm/templates/author/author.html | 2 +- bookwyrm/templates/book/book.html | 2 +- bookwyrm/templates/settings/federation.html | 2 +- bookwyrm/templates/user/user.html | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index f4f308f2d..0bc427758 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -15,7 +15,7 @@
- {% trans "Edit Author" %} + {% trans "Edit Author" %}
{% endif %} diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index a48120e94..ea5ec09a7 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -36,7 +36,7 @@
- {% trans "Edit Book" %} + {% trans "Edit Book" %}
{% endif %} diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html index 208ecf8d2..e0a9ba73a 100644 --- a/bookwyrm/templates/settings/federation.html +++ b/bookwyrm/templates/settings/federation.html @@ -7,7 +7,7 @@ {% block edit-button %} - {% trans "Add instance" %} + {% trans "Add instance" %} {% endblock %} diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html index c86eb631f..2c9d7277a 100644 --- a/bookwyrm/templates/user/user.html +++ b/bookwyrm/templates/user/user.html @@ -13,7 +13,7 @@
- {% trans "Edit profile" %} + {% trans "Edit profile" %}
{% endif %} @@ -60,7 +60,7 @@
- {% trans "RSS feed" %} + {% trans "RSS feed" %}
From 3600f6ca3c8363cb7c64bcf669fbba00dc95e23f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 16:00:17 -0700 Subject: [PATCH 097/130] Handle overflow text in notifications --- bookwyrm/templates/notifications.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html index a51b2fdb0..ae5cd67b1 100644 --- a/bookwyrm/templates/notifications.html +++ b/bookwyrm/templates/notifications.html @@ -56,7 +56,7 @@ {% endif %} -
+

{# DESCRIPTION #} @@ -137,7 +137,7 @@ {# PREVIEW #}

-
+
{% include 'snippets/status_preview.html' with status=related_status %}
From c4f7f34ad40a93950c2a3889528c136b1669b46e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 16:04:58 -0700 Subject: [PATCH 098/130] Fixes edit readthrough toggle display --- bookwyrm/templates/book/book.html | 2 +- bookwyrm/templates/{snippets => book}/readthrough.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename bookwyrm/templates/{snippets => book}/readthrough.html (97%) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index ea5ec09a7..dd5a4ff36 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -180,7 +180,7 @@

{% trans "You don't have any reading activity for this book." %}

{% endif %} {% for readthrough in readthroughs %} - {% include 'snippets/readthrough.html' with readthrough=readthrough %} + {% include 'book/readthrough.html' with readthrough=readthrough %} {% endfor %} diff --git a/bookwyrm/templates/snippets/readthrough.html b/bookwyrm/templates/book/readthrough.html similarity index 97% rename from bookwyrm/templates/snippets/readthrough.html rename to bookwyrm/templates/book/readthrough.html index d5e79b864..751407461 100644 --- a/bookwyrm/templates/snippets/readthrough.html +++ b/bookwyrm/templates/book/readthrough.html @@ -1,8 +1,8 @@ {% load i18n %} {% load humanize %} {% load tz %} -
-
+
+
{% trans "Progress Updates:" %} From ef71da7ef0c84da32a80d09d0d92948d679dc76d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 16:23:17 -0700 Subject: [PATCH 099/130] Fixes interaction tests --- bookwyrm/tests/views/test_interaction.py | 17 +++++++++++++---- bw-dev | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py index 876d6053c..ab1d6066e 100644 --- a/bookwyrm/tests/views/test_interaction.py +++ b/bookwyrm/tests/views/test_interaction.py @@ -83,7 +83,10 @@ class InteractionViews(TestCase): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): status = models.Status.objects.create(user=self.local_user, content="hi") - view(request, status.id) + with patch( + "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" + ): + view(request, status.id) boost = models.Boost.objects.get() @@ -157,8 +160,11 @@ class InteractionViews(TestCase): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): status = models.Status.objects.create(user=self.local_user, content="hi") - view(request, status.id) - view(request, status.id) + with patch( + "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" + ): + view(request, status.id) + view(request, status.id) self.assertEqual(models.Boost.objects.count(), 1) def test_unboost(self, _): @@ -168,7 +174,10 @@ class InteractionViews(TestCase): request.user = self.remote_user with patch("bookwyrm.activitystreams.ActivityStream.add_status"): status = models.Status.objects.create(user=self.local_user, content="hi") - views.Boost.as_view()(request, status.id) + with patch( + "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" + ): + views.Boost.as_view()(request, status.id) self.assertEqual(models.Boost.objects.count(), 1) self.assertEqual(models.Notification.objects.count(), 1) diff --git a/bw-dev b/bw-dev index fb2af0e76..763a2b54e 100755 --- a/bw-dev +++ b/bw-dev @@ -84,7 +84,7 @@ case "$CMD" in runweb coverage run --source='.' --omit="*/test*,celerywyrm*,bookwyrm/migrations/*" manage.py test "$@" ;; pytest) - runweb pytest --no-cov-on-fail "$@" + execweb pytest --no-cov-on-fail "$@" ;; collectstatic) runweb python manage.py collectstatic --no-input From c3a09a63317094eba1f20163d9f93ca8b31e4ed4 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 16:39:54 -0700 Subject: [PATCH 100/130] More test fixes --- bookwyrm/tests/models/test_status_model.py | 1 + bookwyrm/tests/test_templatetags.py | 29 ++++++++++--------- .../tests/views/inbox/test_inbox_announce.py | 23 +++++++-------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index 4c8930bc4..0c0436df2 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -16,6 +16,7 @@ from bookwyrm import activitypub, models, settings # pylint: disable=too-many-public-methods @patch("bookwyrm.models.Status.broadcast") @patch("bookwyrm.activitystreams.ActivityStream.add_status") +@patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores") class Status(TestCase): """lotta types of statuses""" diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py index 4b1aa5946..eccfb2987 100644 --- a/bookwyrm/tests/test_templatetags.py +++ b/bookwyrm/tests/test_templatetags.py @@ -16,6 +16,7 @@ from bookwyrm.templatetags import ( @patch("bookwyrm.activitystreams.ActivityStream.add_status") +@patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores") class TemplateTags(TestCase): """lotta different things here""" @@ -38,28 +39,28 @@ class TemplateTags(TestCase): ) self.book = models.Edition.objects.create(title="Test Book") - def test_get_user_rating(self, _): + def test_get_user_rating(self, *_): """get a user's most recent rating of a book""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): models.Review.objects.create(user=self.user, book=self.book, rating=3) self.assertEqual(bookwyrm_tags.get_user_rating(self.book, self.user), 3) - def test_get_user_rating_doesnt_exist(self, _): + def test_get_user_rating_doesnt_exist(self, *_): """there is no rating available""" self.assertEqual(bookwyrm_tags.get_user_rating(self.book, self.user), 0) - def test_get_user_identifer_local(self, _): + def test_get_user_identifer_local(self, *_): """fall back to the simplest uid available""" self.assertNotEqual(self.user.username, self.user.localname) self.assertEqual(utilities.get_user_identifier(self.user), "mouse") - def test_get_user_identifer_remote(self, _): + def test_get_user_identifer_remote(self, *_): """for a remote user, should be their full username""" self.assertEqual( utilities.get_user_identifier(self.remote_user), "rat@example.com" ) - def test_get_replies(self, _): + def test_get_replies(self, *_): """direct replies to a status""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): parent = models.Review.objects.create( @@ -87,7 +88,7 @@ class TemplateTags(TestCase): self.assertTrue(second_child in replies) self.assertFalse(third_child in replies) - def test_get_parent(self, _): + def test_get_parent(self, *_): """get the reply parent of a status""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): parent = models.Review.objects.create( @@ -101,7 +102,7 @@ class TemplateTags(TestCase): self.assertEqual(result, parent) self.assertIsInstance(result, models.Review) - def test_get_user_liked(self, _): + def test_get_user_liked(self, *_): """did a user like a status""" status = models.Review.objects.create(user=self.remote_user, book=self.book) @@ -110,7 +111,7 @@ class TemplateTags(TestCase): models.Favorite.objects.create(user=self.user, status=status) self.assertTrue(interaction.get_user_liked(self.user, status)) - def test_get_user_boosted(self, _): + def test_get_user_boosted(self, *_): """did a user boost a status""" status = models.Review.objects.create(user=self.remote_user, book=self.book) @@ -119,7 +120,7 @@ class TemplateTags(TestCase): models.Boost.objects.create(user=self.user, boosted_status=status) self.assertTrue(interaction.get_user_boosted(self.user, status)) - def test_get_boosted(self, _): + def test_get_boosted(self, *_): """load a boosted status""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): status = models.Review.objects.create(user=self.remote_user, book=self.book) @@ -128,7 +129,7 @@ class TemplateTags(TestCase): self.assertIsInstance(boosted, models.Review) self.assertEqual(boosted, status) - def test_get_book_description(self, _): + def test_get_book_description(self, *_): """grab it from the edition or the parent""" work = models.Work.objects.create(title="Test Work") self.book.parent_work = work @@ -144,12 +145,12 @@ class TemplateTags(TestCase): self.book.save() self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hello") - def test_get_uuid(self, _): + def test_get_uuid(self, *_): """uuid functionality""" uuid = utilities.get_uuid("hi") self.assertTrue(re.match(r"hi[A-Za-z0-9\-]", uuid)) - def test_get_markdown(self, _): + def test_get_markdown(self, *_): """mardown format data""" result = markdown.get_markdown("_hi_") self.assertEqual(result, "

hi

") @@ -157,13 +158,13 @@ class TemplateTags(TestCase): result = markdown.get_markdown("_hi_") self.assertEqual(result, "

hi

") - def test_get_mentions(self, _): + def test_get_mentions(self, *_): """list of people mentioned""" status = models.Status.objects.create(content="hi", user=self.remote_user) result = status_display.get_mentions(status, self.user) self.assertEqual(result, "@rat@example.com ") - def test_related_status(self, _): + def test_related_status(self, *_): """gets the subclass model for a notification status""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): status = models.Status.objects.create(content="hi", user=self.user) diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py index 4243dc78e..fdb84d7c5 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_announce.py +++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py @@ -51,7 +51,8 @@ class InboxActivities(TestCase): models.SiteSettings.objects.create() @patch("bookwyrm.activitystreams.ActivityStream.add_status") - def test_boost(self, redis_mock): + @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores") + def test_boost(self, redis_mock, _): """boost a status""" self.assertEqual(models.Notification.objects.count(), 0) activity = { @@ -81,7 +82,8 @@ class InboxActivities(TestCase): @responses.activate @patch("bookwyrm.activitystreams.ActivityStream.add_status") - def test_boost_remote_status(self, redis_mock): + @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores") + def test_boost_remote_status(self, redis_mock, _): """boost a status from a remote server""" work = models.Work.objects.create(title="work title") book = models.Edition.objects.create( @@ -153,12 +155,13 @@ class InboxActivities(TestCase): views.inbox.activity_task(activity) self.assertEqual(models.Boost.objects.count(), 0) - def test_unboost(self): + @patch("bookwyrm.activitystreams.ActivityStream.add_status") + @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores") + def test_unboost(self, *_): """undo a boost""" - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - boost = models.Boost.objects.create( - boosted_status=self.status, user=self.remote_user - ) + boost = models.Boost.objects.create( + boosted_status=self.status, user=self.remote_user + ) activity = { "type": "Undo", "actor": "hi", @@ -175,11 +178,7 @@ class InboxActivities(TestCase): "published": "Mon, 25 May 2020 19:31:20 GMT", }, } - with patch( - "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" - ) as redis_mock: - views.inbox.activity_task(activity) - self.assertTrue(redis_mock.called) + views.inbox.activity_task(activity) self.assertFalse(models.Boost.objects.exists()) def test_unboost_unknown_boost(self): From 894633202311ed739f3b36656eb3697558a0ef2d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 16:56:47 -0700 Subject: [PATCH 101/130] More fixes for more tests --- bookwyrm/tests/models/test_status_model.py | 2 +- bookwyrm/tests/views/test_interaction.py | 36 +++++++++------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index 0c0436df2..d58a6cb95 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -385,7 +385,7 @@ class Status(TestCase): user=self.local_user, notification_type="GLORB" ) - def test_create_broadcast(self, _, broadcast_mock): + def test_create_broadcast(self, broadcast_mock, *_): """should send out two verions of a status on create""" models.Comment.objects.create( content="hi", user=self.local_user, book=self.book diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py index ab1d6066e..272f6b40f 100644 --- a/bookwyrm/tests/views/test_interaction.py +++ b/bookwyrm/tests/views/test_interaction.py @@ -8,6 +8,9 @@ from bookwyrm import models, views @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") +@patch( + "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" +) class InteractionViews(TestCase): """viewing and creating statuses""" @@ -40,7 +43,7 @@ class InteractionViews(TestCase): parent_work=work, ) - def test_favorite(self, _): + def test_favorite(self, *_): """create and broadcast faving a status""" view = views.Favorite.as_view() request = self.factory.post("") @@ -58,7 +61,7 @@ class InteractionViews(TestCase): self.assertEqual(notification.user, self.local_user) self.assertEqual(notification.related_user, self.remote_user) - def test_unfavorite(self, _): + def test_unfavorite(self, *_): """unfav a status""" view = views.Unfavorite.as_view() request = self.factory.post("") @@ -75,7 +78,7 @@ class InteractionViews(TestCase): self.assertEqual(models.Favorite.objects.count(), 0) self.assertEqual(models.Notification.objects.count(), 0) - def test_boost(self, _): + def test_boost(self, *_): """boost a status""" view = views.Boost.as_view() request = self.factory.post("") @@ -83,10 +86,7 @@ class InteractionViews(TestCase): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): status = models.Status.objects.create(user=self.local_user, content="hi") - with patch( - "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" - ): - view(request, status.id) + view(request, status.id) boost = models.Boost.objects.get() @@ -100,7 +100,7 @@ class InteractionViews(TestCase): self.assertEqual(notification.related_user, self.remote_user) self.assertEqual(notification.related_status, status) - def test_self_boost(self, _): + def test_self_boost(self, *_): """boost your own status""" view = views.Boost.as_view() request = self.factory.post("") @@ -124,7 +124,7 @@ class InteractionViews(TestCase): self.assertFalse(models.Notification.objects.exists()) - def test_boost_unlisted(self, _): + def test_boost_unlisted(self, *_): """boost a status""" view = views.Boost.as_view() request = self.factory.post("") @@ -139,7 +139,7 @@ class InteractionViews(TestCase): boost = models.Boost.objects.get() self.assertEqual(boost.privacy, "unlisted") - def test_boost_private(self, _): + def test_boost_private(self, *_): """boost a status""" view = views.Boost.as_view() request = self.factory.post("") @@ -152,7 +152,7 @@ class InteractionViews(TestCase): view(request, status.id) self.assertFalse(models.Boost.objects.exists()) - def test_boost_twice(self, _): + def test_boost_twice(self, *_): """boost a status""" view = views.Boost.as_view() request = self.factory.post("") @@ -160,24 +160,18 @@ class InteractionViews(TestCase): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): status = models.Status.objects.create(user=self.local_user, content="hi") - with patch( - "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" - ): - view(request, status.id) - view(request, status.id) + view(request, status.id) + view(request, status.id) self.assertEqual(models.Boost.objects.count(), 1) - def test_unboost(self, _): + def test_unboost(self, *_): """undo a boost""" view = views.Unboost.as_view() request = self.factory.post("") request.user = self.remote_user with patch("bookwyrm.activitystreams.ActivityStream.add_status"): status = models.Status.objects.create(user=self.local_user, content="hi") - with patch( - "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" - ): - views.Boost.as_view()(request, status.id) + views.Boost.as_view()(request, status.id) self.assertEqual(models.Boost.objects.count(), 1) self.assertEqual(models.Notification.objects.count(), 1) From 75df21019348a004ba3e231f10657151c1beb91d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 14 Jun 2021 17:01:53 -0700 Subject: [PATCH 102/130] Python formatting --- bookwyrm/tests/views/test_interaction.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py index 272f6b40f..cb5e97cbd 100644 --- a/bookwyrm/tests/views/test_interaction.py +++ b/bookwyrm/tests/views/test_interaction.py @@ -8,9 +8,7 @@ from bookwyrm import models, views @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") -@patch( - "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" -) +@patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores") class InteractionViews(TestCase): """viewing and creating statuses""" From cc03460e007b6c0da0e44668fbf36e99153e7cb2 Mon Sep 17 00:00:00 2001 From: Fabien Basmaison Date: Thu, 17 Jun 2021 17:18:55 +0200 Subject: [PATCH 103/130] Avoid space within parenthesises for series when no number is provided. --- bookwyrm/templates/book/book.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 97af53fff..62f09aa03 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -29,8 +29,7 @@ - ({{ book.series }} - {% if book.series_number %} #{{ book.series_number }}{% endif %}) + ({{ book.series }}{% if book.series_number %} #{{ book.series_number }}{% endif %}) {% endif %}

{% endif %} From cf3869ad3295e7569d296569cabf93b34ed159c8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 17 Jun 2021 12:34:54 -0700 Subject: [PATCH 104/130] Adds timeouts to get requests --- bookwyrm/connectors/abstract_connector.py | 9 ++++++--- bookwyrm/connectors/connector_manager.py | 7 ++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 606678150..22489af29 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -37,7 +37,7 @@ class AbstractMinimalConnector(ABC): for field in self_fields: setattr(self, field, getattr(info, field)) - def search(self, query, min_confidence=None): + def search(self, query, min_confidence=None, timeout=5): """free text search""" params = {} if min_confidence: @@ -46,6 +46,7 @@ class AbstractMinimalConnector(ABC): data = self.get_search_data( "%s%s" % (self.search_url, query), params=params, + timeout=timeout, ) results = [] @@ -218,7 +219,7 @@ def dict_from_mappings(data, mappings): return result -def get_data(url, params=None): +def get_data(url, params=None, timeout=10): """wrapper for request.get""" # check if the url is blocked if models.FederatedServer.is_blocked(url): @@ -234,6 +235,7 @@ def get_data(url, params=None): "Accept": "application/json; charset=utf-8", "User-Agent": settings.USER_AGENT, }, + timeout=timeout, ) except (RequestError, SSLError, ConnectionError) as e: logger.exception(e) @@ -250,7 +252,7 @@ def get_data(url, params=None): return data -def get_image(url): +def get_image(url, timeout=10): """wrapper for requesting an image""" try: resp = requests.get( @@ -258,6 +260,7 @@ def get_image(url): headers={ "User-Agent": settings.USER_AGENT, }, + timeout=timeout, ) except (RequestError, SSLError) as e: logger.exception(e) diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py index 95c5959df..040e7fa5b 100644 --- a/bookwyrm/connectors/connector_manager.py +++ b/bookwyrm/connectors/connector_manager.py @@ -1,4 +1,5 @@ """ interface with whatever connectors the app has """ +from datetime import datetime import importlib import logging import re @@ -29,9 +30,11 @@ def search(query, min_confidence=0.1, return_first=False): isbn = re.sub(r"[\W_]", "", query) maybe_isbn = len(isbn) in [10, 13] # ISBN10 or ISBN13 + timeout = 15 + start_time = datetime.now() for connector in get_connectors(): result_set = None - if maybe_isbn and connector.isbn_search_url and connector.isbn_search_url == "": + if maybe_isbn and connector.isbn_search_url and connector.isbn_search_url != "": # Search on ISBN try: result_set = connector.isbn_search(isbn) @@ -59,6 +62,8 @@ def search(query, min_confidence=0.1, return_first=False): "results": result_set, } ) + if (datetime.now() - start_time).seconds >= timeout: + break if return_first: return None From 8b657bbcb1dee069d3c94ba3575b02b3a9a4b808 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 17 Jun 2021 12:58:37 -0700 Subject: [PATCH 105/130] Updates model test --- bookwyrm/tests/models/test_status_model.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index d58a6cb95..355caab9b 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -385,7 +385,8 @@ class Status(TestCase): user=self.local_user, notification_type="GLORB" ) - def test_create_broadcast(self, broadcast_mock, *_): + # pylint: disable=unused-argument + def test_create_broadcast(self, one, two, broadcast_mock, *_): """should send out two verions of a status on create""" models.Comment.objects.create( content="hi", user=self.local_user, book=self.book From 2a6339cf21ff77b6278487c453a52e96ca2b9280 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 17 Jun 2021 13:10:01 -0700 Subject: [PATCH 106/130] Fixes redis interaction mock --- bookwyrm/tests/views/test_interaction.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py index cb5e97cbd..3867f57d5 100644 --- a/bookwyrm/tests/views/test_interaction.py +++ b/bookwyrm/tests/views/test_interaction.py @@ -162,13 +162,17 @@ class InteractionViews(TestCase): view(request, status.id) self.assertEqual(models.Boost.objects.count(), 1) + @patch("bookwyrm.activitystreams.ActivityStream.add_status") def test_unboost(self, *_): """undo a boost""" view = views.Unboost.as_view() request = self.factory.post("") request.user = self.remote_user - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - status = models.Status.objects.create(user=self.local_user, content="hi") + status = models.Status.objects.create(user=self.local_user, content="hi") + + with patch( + "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" + ): views.Boost.as_view()(request, status.id) self.assertEqual(models.Boost.objects.count(), 1) From 5d3639e47fb522d79b86836406c3e3ecb5305b4a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 17 Jun 2021 14:46:58 -0700 Subject: [PATCH 107/130] Minor simplications to search queries --- bookwyrm/connectors/self_connector.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py index a8f858345..f26b0ab33 100644 --- a/bookwyrm/connectors/self_connector.py +++ b/bookwyrm/connectors/self_connector.py @@ -3,7 +3,7 @@ from functools import reduce import operator from django.contrib.postgres.search import SearchRank, SearchVector -from django.db.models import Count, OuterRef, Subquery, F, Q +from django.db.models import OuterRef, Subquery, F, Q from bookwyrm import models from .abstract_connector import AbstractConnector, SearchResult @@ -122,6 +122,8 @@ def search_identifiers(query, *filters): results = models.Edition.objects.filter( *filters, reduce(operator.or_, (Q(**f) for f in or_filters)) ).distinct() + if results.count() <= 1: + return results # when there are multiple editions of the same work, pick the default. # it would be odd for this to happen. @@ -129,9 +131,8 @@ def search_identifiers(query, *filters): parent_work=OuterRef("parent_work") ).order_by("-edition_rank") return ( - results.annotate(default_id=Subquery(default_editions.values("id")[:1])).filter( - default_id=F("id") - ) + results.annotate(default_id=Subquery(default_editions.values("id")[:1])) + .filter(default_id=F("id")) or results ) @@ -146,7 +147,7 @@ def search_title_author(query, min_confidence, *filters): ) results = ( - models.Edition.objects.annotate(search=vector) + models.Edition.objects .annotate(rank=SearchRank(vector, query)) .filter(*filters, rank__gt=min_confidence) .order_by("-rank") @@ -154,11 +155,11 @@ def search_title_author(query, min_confidence, *filters): # when there are multiple editions of the same work, pick the closest editions_of_work = ( - results.values("parent_work") - .annotate(Count("parent_work")) - .values_list("parent_work") + results.values("parent_work__id") + .values_list("parent_work__id") ) + # filter out multiple editions of the same work for work_id in set(editions_of_work): editions = results.filter(parent_work=work_id) default = editions.order_by("-edition_rank").first() From 59643c02a30a90cf67eac526bcc8ffa2585eb216 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 17 Jun 2021 14:48:19 -0700 Subject: [PATCH 108/130] Python formatting --- bookwyrm/connectors/self_connector.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py index f26b0ab33..5223390d8 100644 --- a/bookwyrm/connectors/self_connector.py +++ b/bookwyrm/connectors/self_connector.py @@ -131,8 +131,9 @@ def search_identifiers(query, *filters): parent_work=OuterRef("parent_work") ).order_by("-edition_rank") return ( - results.annotate(default_id=Subquery(default_editions.values("id")[:1])) - .filter(default_id=F("id")) + results.annotate(default_id=Subquery(default_editions.values("id")[:1])).filter( + default_id=F("id") + ) or results ) @@ -147,17 +148,13 @@ def search_title_author(query, min_confidence, *filters): ) results = ( - models.Edition.objects - .annotate(rank=SearchRank(vector, query)) + models.Edition.objects.annotate(rank=SearchRank(vector, query)) .filter(*filters, rank__gt=min_confidence) .order_by("-rank") ) # when there are multiple editions of the same work, pick the closest - editions_of_work = ( - results.values("parent_work__id") - .values_list("parent_work__id") - ) + editions_of_work = results.values("parent_work__id").values_list("parent_work__id") # filter out multiple editions of the same work for work_id in set(editions_of_work): From 22636041ba8b90ca2c36553bb88498f75a45290f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 17 Jun 2021 17:47:46 -0700 Subject: [PATCH 109/130] Use null instead of zero for unrated review --- bookwyrm/templates/snippets/form_rate_stars.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/snippets/form_rate_stars.html b/bookwyrm/templates/snippets/form_rate_stars.html index a53733df1..e1e36477a 100644 --- a/bookwyrm/templates/snippets/form_rate_stars.html +++ b/bookwyrm/templates/snippets/form_rate_stars.html @@ -11,7 +11,7 @@ class="is-sr-only" type="radio" name="rating" - value="0" + value="" {% if default_rating == 0 or not default_rating %}checked{% endif %} > From e07672fff12dce6944c5d8854cecbf4735399b2d Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 18 Jun 2021 18:28:24 +0200 Subject: [PATCH 110/130] Fix tests --- .env.dev.example | 4 +- .env.prod.example | 4 +- bookwyrm/tests/views/test_edit_user.py | 60 ++++++++++++++------------ bookwyrm/tests/views/test_user.py | 2 +- 4 files changed, 38 insertions(+), 32 deletions(-) diff --git a/.env.dev.example b/.env.dev.example index 1613321ac..1cf8e3441 100644 --- a/.env.dev.example +++ b/.env.dev.example @@ -49,7 +49,7 @@ EMAIL_USE_SSL=false # or use_dominant_color_light / use_dominant_color_dark PREVIEW_BG_COLOR=use_dominant_color_light # Change to #FFF if you use use_dominant_color_dark -PREVIEW_TEXT_COLOR=#363636 +PREVIEW_TEXT_COLOR="#363636" PREVIEW_IMG_WIDTH=1200 PREVIEW_IMG_HEIGHT=630 -PREVIEW_DEFAULT_COVER_COLOR=#002549 \ No newline at end of file +PREVIEW_DEFAULT_COVER_COLOR="#002549" \ No newline at end of file diff --git a/.env.prod.example b/.env.prod.example index d8aa2435d..646b02587 100644 --- a/.env.prod.example +++ b/.env.prod.example @@ -49,7 +49,7 @@ EMAIL_USE_SSL=false # or use_dominant_color_light / use_dominant_color_dark PREVIEW_BG_COLOR=use_dominant_color_light # Change to #FFF if you use use_dominant_color_dark -PREVIEW_TEXT_COLOR=#363636 +PREVIEW_TEXT_COLOR="#363636" PREVIEW_IMG_WIDTH=1200 PREVIEW_IMG_HEIGHT=630 -PREVIEW_DEFAULT_COVER_COLOR=#002549 \ No newline at end of file +PREVIEW_DEFAULT_COVER_COLOR="#002549" \ No newline at end of file diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py index e3b9d4635..af39f0054 100644 --- a/bookwyrm/tests/views/test_edit_user.py +++ b/bookwyrm/tests/views/test_edit_user.py @@ -21,25 +21,29 @@ class EditUserViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" - ) - self.book = models.Edition.objects.create(title="test") - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - models.ShelfBook.objects.create( - book=self.book, - user=self.local_user, - shelf=self.local_user.shelf_set.first(), + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create(title="test") + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + models.ShelfBook.objects.create( + book=self.book, + user=self.local_user, + shelf=self.local_user.shelf_set.first(), + ) + + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False @@ -64,11 +68,12 @@ class EditUserViews(TestCase): request.user = self.local_user self.assertIsNone(self.local_user.name) - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - view(request) - self.assertEqual(delay_mock.call_count, 1) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + view(request) + self.assertEqual(delay_mock.call_count, 1) self.assertEqual(self.local_user.name, "New Name") self.assertEqual(self.local_user.email, "wow@email.com") @@ -88,11 +93,12 @@ class EditUserViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - view(request) - self.assertEqual(delay_mock.call_count, 1) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + view(request) + self.assertEqual(delay_mock.call_count, 1) self.assertEqual(self.local_user.name, "New Name") self.assertEqual(self.local_user.email, "wow@email.com") self.assertIsNotNone(self.local_user.avatar) diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index 49f297330..3e7a5108d 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -135,4 +135,4 @@ class UserViews(TestCase): with patch("bookwyrm.views.user.is_api_request") as is_api: is_api.return_value = False with self.assertRaises(Http404): - view(request, "rat") \ No newline at end of file + view(request, "rat") From 6b873e6bcddfdf53197fb6bd9716d2b03595347e Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 18 Jun 2021 18:29:59 +0200 Subject: [PATCH 111/130] Fix newline --- .env.dev.example | 2 +- .env.prod.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.dev.example b/.env.dev.example index 1cf8e3441..f407c52b1 100644 --- a/.env.dev.example +++ b/.env.dev.example @@ -52,4 +52,4 @@ PREVIEW_BG_COLOR=use_dominant_color_light PREVIEW_TEXT_COLOR="#363636" PREVIEW_IMG_WIDTH=1200 PREVIEW_IMG_HEIGHT=630 -PREVIEW_DEFAULT_COVER_COLOR="#002549" \ No newline at end of file +PREVIEW_DEFAULT_COVER_COLOR="#002549" diff --git a/.env.prod.example b/.env.prod.example index 646b02587..d61c46af5 100644 --- a/.env.prod.example +++ b/.env.prod.example @@ -52,4 +52,4 @@ PREVIEW_BG_COLOR=use_dominant_color_light PREVIEW_TEXT_COLOR="#363636" PREVIEW_IMG_WIDTH=1200 PREVIEW_IMG_HEIGHT=630 -PREVIEW_DEFAULT_COVER_COLOR="#002549" \ No newline at end of file +PREVIEW_DEFAULT_COVER_COLOR="#002549" From 5d41781e6ac3722ecd36774c256d6cb86a43d010 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 18 Jun 2021 19:15:24 +0200 Subject: [PATCH 112/130] Fix scheme --- bookwyrm/templates/snippets/opengraph_images.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bookwyrm/templates/snippets/opengraph_images.html b/bookwyrm/templates/snippets/opengraph_images.html index d2c379a89..bb3fde3ad 100644 --- a/bookwyrm/templates/snippets/opengraph_images.html +++ b/bookwyrm/templates/snippets/opengraph_images.html @@ -1,12 +1,12 @@ {% if preview_images_enabled is True %} {% if image %} - - + + {% else %} - - + + {% endif %} {% else %} - - + + {% endif %} From 7e26a384031c215f73c7a8c955f6191feac9f956 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 18 Jun 2021 19:15:36 +0200 Subject: [PATCH 113/130] Fix summary image format --- bookwyrm/templates/layout.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 03496f523..5e66ff799 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -10,7 +10,11 @@ + {% if preview_images_enabled is True %} + + {% else %} + {% endif %} From 5db506523d77725a91f378df4a00c954a6f1c581 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 11:36:45 -0700 Subject: [PATCH 114/130] Adds pylint workflow --- .github/workflows/pylint.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/pylint.yml diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml new file mode 100644 index 000000000..9b7e86270 --- /dev/null +++ b/.github/workflows/pylint.yml @@ -0,0 +1,22 @@ +name: Pylint + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.8 + uses: actions/setup-python@v1 + with: + python-version: 3.8 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install pylint + - name: Analysing the code with pylint + run: | + find . -name '*.py' -exec pylint {} \; From 2bd56c38d27124764170a59f54e632ede6202a4d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 11:57:11 -0700 Subject: [PATCH 115/130] Tweaks to script --- .github/workflows/pylint.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index 9b7e86270..52b850203 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -1,6 +1,6 @@ name: Pylint -on: [push] +on: [push, pull_request] jobs: build: @@ -9,14 +9,14 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python 3.8 - uses: actions/setup-python@v1 + - name: Set up Python 3.9 + uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.9 - name: Install dependencies run: | python -m pip install --upgrade pip pip install pylint - name: Analysing the code with pylint run: | - find . -name '*.py' -exec pylint {} \; + pylint bookwyrm/ --ignore=migrations From 4995b26d8c354ff6edffbd4f1ff0b0c666490913 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 12:08:15 -0700 Subject: [PATCH 116/130] Adds dependencies to pylint --- .github/workflows/pylint.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index 52b850203..c3de158a7 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -13,9 +13,10 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.9 - - name: Install dependencies + - name: Install Dependencies run: | python -m pip install --upgrade pip + pip install -r requirements.txt pip install pylint - name: Analysing the code with pylint run: | From 7775d943d41361367cf03a64a591713e56d3d34e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 12:11:07 -0700 Subject: [PATCH 117/130] Fixes list link to user profile --- bookwyrm/templates/lists/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 4dc9660a3..a9048b679 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -63,7 +63,7 @@
-

{% blocktrans with username=item.user.display_name user_path=user.local_path %}Added by {{ username }}{% endblocktrans %}

+

{% blocktrans with username=item.user.display_name user_path=item.user.local_path %}Added by {{ username }}{% endblocktrans %}

{% if list.user == request.user or list.curation == 'open' and item.user == request.user %} From 38a19f7063ee1ac80645051bef50350471b2f98e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 12:23:16 -0700 Subject: [PATCH 118/130] Disable error that's almost always a false positive --- .github/workflows/pylint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index c3de158a7..19ebb1e28 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -20,4 +20,4 @@ jobs: pip install pylint - name: Analysing the code with pylint run: | - pylint bookwyrm/ --ignore=migrations + pylint bookwyrm/ -d --ignore=migrations --disable=E1101 From 633f5e6dc7056875828a649cb443b95db178d888 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 12:25:11 -0700 Subject: [PATCH 119/130] Fixes R/C disable flag --- .github/workflows/pylint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index 19ebb1e28..98517135f 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -20,4 +20,4 @@ jobs: pip install pylint - name: Analysing the code with pylint run: | - pylint bookwyrm/ -d --ignore=migrations --disable=E1101 + pylint bookwyrm/ --ignore=migrations --disable=R,C,E1101 From 20f74ba02b7e1c5950b2504feb8e673fa69162f2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 13:23:06 -0700 Subject: [PATCH 120/130] More disables --- .github/workflows/pylint.yml | 3 ++- bookwyrm/forms.py | 2 -- bookwyrm/models/user.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index 98517135f..0f59c7501 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -20,4 +20,5 @@ jobs: pip install pylint - name: Analysing the code with pylint run: | - pylint bookwyrm/ --ignore=migrations --disable=R,C,E1101 + pylint bookwyrm/ --ignore=migrations --disable=E1101,E1136,R0903,R0901,W0707,W0511 + diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py index 4931805fb..042118029 100644 --- a/bookwyrm/forms.py +++ b/bookwyrm/forms.py @@ -181,8 +181,6 @@ class EditionForm(CustomForm): "authors", "parent_work", "shelves", - "subjects", # TODO - "subject_places", # TODO "connector", ] diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index d9f3eba99..ba97330d2 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -356,7 +356,7 @@ class AnnualGoal(BookWyrmModel): def get_remote_id(self): """put the year in the path""" - return "%s/goal/%d" % (self.user.remote_id, self.year) + return "{:s}/goal/{:d}".format(self.user.remote_id, self.year) @property def books(self): From 44798640081018b888c912dc0fba2dcb2ff377a7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 14:12:56 -0700 Subject: [PATCH 121/130] Updates code for linter --- .github/workflows/pylint.yml | 2 +- bookwyrm/activitypub/base_activity.py | 5 ++- bookwyrm/activitypub/book.py | 5 +++ bookwyrm/activitypub/verbs.py | 4 ++ bookwyrm/connectors/abstract_connector.py | 16 ++++---- bookwyrm/connectors/inventaire.py | 2 +- bookwyrm/forms.py | 1 + bookwyrm/models/list.py | 5 ++- bookwyrm/models/user.py | 2 +- bookwyrm/signatures.py | 1 + bookwyrm/timezone_middleware.py | 3 ++ bookwyrm/urls.py | 48 +++++++++++------------ bookwyrm/utils/regex.py | 14 +++---- bookwyrm/views/helpers.py | 2 +- bookwyrm/views/inbox.py | 3 +- bookwyrm/views/isbn.py | 6 --- bookwyrm/views/list.py | 3 +- bookwyrm/views/rss_feed.py | 2 +- bookwyrm/views/search.py | 2 +- bookwyrm/views/shelf.py | 2 +- bookwyrm/views/status.py | 4 +- 21 files changed, 71 insertions(+), 61 deletions(-) diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index 0f59c7501..ddacfb416 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -20,5 +20,5 @@ jobs: pip install pylint - name: Analysing the code with pylint run: | - pylint bookwyrm/ --ignore=migrations --disable=E1101,E1136,R0903,R0901,W0707,W0511 + pylint bookwyrm/ --ignore=migrations,__init__ --disable=E1101,E1135,E1136,R0903,R0901,R0902,W0707,W0511,W0406 diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py index 5349e1dd0..81762388f 100644 --- a/bookwyrm/activitypub/base_activity.py +++ b/bookwyrm/activitypub/base_activity.py @@ -37,6 +37,7 @@ class Mention(Link): @dataclass +# pylint: disable=invalid-name class Signature: """public key block""" @@ -56,11 +57,11 @@ def naive_parse(activity_objects, activity_json, serializer=None): activity_type = activity_json.get("type") try: serializer = activity_objects[activity_type] - except KeyError as e: + except KeyError as err: # we know this exists and that we can't handle it if activity_type in ["Question"]: return None - raise ActivitySerializerError(e) + raise ActivitySerializerError(err) return serializer(activity_objects=activity_objects, **activity_json) diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index 1599b408a..bd27c4e60 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -6,6 +6,7 @@ from .base_activity import ActivityObject from .image import Document +# pylint: disable=invalid-name @dataclass(init=False) class BookData(ActivityObject): """shared fields for all book data and authors""" @@ -18,6 +19,7 @@ class BookData(ActivityObject): lastEditedBy: str = None +# pylint: disable=invalid-name @dataclass(init=False) class Book(BookData): """serializes an edition or work, abstract""" @@ -40,6 +42,7 @@ class Book(BookData): type: str = "Book" +# pylint: disable=invalid-name @dataclass(init=False) class Edition(Book): """Edition instance of a book object""" @@ -57,6 +60,7 @@ class Edition(Book): type: str = "Edition" +# pylint: disable=invalid-name @dataclass(init=False) class Work(Book): """work instance of a book object""" @@ -66,6 +70,7 @@ class Work(Book): type: str = "Work" +# pylint: disable=invalid-name @dataclass(init=False) class Author(BookData): """author of a book""" diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py index f26936d7b..50a479b71 100644 --- a/bookwyrm/activitypub/verbs.py +++ b/bookwyrm/activitypub/verbs.py @@ -22,6 +22,7 @@ class Verb(ActivityObject): self.object.to_model() +# pylint: disable=invalid-name @dataclass(init=False) class Create(Verb): """Create activity""" @@ -32,6 +33,7 @@ class Create(Verb): type: str = "Create" +# pylint: disable=invalid-name @dataclass(init=False) class Delete(Verb): """Create activity""" @@ -57,6 +59,7 @@ class Delete(Verb): # if we can't find it, we don't need to delete it because we don't have it +# pylint: disable=invalid-name @dataclass(init=False) class Update(Verb): """Update activity""" @@ -192,6 +195,7 @@ class Like(Verb): self.to_model() +# pylint: disable=invalid-name @dataclass(init=False) class Announce(Verb): """boosting a status""" diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 22489af29..6c032b830 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -127,8 +127,8 @@ class AbstractConnector(AbstractMinimalConnector): edition_data = data try: work_data = self.get_work_from_edition_data(data) - except (KeyError, ConnectorException) as e: - logger.exception(e) + except (KeyError, ConnectorException) as err: + logger.exception(err) work_data = data if not work_data or not edition_data: @@ -237,16 +237,16 @@ def get_data(url, params=None, timeout=10): }, timeout=timeout, ) - except (RequestError, SSLError, ConnectionError) as e: - logger.exception(e) + except (RequestError, SSLError, ConnectionError) as err: + logger.exception(err) raise ConnectorException() if not resp.ok: raise ConnectorException() try: data = resp.json() - except ValueError as e: - logger.exception(e) + except ValueError as err: + logger.exception(err) raise ConnectorException() return data @@ -262,8 +262,8 @@ def get_image(url, timeout=10): }, timeout=timeout, ) - except (RequestError, SSLError) as e: - logger.exception(e) + except (RequestError, SSLError) as err: + logger.exception(err) return None if not resp.ok: return None diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 102c9d727..116aa5c11 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -74,7 +74,7 @@ class Connector(AbstractConnector): **{k: data.get(k) for k in ["uri", "image", "labels", "sitelinks"]}, } - def search(self, query, min_confidence=None): + def search(self, query, min_confidence=None): # pylint: disable=arguments-differ """overrides default search function with confidence ranking""" results = super().search(query) if min_confidence: diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py index 042118029..cb55d229e 100644 --- a/bookwyrm/forms.py +++ b/bookwyrm/forms.py @@ -22,6 +22,7 @@ class CustomForm(ModelForm): css_classes["number"] = "input" css_classes["checkbox"] = "checkbox" css_classes["textarea"] = "textarea" + # pylint: disable=super-with-arguments super(CustomForm, self).__init__(*args, **kwargs) for visible in self.visible_fields(): if hasattr(visible.field.widget, "input_type"): diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 2a5c3382a..bbad5ba9b 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -93,7 +93,8 @@ class ListItem(CollectionItemMixin, BookWyrmModel): ) class Meta: - # A book may only be placed into a list once, and each order in the list may be used only - # once + """A book may only be placed into a list once, + and each order in the list may be used only once""" + unique_together = (("book", "book_list"), ("order", "book_list")) ordering = ("-created_date",) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index ba97330d2..e328b84bf 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -232,7 +232,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): def save(self, *args, **kwargs): """populate fields for new local users""" created = not bool(self.id) - if not self.local and not re.match(regex.full_username, self.username): + if not self.local and not re.match(regex.FULL_USERNAME, self.username): # generate a username that uses the domain (webfinger format) actor_parts = urlparse(self.remote_id) self.username = "%s@%s" % (self.username, actor_parts.netloc) diff --git a/bookwyrm/signatures.py b/bookwyrm/signatures.py index 5488cf9be..c8c900283 100644 --- a/bookwyrm/signatures.py +++ b/bookwyrm/signatures.py @@ -73,6 +73,7 @@ class Signature: self.headers = headers self.signature = signature + # pylint: disable=invalid-name @classmethod def parse(cls, request): """extract and parse a signature from an http request""" diff --git a/bookwyrm/timezone_middleware.py b/bookwyrm/timezone_middleware.py index 633d6835d..5033397a5 100644 --- a/bookwyrm/timezone_middleware.py +++ b/bookwyrm/timezone_middleware.py @@ -1,9 +1,12 @@ +""" Makes the app aware of the users timezone """ import pytz from django.utils import timezone class TimezoneMiddleware: + """Determine the timezone based on the request""" + def __init__(self, get_response): self.get_response = get_response diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index bfdcd9fc0..15e802b54 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -7,8 +7,8 @@ from django.views.generic.base import TemplateView from bookwyrm import settings, views from bookwyrm.utils import regex -user_path = r"^user/(?P%s)" % regex.username -local_user_path = r"^user/(?P%s)" % regex.localname +USER_PATH = r"^user/(?P%s)" % regex.username +LOCAL_USER_PATH = r"^user/(?P%s)" % regex.localname status_types = [ "status", @@ -19,9 +19,9 @@ status_types = [ "boost", "generatednote", ] -status_path = r"%s/(%s)/(?P\d+)" % (user_path, "|".join(status_types)) +STATUS_PATH = r"%s/(%s)/(?P\d+)" % (USER_PATH, "|".join(status_types)) -book_path = r"^book/(?P\d+)" +BOOK_PATH = r"^book/(?P\d+)" urlpatterns = [ path("admin/", admin.site.urls), @@ -31,8 +31,8 @@ urlpatterns = [ ), # federation endpoints re_path(r"^inbox/?$", views.Inbox.as_view()), - re_path(r"%s/inbox/?$" % local_user_path, views.Inbox.as_view()), - re_path(r"%s/outbox/?$" % local_user_path, views.Outbox.as_view()), + re_path(r"%s/inbox/?$" % LOCAL_USER_PATH, views.Inbox.as_view()), + re_path(r"%s/outbox/?$" % LOCAL_USER_PATH, views.Outbox.as_view()), re_path(r"^\.well-known/webfinger/?$", views.webfinger), re_path(r"^\.well-known/nodeinfo/?$", views.nodeinfo_pointer), re_path(r"^\.well-known/host-meta/?$", views.host_meta), @@ -192,21 +192,21 @@ urlpatterns = [ re_path(r"^import/?$", views.Import.as_view(), name="import"), re_path(r"^import/(\d+)/?$", views.ImportStatus.as_view(), name="import-status"), # users - re_path(r"%s/?$" % user_path, views.User.as_view(), name="user-feed"), - re_path(r"%s\.json$" % user_path, views.User.as_view()), - re_path(r"%s/rss" % user_path, views.rss_feed.RssFeed(), name="user-rss"), + re_path(r"%s/?$" % USER_PATH, views.User.as_view(), name="user-feed"), + re_path(r"%s\.json$" % USER_PATH, views.User.as_view()), + re_path(r"%s/rss" % USER_PATH, views.rss_feed.RssFeed(), name="user-rss"), re_path( - r"%s/followers(.json)?/?$" % user_path, + r"%s/followers(.json)?/?$" % USER_PATH, views.Followers.as_view(), name="user-followers", ), re_path( - r"%s/following(.json)?/?$" % user_path, + r"%s/following(.json)?/?$" % USER_PATH, views.Following.as_view(), name="user-following", ), # lists - re_path(r"%s/lists/?$" % user_path, views.UserLists.as_view(), name="user-lists"), + re_path(r"%s/lists/?$" % USER_PATH, views.UserLists.as_view(), name="user-lists"), re_path(r"^list/?$", views.Lists.as_view(), name="lists"), re_path(r"^list/(?P\d+)(.json)?/?$", views.List.as_view(), name="list"), re_path(r"^list/add-book/?$", views.list.add_book, name="list-add-book"), @@ -224,14 +224,14 @@ urlpatterns = [ r"^list/(?P\d+)/curate/?$", views.Curate.as_view(), name="list-curate" ), # User books - re_path(r"%s/books/?$" % user_path, views.Shelf.as_view(), name="user-shelves"), + re_path(r"%s/books/?$" % USER_PATH, views.Shelf.as_view(), name="user-shelves"), re_path( - r"^%s/(helf|books)/(?P[\w-]+)(.json)?/?$" % user_path, + r"^%s/(helf|books)/(?P[\w-]+)(.json)?/?$" % USER_PATH, views.Shelf.as_view(), name="shelf", ), re_path( - r"^%s/(books|shelf)/(?P[\w-]+)(.json)?/?$" % local_user_path, + r"^%s/(books|shelf)/(?P[\w-]+)(.json)?/?$" % LOCAL_USER_PATH, views.Shelf.as_view(), name="shelf", ), @@ -241,7 +241,7 @@ urlpatterns = [ re_path(r"^unshelve/?$", views.unshelve), # goals re_path( - r"%s/goal/(?P\d{4})/?$" % user_path, + r"%s/goal/(?P\d{4})/?$" % USER_PATH, views.Goal.as_view(), name="user-goal", ), @@ -258,10 +258,10 @@ urlpatterns = [ re_path(r"^block/(?P\d+)/?$", views.Block.as_view()), re_path(r"^unblock/(?P\d+)/?$", views.unblock), # statuses - re_path(r"%s(.json)?/?$" % status_path, views.Status.as_view(), name="status"), - re_path(r"%s/activity/?$" % status_path, views.Status.as_view(), name="status"), + re_path(r"%s(.json)?/?$" % STATUS_PATH, views.Status.as_view(), name="status"), + re_path(r"%s/activity/?$" % STATUS_PATH, views.Status.as_view(), name="status"), re_path( - r"%s/replies(.json)?/?$" % status_path, views.Replies.as_view(), name="replies" + r"%s/replies(.json)?/?$" % STATUS_PATH, views.Replies.as_view(), name="replies" ), re_path( r"^post/?$", @@ -289,17 +289,17 @@ urlpatterns = [ re_path(r"^boost/(?P\d+)/?$", views.Boost.as_view()), re_path(r"^unboost/(?P\d+)/?$", views.Unboost.as_view()), # books - re_path(r"%s(.json)?/?$" % book_path, views.Book.as_view(), name="book"), + re_path(r"%s(.json)?/?$" % BOOK_PATH, views.Book.as_view(), name="book"), re_path( - r"%s/(?Preview|comment|quote)/?$" % book_path, + r"%s/(?Preview|comment|quote)/?$" % BOOK_PATH, views.Book.as_view(), name="book-user-statuses", ), - re_path(r"%s/edit/?$" % book_path, views.EditBook.as_view()), - re_path(r"%s/confirm/?$" % book_path, views.ConfirmEditBook.as_view()), + re_path(r"%s/edit/?$" % BOOK_PATH, views.EditBook.as_view()), + re_path(r"%s/confirm/?$" % BOOK_PATH, views.ConfirmEditBook.as_view()), re_path(r"^create-book/?$", views.EditBook.as_view(), name="create-book"), re_path(r"^create-book/confirm?$", views.ConfirmEditBook.as_view()), - re_path(r"%s/editions(.json)?/?$" % book_path, views.Editions.as_view()), + re_path(r"%s/editions(.json)?/?$" % BOOK_PATH, views.Editions.as_view()), re_path( r"^upload-cover/(?P\d+)/?$", views.upload_cover, name="upload-cover" ), diff --git a/bookwyrm/utils/regex.py b/bookwyrm/utils/regex.py index 6389c35d6..3ac5a0ffd 100644 --- a/bookwyrm/utils/regex.py +++ b/bookwyrm/utils/regex.py @@ -1,10 +1,10 @@ """ defining regexes for regularly used concepts """ -domain = r"[\w_\-\.]+\.[a-z]{2,}" -localname = r"@?[a-zA-Z_\-\.0-9]+" -strict_localname = r"@[a-zA-Z_\-\.0-9]+" -username = r"%s(@%s)?" % (localname, domain) -strict_username = r"\B%s(@%s)?\b" % (strict_localname, domain) -full_username = r"%s@%s\b" % (localname, domain) +DOMAIN = r"[\w_\-\.]+\.[a-z]{2,}" +LOCALNAME = r"@?[a-zA-Z_\-\.0-9]+" +STRICT_LOCALNAME = r"@[a-zA-Z_\-\.0-9]+" +USERNAME = r"%s(@%s)?" % (LOCALNAME, DOMAIN) +STRICT_USERNAME = r"\B%s(@%s)?\b" % (STRICT_LOCALNAME, DOMAIN) +FULL_USERNAME = r"%s@%s\b" % (LOCALNAME, DOMAIN) # should match (BookWyrm/1.0.0; or (BookWyrm/99.1.2; -bookwyrm_user_agent = r"\(BookWyrm/[0-9]+\.[0-9]+\.[0-9]+;" +BOOKWYRM_USER_AGENT = r"\(BookWyrm/[0-9]+\.[0-9]+\.[0-9]+;" diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index 95a1cbbe3..452d81b9c 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -38,7 +38,7 @@ def is_api_request(request): def is_bookwyrm_request(request): """check if the request is coming from another bookwyrm instance""" user_agent = request.headers.get("User-Agent") - if user_agent is None or re.search(regex.bookwyrm_user_agent, user_agent) is None: + if user_agent is None or re.search(regex.BOOKWYRM_USER_AGENT, user_agent) is None: return False return True diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py index a558c571e..ff5fa46da 100644 --- a/bookwyrm/views/inbox.py +++ b/bookwyrm/views/inbox.py @@ -21,6 +21,7 @@ from bookwyrm.utils import regex class Inbox(View): """requests sent by outside servers""" + # pylint: disable=too-many-return-statements def post(self, request, username=None): """only works as POST request""" # first check if this server is on our shitlist @@ -70,7 +71,7 @@ def is_blocked_user_agent(request): user_agent = request.headers.get("User-Agent") if not user_agent: return False - url = re.search(r"https?://{:s}/?".format(regex.domain), user_agent) + url = re.search(r"https?://{:s}/?".format(regex.DOMAIN), user_agent) if not url: return False url = url.group() diff --git a/bookwyrm/views/isbn.py b/bookwyrm/views/isbn.py index 197088bab..12208a3d7 100644 --- a/bookwyrm/views/isbn.py +++ b/bookwyrm/views/isbn.py @@ -1,13 +1,8 @@ """ isbn search view """ -from django.http import HttpResponseNotFound from django.http import JsonResponse -from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse -from django.utils.decorators import method_decorator from django.views import View -from django.views.decorators.http import require_POST -from bookwyrm import forms, models from bookwyrm.connectors import connector_manager from .helpers import is_api_request @@ -23,7 +18,6 @@ class Isbn(View): return JsonResponse([r.json() for r in book_results], safe=False) data = { - "title": "ISBN Search Results", "results": book_results, "query": isbn, } diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index 75bb5d48c..6e872434c 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -314,8 +314,7 @@ def set_book_position(request, list_item_id): Max("order") )["order__max"] - if int_position > order_max: - int_position = order_max + int_position = min(int_position, order_max) if request.user not in (book_list.user, list_item.user): return HttpResponseNotFound() diff --git a/bookwyrm/views/rss_feed.py b/bookwyrm/views/rss_feed.py index f3613a091..0d3a8902e 100644 --- a/bookwyrm/views/rss_feed.py +++ b/bookwyrm/views/rss_feed.py @@ -10,7 +10,7 @@ class RssFeed(Feed): description_template = "rss/content.html" title_template = "rss/title.html" - def get_object(self, request, username): + def get_object(self, request, username): # pylint: disable=arguments-differ """the user who's posts get serialized""" return get_user_from_username(request.user, username) diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py index e7b538e47..274a3bc2e 100644 --- a/bookwyrm/views/search.py +++ b/bookwyrm/views/search.py @@ -83,7 +83,7 @@ def user_search(query, viewer, *_): # use webfinger for mastodon style account@domain.com username to load the user if # they don't exist locally (handle_remote_webfinger will check the db) - if re.match(regex.full_username, query): + if re.match(regex.FULL_USERNAME, query): handle_remote_webfinger(query) return ( diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py index 17efec686..540975094 100644 --- a/bookwyrm/views/shelf.py +++ b/bookwyrm/views/shelf.py @@ -17,7 +17,7 @@ from bookwyrm import forms, models from bookwyrm.activitypub import ActivitypubResponse from bookwyrm.settings import PAGE_LENGTH from .helpers import is_api_request, get_edition, get_user_from_username -from .helpers import handle_reading_status, privacy_filter +from .helpers import privacy_filter # pylint: disable=no-self-use diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py index 27aeab07c..7ac770b94 100644 --- a/bookwyrm/views/status.py +++ b/bookwyrm/views/status.py @@ -133,7 +133,7 @@ def find_mentions(content): """detect @mentions in raw status content""" if not content: return - for match in re.finditer(regex.strict_username, content): + for match in re.finditer(rhandle_reading_status, egex.STRICT_USERNAME, content): username = match.group().strip().split("@")[1:] if len(username) == 1: # this looks like a local user (@user), fill in the domain @@ -150,7 +150,7 @@ def find_mentions(content): def format_links(content): """detect and format links""" return re.sub( - r'([^(href=")]|^|\()(https?:\/\/(%s([\w\.\-_\/+&\?=:;,])*))' % regex.domain, + r'([^(href=")]|^|\()(https?:\/\/(%s([\w\.\-_\/+&\?=:;,])*))' % regex.DOMAIN, r'\g<1>\g<3>', content, ) From 381d1601051eed4e3c2f578e821c58eb12b4eff7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 14:17:05 -0700 Subject: [PATCH 122/130] Fixes init file --- bookwyrm/utils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/utils/__init__.py b/bookwyrm/utils/__init__.py index a90554c70..9dba83620 100644 --- a/bookwyrm/utils/__init__.py +++ b/bookwyrm/utils/__init__.py @@ -1 +1 @@ -from .regex import username +from .regex import USERNAME From 9e5c7053e9f30b25aa5d976706dd0681a9c98ffe Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 14:29:24 -0700 Subject: [PATCH 123/130] More pylint fixes --- .github/workflows/pylint.yml | 2 +- bookwyrm/activitypub/note.py | 2 ++ bookwyrm/activitypub/ordered_collection.py | 3 +++ bookwyrm/activitypub/person.py | 2 ++ bookwyrm/activitypub/response.py | 1 + bookwyrm/connectors/connector_manager.py | 8 ++++---- bookwyrm/connectors/self_connector.py | 1 + bookwyrm/importers/importer.py | 4 ++-- bookwyrm/models/fields.py | 2 ++ bookwyrm/models/relationship.py | 2 +- bookwyrm/utils/__init__.py | 1 + bookwyrm/views/status.py | 2 +- 12 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index ddacfb416..0286d06e1 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -20,5 +20,5 @@ jobs: pip install pylint - name: Analysing the code with pylint run: | - pylint bookwyrm/ --ignore=migrations,__init__ --disable=E1101,E1135,E1136,R0903,R0901,R0902,W0707,W0511,W0406 + pylint bookwyrm/ --ignore=migrations,tests --disable=E1101,E1135,E1136,R0903,R0901,R0902,W0707,W0511,W0406,R0401 diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py index ea2e92b6e..916da2d0e 100644 --- a/bookwyrm/activitypub/note.py +++ b/bookwyrm/activitypub/note.py @@ -19,6 +19,7 @@ class Tombstone(ActivityObject): return model.find_existing_by_remote_id(self.id) +# pylint: disable=invalid-name @dataclass(init=False) class Note(ActivityObject): """Note activity""" @@ -52,6 +53,7 @@ class GeneratedNote(Note): type: str = "GeneratedNote" +# pylint: disable=invalid-name @dataclass(init=False) class Comment(Note): """like a note but with a book""" diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py index e3a83be8e..32e37c996 100644 --- a/bookwyrm/activitypub/ordered_collection.py +++ b/bookwyrm/activitypub/ordered_collection.py @@ -5,6 +5,7 @@ from typing import List from .base_activity import ActivityObject +# pylint: disable=invalid-name @dataclass(init=False) class OrderedCollection(ActivityObject): """structure of an ordered collection activity""" @@ -17,6 +18,7 @@ class OrderedCollection(ActivityObject): type: str = "OrderedCollection" +# pylint: disable=invalid-name @dataclass(init=False) class OrderedCollectionPrivate(OrderedCollection): """an ordered collection with privacy settings""" @@ -41,6 +43,7 @@ class BookList(OrderedCollectionPrivate): type: str = "BookList" +# pylint: disable=invalid-name @dataclass(init=False) class OrderedCollectionPage(ActivityObject): """structure of an ordered collection activity""" diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py index d5f379461..174ead616 100644 --- a/bookwyrm/activitypub/person.py +++ b/bookwyrm/activitypub/person.py @@ -6,6 +6,7 @@ from .base_activity import ActivityObject from .image import Image +# pylint: disable=invalid-name @dataclass(init=False) class PublicKey(ActivityObject): """public key block""" @@ -15,6 +16,7 @@ class PublicKey(ActivityObject): type: str = "PublicKey" +# pylint: disable=invalid-name @dataclass(init=False) class Person(ActivityObject): """actor activitypub json""" diff --git a/bookwyrm/activitypub/response.py b/bookwyrm/activitypub/response.py index 07f39c7e1..e480b85df 100644 --- a/bookwyrm/activitypub/response.py +++ b/bookwyrm/activitypub/response.py @@ -1,3 +1,4 @@ +""" ActivityPub-specific json response wrapper """ from django.http import JsonResponse from .base_activity import ActivityEncoder diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py index 040e7fa5b..1a615c9b2 100644 --- a/bookwyrm/connectors/connector_manager.py +++ b/bookwyrm/connectors/connector_manager.py @@ -38,17 +38,17 @@ def search(query, min_confidence=0.1, return_first=False): # Search on ISBN try: result_set = connector.isbn_search(isbn) - except Exception as e: # pylint: disable=broad-except - logger.exception(e) + except Exception as err: # pylint: disable=broad-except + logger.exception(err) # if this fails, we can still try regular search # if no isbn search results, we fallback to generic search if not result_set: try: result_set = connector.search(query, min_confidence=min_confidence) - except Exception as e: # pylint: disable=broad-except + except Exception as err: # pylint: disable=broad-except # we don't want *any* error to crash the whole search page - logger.exception(e) + logger.exception(err) continue if return_first and result_set: diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py index 5223390d8..930b7cb3d 100644 --- a/bookwyrm/connectors/self_connector.py +++ b/bookwyrm/connectors/self_connector.py @@ -114,6 +114,7 @@ class Connector(AbstractConnector): def search_identifiers(query, *filters): """tries remote_id, isbn; defined as dedupe fields on the model""" + # pylint: disable=W0212 or_filters = [ {f.name: query} for f in models.Edition._meta.get_fields() diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py index 89c62e735..203db0343 100644 --- a/bookwyrm/importers/importer.py +++ b/bookwyrm/importers/importer.py @@ -67,8 +67,8 @@ def import_data(source, job_id): for item in job.items.all(): try: item.resolve() - except Exception as e: # pylint: disable=broad-except - logger.exception(e) + except Exception as err: # pylint: disable=broad-except + logger.exception(err) item.fail_reason = "Error loading book" item.save() continue diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index 379323b90..4ec46504c 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -202,6 +202,7 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField): *args, max_length=255, choices=PrivacyLevels.choices, default="public" ) + # pylint: disable=invalid-name def set_field_from_activity(self, instance, data): to = data.to cc = data.cc @@ -220,6 +221,7 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField): if hasattr(instance, "mention_users"): mentions = [u.remote_id for u in instance.mention_users.all()] # this is a link to the followers list + # pylint: disable=protected-access followers = instance.user.__class__._meta.get_field( "followers" ).field_to_activity(instance.user.followers) diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py index 12f4c51af..edb89d13c 100644 --- a/bookwyrm/models/relationship.py +++ b/bookwyrm/models/relationship.py @@ -99,7 +99,7 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship): status = "follow_request" activity_serializer = activitypub.Follow - def save(self, *args, broadcast=True, **kwargs): + def save(self, *args, broadcast=True, **kwargs): # pylint: disable=arguments-differ """make sure the follow or block relationship doesn't already exist""" # if there's a request for a follow that already exists, accept it # without changing the local database state diff --git a/bookwyrm/utils/__init__.py b/bookwyrm/utils/__init__.py index 9dba83620..f15f59aaf 100644 --- a/bookwyrm/utils/__init__.py +++ b/bookwyrm/utils/__init__.py @@ -1 +1,2 @@ +""" useful regex """ from .regex import USERNAME diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py index 7ac770b94..61b6dc7aa 100644 --- a/bookwyrm/views/status.py +++ b/bookwyrm/views/status.py @@ -133,7 +133,7 @@ def find_mentions(content): """detect @mentions in raw status content""" if not content: return - for match in re.finditer(rhandle_reading_status, egex.STRICT_USERNAME, content): + for match in re.finditer(regex.STRICT_USERNAME, content): username = match.group().strip().split("@")[1:] if len(username) == 1: # this looks like a local user (@user), fill in the domain From 0a44578987bd685d4851ef748854882be2a0220f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 14:35:26 -0700 Subject: [PATCH 124/130] Disables similarity comparison --- .github/workflows/pylint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index 0286d06e1..1a32940f9 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -20,5 +20,5 @@ jobs: pip install pylint - name: Analysing the code with pylint run: | - pylint bookwyrm/ --ignore=migrations,tests --disable=E1101,E1135,E1136,R0903,R0901,R0902,W0707,W0511,W0406,R0401 + pylint bookwyrm/ --ignore=migrations,tests --disable=E1101,E1135,E1136,R0903,R0901,R0902,W0707,W0511,W0406,R0401,R0801 From c7d14cb9573b7550ff1b9420a614a3b0bb23ba2d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 14:40:28 -0700 Subject: [PATCH 125/130] Fixes regex import in urls file --- bookwyrm/urls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 15e802b54..35540358c 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -7,8 +7,8 @@ from django.views.generic.base import TemplateView from bookwyrm import settings, views from bookwyrm.utils import regex -USER_PATH = r"^user/(?P%s)" % regex.username -LOCAL_USER_PATH = r"^user/(?P%s)" % regex.localname +USER_PATH = r"^user/(?P%s)" % regex.USERNAME +LOCAL_USER_PATH = r"^user/(?P%s)" % regex.LOCALNAME status_types = [ "status", @@ -182,7 +182,7 @@ urlpatterns = [ r"^direct-messages/?$", views.DirectMessage.as_view(), name="direct-messages" ), re_path( - r"^direct-messages/(?P%s)?$" % regex.username, + r"^direct-messages/(?P%s)?$" % regex.USERNAME, views.DirectMessage.as_view(), name="direct-messages-user", ), From d8d6f573732a8af1264d47d02a2abd7893425273 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 15:08:36 -0700 Subject: [PATCH 126/130] Linting fixes for preview image code --- .../commands/generate_preview_images.py | 6 +- bookwyrm/preview_images.py | 269 +++++++++--------- bookwyrm/tests/test_preview_images.py | 4 +- 3 files changed, 146 insertions(+), 133 deletions(-) diff --git a/bookwyrm/management/commands/generate_preview_images.py b/bookwyrm/management/commands/generate_preview_images.py index 6ca26b2d3..c2ceb90fd 100644 --- a/bookwyrm/management/commands/generate_preview_images.py +++ b/bookwyrm/management/commands/generate_preview_images.py @@ -1,12 +1,12 @@ """ Generate preview images """ -import sys - from django.core.management.base import BaseCommand -from bookwyrm import activitystreams, models, settings, preview_images +from bookwyrm import models, preview_images +# pylint: disable=line-too-long class Command(BaseCommand): + """Creates previews for existing objects""" help = "Generate preview images" def add_arguments(self, parser): diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 180162cea..652c58f90 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -1,13 +1,14 @@ -import colorsys +""" Generate social media preview images for twitter/mastodon/etc """ import math import os import textwrap - -from colorthief import ColorThief from io import BytesIO -from PIL import Image, ImageDraw, ImageFont, ImageOps, ImageColor from uuid import uuid4 +import colorsys +from colorthief import ColorThief +from PIL import Image, ImageDraw, ImageFont, ImageOps, ImageColor + from django.core.files.base import ContentFile from django.core.files.uploadedfile import InMemoryUploadedFile from django.db.models import Avg @@ -31,6 +32,7 @@ font_dir = os.path.join(settings.STATIC_ROOT, "fonts/public_sans") def get_font(font_name, size=28): + """Loads custom font""" if font_name == "light": font_path = os.path.join(font_dir, "PublicSans-Light.ttf") if font_name == "regular": @@ -47,6 +49,7 @@ def get_font(font_name, size=28): def generate_texts_layer(texts, content_width): + """Adds text for images""" font_text_zero = get_font("bold", size=20) font_text_one = get_font("bold", size=48) font_text_two = get_font("bold", size=40) @@ -66,7 +69,7 @@ def generate_texts_layer(texts, content_width): try: text_y = text_y + font_text_zero.getsize_multiline(text_zero)[1] + 16 - except: + except (AttributeError, IndexError): text_y = text_y + 26 if "text_one" in texts and texts["text_one"]: @@ -78,7 +81,7 @@ def generate_texts_layer(texts, content_width): try: text_y = text_y + font_text_one.getsize_multiline(text_one)[1] + 16 - except: + except (AttributeError, IndexError): text_y = text_y + 26 if "text_two" in texts and texts["text_two"]: @@ -90,7 +93,7 @@ def generate_texts_layer(texts, content_width): try: text_y = text_y + font_text_one.getsize_multiline(text_two)[1] + 16 - except: + except (AttributeError, IndexError): text_y = text_y + 26 if "text_three" in texts and texts["text_three"]: @@ -105,6 +108,7 @@ def generate_texts_layer(texts, content_width): def generate_instance_layer(content_width): + """Places components for instance preview""" font_instance = get_font("light", size=28) site = models.SiteSettings.objects.get() @@ -145,57 +149,56 @@ def generate_instance_layer(content_width): def generate_rating_layer(rating, content_width): - try: - icon_star_full = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png") - ) - icon_star_empty = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") - ) - icon_star_half = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png") - ) + """Places components for rating preview""" + icon_star_full = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png") + ) + icon_star_empty = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") + ) + icon_star_half = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png") + ) - icon_size = 64 - icon_margin = 10 + icon_size = 64 + icon_margin = 10 - rating_layer_base = Image.new( - "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR - ) - rating_layer_color = Image.new( - "RGBA", (content_width, icon_size), color=TEXT_COLOR - ) - rating_layer_mask = Image.new( - "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR - ) + rating_layer_base = Image.new( + "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR + ) + rating_layer_color = Image.new( + "RGBA", (content_width, icon_size), color=TEXT_COLOR + ) + rating_layer_mask = Image.new( + "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR + ) - position_x = 0 + position_x = 0 - for r in range(math.floor(rating)): - rating_layer_mask.alpha_composite(icon_star_full, (position_x, 0)) - position_x = position_x + icon_size + icon_margin + for _ in range(math.floor(rating)): + rating_layer_mask.alpha_composite(icon_star_full, (position_x, 0)) + position_x = position_x + icon_size + icon_margin - if math.floor(rating) != math.ceil(rating): - rating_layer_mask.alpha_composite(icon_star_half, (position_x, 0)) - position_x = position_x + icon_size + icon_margin + if math.floor(rating) != math.ceil(rating): + rating_layer_mask.alpha_composite(icon_star_half, (position_x, 0)) + position_x = position_x + icon_size + icon_margin - for r in range(5 - math.ceil(rating)): - rating_layer_mask.alpha_composite(icon_star_empty, (position_x, 0)) - position_x = position_x + icon_size + icon_margin + for _ in range(5 - math.ceil(rating)): + rating_layer_mask.alpha_composite(icon_star_empty, (position_x, 0)) + position_x = position_x + icon_size + icon_margin - rating_layer_mask = rating_layer_mask.getchannel("A") - rating_layer_mask = ImageOps.invert(rating_layer_mask) + rating_layer_mask = rating_layer_mask.getchannel("A") + rating_layer_mask = ImageOps.invert(rating_layer_mask) - rating_layer_composite = Image.composite( - rating_layer_base, rating_layer_color, rating_layer_mask - ) + rating_layer_composite = Image.composite( + rating_layer_base, rating_layer_color, rating_layer_mask + ) - return rating_layer_composite - except: - return None + return rating_layer_composite def generate_default_inner_img(): + """Adds cover image""" font_cover = get_font("light", size=28) default_cover = Image.new( @@ -214,16 +217,19 @@ def generate_default_inner_img(): return default_cover +# pylint: disable=too-many-locals def generate_preview_image( - texts={}, picture=None, rating=None, show_instance_layer=True + texts=None, picture=None, rating=None, show_instance_layer=True ): + """Puts everything together""" + texts = texts or {} # Cover try: inner_img_layer = Image.open(picture) inner_img_layer.thumbnail((inner_img_width, inner_img_height), Image.ANTIALIAS) color_thief = ColorThief(picture) dominant_color = color_thief.get_color(quality=1) - except: + except: # pylint: disable=bare-except inner_img_layer = generate_default_inner_img() dominant_color = ImageColor.getrgb(DEFAULT_COVER_COLOR) @@ -246,7 +252,7 @@ def generate_preview_image( image_bg_color_hls[2], ) image_bg_color = tuple( - [math.ceil(x * 255) for x in colorsys.hls_to_rgb(*image_bg_color_hls)] + math.ceil(x * 255) for x in colorsys.hls_to_rgb(*image_bg_color_hls) ) else: image_bg_color = BG_COLOR @@ -292,8 +298,7 @@ def generate_preview_image( # Remove Instance Layer from centering calculations contents_y = contents_y - math.floor((instance_layer.height + gutter) / 2) - if contents_y < margin: - contents_y = margin + contents_y = max(contents_y, margin) # Composite layers img.paste( @@ -305,108 +310,116 @@ def generate_preview_image( def save_and_cleanup(image, instance=None): - if isinstance(instance, (models.Book, models.User, models.SiteSettings)): - file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4())) - image_buffer = BytesIO() - - try: - try: - old_path = instance.preview_image.path - except ValueError: - old_path = "" - - # Save - image.save(image_buffer, format="jpeg", quality=75) - - instance.preview_image = InMemoryUploadedFile( - ContentFile(image_buffer.getvalue()), - "preview_image", - file_name, - "image/jpg", - image_buffer.tell(), - None, - ) - - save_without_broadcast = isinstance(instance, (models.Book, models.User)) - if save_without_broadcast: - result = instance.save(broadcast=False) - else: - instance.save() - - # Clean up old file after saving - if os.path.exists(old_path): - os.remove(old_path) - - finally: - image_buffer.close() - return True - else: + """Save and close the file""" + if not isinstance(instance, (models.Book, models.User, models.SiteSettings)): return False + file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4())) + image_buffer = BytesIO() + + try: + try: + old_path = instance.preview_image.path + except ValueError: + old_path = "" + + # Save + image.save(image_buffer, format="jpeg", quality=75) + + instance.preview_image = InMemoryUploadedFile( + ContentFile(image_buffer.getvalue()), + "preview_image", + file_name, + "image/jpg", + image_buffer.tell(), + None, + ) + + save_without_broadcast = isinstance(instance, (models.Book, models.User)) + if save_without_broadcast: + instance.save(broadcast=False) + else: + instance.save() + + # Clean up old file after saving + if os.path.exists(old_path): + os.remove(old_path) + + finally: + image_buffer.close() + return True +# pylint: disable=invalid-name @app.task def generate_site_preview_image_task(): """generate preview_image for the website""" - if settings.ENABLE_PREVIEW_IMAGES == True: - site = models.SiteSettings.objects.get() + if not settings.ENABLE_PREVIEW_IMAGES: + return - if site.logo: - logo = site.logo - else: - logo = os.path.join(settings.STATIC_ROOT, "images/logo.png") + site = models.SiteSettings.objects.get() - texts = { - "text_zero": settings.DOMAIN, - "text_one": site.name, - "text_three": site.instance_tagline, - } + if site.logo: + logo = site.logo + else: + logo = os.path.join(settings.STATIC_ROOT, "images/logo.png") - image = generate_preview_image( - texts=texts, picture=logo, show_instance_layer=False - ) + texts = { + "text_zero": settings.DOMAIN, + "text_one": site.name, + "text_three": site.instance_tagline, + } - save_and_cleanup(image, instance=site) + image = generate_preview_image( + texts=texts, picture=logo, show_instance_layer=False + ) + + save_and_cleanup(image, instance=site) +# pylint: disable=invalid-name @app.task def generate_edition_preview_image_task(book_id): """generate preview_image for a book""" - if settings.ENABLE_PREVIEW_IMAGES == True: - book = models.Book.objects.select_subclasses().get(id=book_id) + if not settings.ENABLE_PREVIEW_IMAGES: + return - rating = models.Review.objects.filter( - privacy="public", - deleted=False, - book__in=[book_id], - ).aggregate(Avg("rating"))["rating__avg"] + book = models.Book.objects.select_subclasses().get(id=book_id) - texts = { - "text_one": book.title, - "text_two": book.subtitle, - "text_three": book.author_text, - } + rating = models.Review.objects.filter( + privacy="public", + deleted=False, + book__in=[book_id], + ).aggregate(Avg("rating"))["rating__avg"] - image = generate_preview_image(texts=texts, picture=book.cover, rating=rating) + texts = { + "text_one": book.title, + "text_two": book.subtitle, + "text_three": book.author_text, + } - save_and_cleanup(image, instance=book) + image = generate_preview_image(texts=texts, picture=book.cover, rating=rating) + + save_and_cleanup(image, instance=book) @app.task def generate_user_preview_image_task(user_id): """generate preview_image for a book""" - if settings.ENABLE_PREVIEW_IMAGES == True: - user = models.User.objects.get(id=user_id) + if not settings.ENABLE_PREVIEW_IMAGES: + return - texts = { - "text_one": user.display_name, - "text_three": "@{}@{}".format(user.localname, settings.DOMAIN), - } + user = models.User.objects.get(id=user_id) - if user.avatar: - avatar = user.avatar - else: - avatar = os.path.join(settings.STATIC_ROOT, "images/default_avi.jpg") + texts = { + "text_one": user.display_name, + "text_three": "@{}@{}".format(user.localname, settings.DOMAIN), + } - image = generate_preview_image(texts=texts, picture=avatar) + if user.avatar: + avatar = user.avatar + else: + avatar = os.path.join(settings.STATIC_ROOT, "images/default_avi.jpg") - save_and_cleanup(image, instance=user) + image = generate_preview_image(texts=texts, picture=avatar) + + save_and_cleanup(image, instance=user) diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index c65615e8a..ac9e3f1c5 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -18,9 +18,9 @@ from bookwyrm.preview_images import ( save_and_cleanup, ) -import logging - +# pylint: disable=unused-argument +# pylint: disable=missing-function-docstring class PreviewImages(TestCase): """every response to a get request, html or json""" From 59938e2d4609a4535c38c0cc945428848a1e4c68 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 15:24:10 -0700 Subject: [PATCH 127/130] Linter fixes for models --- .github/workflows/black.yml | 2 +- bookwyrm/management/commands/generate_preview_images.py | 1 + bookwyrm/models/book.py | 8 +++++--- bookwyrm/models/site.py | 8 +++++--- bookwyrm/models/user.py | 7 +++++-- bookwyrm/preview_images.py | 8 ++------ 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 25af1e08d..1b539f3b0 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -1,4 +1,4 @@ -name: Lint Python +name: Python Formmating (run ./bw-dev black to fix) on: [push, pull_request] diff --git a/bookwyrm/management/commands/generate_preview_images.py b/bookwyrm/management/commands/generate_preview_images.py index c2ceb90fd..df2186238 100644 --- a/bookwyrm/management/commands/generate_preview_images.py +++ b/bookwyrm/management/commands/generate_preview_images.py @@ -7,6 +7,7 @@ from bookwyrm import models, preview_images # pylint: disable=line-too-long class Command(BaseCommand): """Creates previews for existing objects""" + help = "Generate preview images" def add_arguments(self, parser): diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 91ebbc463..d79ce206d 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -8,8 +8,7 @@ from model_utils.managers import InheritanceManager from bookwyrm import activitypub from bookwyrm.preview_images import generate_edition_preview_image_task -from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE -from bookwyrm.tasks import app +from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE, ENABLE_PREVIEW_IMAGES from .activitypub_mixin import OrderedCollectionPageMixin, ObjectMixin from .base_model import BookWyrmModel @@ -303,9 +302,12 @@ def isbn_13_to_10(isbn_13): return converted + str(checkdigit) -@receiver(models.signals.post_save, sender=Edition) # pylint: disable=unused-argument +@receiver(models.signals.post_save, sender=Edition) def preview_image(instance, *args, **kwargs): + """create preview image on book create""" + if not ENABLE_PREVIEW_IMAGES: + return changed_fields = {} if instance.field_tracker: changed_fields = instance.field_tracker.changed() diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index 670816942..872f6b454 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -9,8 +9,7 @@ from django.utils import timezone from model_utils import FieldTracker from bookwyrm.preview_images import generate_site_preview_image_task -from bookwyrm.settings import DOMAIN -from bookwyrm.tasks import app +from bookwyrm.settings import DOMAIN, ENABLE_PREVIEW_IMAGES from .base_model import BookWyrmModel from .user import User @@ -130,9 +129,12 @@ class PasswordReset(models.Model): return "https://{}/password-reset/{}".format(DOMAIN, self.code) -@receiver(models.signals.post_save, sender=SiteSettings) # pylint: disable=unused-argument +@receiver(models.signals.post_save, sender=SiteSettings) def preview_image(instance, *args, **kwargs): + """Update image preview for the default site image""" + if not ENABLE_PREVIEW_IMAGES: + return changed_fields = instance.field_tracker.changed() if len(changed_fields) > 0: diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index 1519b7875..49458a2e0 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -17,7 +17,7 @@ from bookwyrm.connectors import get_data, ConnectorException from bookwyrm.models.shelf import Shelf from bookwyrm.models.status import Status, Review from bookwyrm.preview_images import generate_user_preview_image_task -from bookwyrm.settings import DOMAIN +from bookwyrm.settings import DOMAIN, ENABLE_PREVIEW_IMAGES from bookwyrm.signatures import create_key_pair from bookwyrm.tasks import app from bookwyrm.utils import regex @@ -452,9 +452,12 @@ def get_remote_reviews(outbox): activitypub.Review(**activity).to_model() -@receiver(models.signals.post_save, sender=User) # pylint: disable=unused-argument +@receiver(models.signals.post_save, sender=User) def preview_image(instance, *args, **kwargs): + """create preview images when user is updated""" + if not ENABLE_PREVIEW_IMAGES: + return changed_fields = instance.field_tracker.changed() if len(changed_fields) > 0: diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 652c58f90..3be01bd92 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -166,9 +166,7 @@ def generate_rating_layer(rating, content_width): rating_layer_base = Image.new( "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR ) - rating_layer_color = Image.new( - "RGBA", (content_width, icon_size), color=TEXT_COLOR - ) + rating_layer_color = Image.new("RGBA", (content_width, icon_size), color=TEXT_COLOR) rating_layer_mask = Image.new( "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR ) @@ -369,9 +367,7 @@ def generate_site_preview_image_task(): "text_three": site.instance_tagline, } - image = generate_preview_image( - texts=texts, picture=logo, show_instance_layer=False - ) + image = generate_preview_image(texts=texts, picture=logo, show_instance_layer=False) save_and_cleanup(image, instance=site) From 60626eaca1bc97be0d1ff0087ec66a0d11042b26 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 15:28:43 -0700 Subject: [PATCH 128/130] Catches straggler preview_image signal --- bookwyrm/models/status.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index 81c73bf52..3c25f1af8 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -13,6 +13,7 @@ from model_utils.managers import InheritanceManager from bookwyrm import activitypub from bookwyrm.preview_images import generate_edition_preview_image_task +from bookwyrm.settings import ENABLE_PREVIEW_IMAGES from .activitypub_mixin import ActivitypubMixin, ActivityMixin from .activitypub_mixin import OrderedCollectionPageMixin from .base_model import BookWyrmModel @@ -405,12 +406,15 @@ class Boost(ActivityMixin, Status): # unique_together = ('user', 'boosted_status') -@receiver(models.signals.post_save) # pylint: disable=unused-argument +@receiver(models.signals.post_save) def preview_image(instance, sender, *args, **kwargs): - if sender in (Review, ReviewRating): - changed_fields = instance.field_tracker.changed() + """Updates book previews if the rating has changed""" + if not ENABLE_PREVIEW_IMAGES or sender not in (Review, ReviewRating): + return - if len(changed_fields) > 0: - edition = instance.book - generate_edition_preview_image_task.delay(edition.id) + changed_fields = instance.field_tracker.changed() + + if len(changed_fields) > 0: + edition = instance.book + generate_edition_preview_image_task.delay(edition.id) From 491d68353d13a1fdde0bb6f2464940ef2f25dc63 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 15:29:34 -0700 Subject: [PATCH 129/130] Fixes typo in black command --- .github/workflows/black.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 1b539f3b0..fb681dcd5 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -1,4 +1,4 @@ -name: Python Formmating (run ./bw-dev black to fix) +name: Python Formatting (run ./bw-dev black to fix) on: [push, pull_request] From 8e7c43baa75b89a5b2e1415e0a862e565e4fcad1 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Jun 2021 15:58:21 -0700 Subject: [PATCH 130/130] Fixes preview tests --- bookwyrm/preview_images.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 3be01bd92..510625e39 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -150,15 +150,18 @@ def generate_instance_layer(content_width): def generate_rating_layer(rating, content_width): """Places components for rating preview""" - icon_star_full = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png") - ) - icon_star_empty = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") - ) - icon_star_half = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png") - ) + try: + icon_star_full = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png") + ) + icon_star_empty = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") + ) + icon_star_half = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png") + ) + except FileNotFoundError: + return None icon_size = 64 icon_margin = 10