From 6d1d62cf2f388040fd618cacdcf30a79059a18b5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 25 Feb 2022 11:50:25 -0800
Subject: [PATCH 01/11] View for starting to edit a book with existing data

---
 bookwyrm/views/books/edit_book.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py
index 755c25b4..0b81acf8 100644
--- a/bookwyrm/views/books/edit_book.py
+++ b/bookwyrm/views/books/edit_book.py
@@ -9,6 +9,7 @@ from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.datastructures import MultiValueDictKeyError
 from django.utils.decorators import method_decorator
+from django.views.decorators.http import require_POST
 from django.views import View
 
 from bookwyrm import book_search, forms, models
@@ -145,6 +146,15 @@ class EditBook(View):
         return redirect(f"/book/{book.id}")
 
 
+@require_POST
+@permission_required("bookwyrm.edit_book", raise_exception=True)
+def create_book_from_data(request):
+    """create a book with starter data"""
+    data = {"form": forms.EditionForm(request.POST)}
+    return TemplateResponse(request, "book/edit/edit_book.html", data)
+
+
+
 @method_decorator(login_required, name="dispatch")
 @method_decorator(
     permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch"

From 1d99e455e83caac8804ff0a809d0002816b982b7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 25 Feb 2022 16:40:21 -0800
Subject: [PATCH 02/11] Adds link to add edition to editions page

---
 .../templates/book/editions/editions.html     | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/editions/editions.html b/bookwyrm/templates/book/editions/editions.html
index a3ff0802..5d674d47 100644
--- a/bookwyrm/templates/book/editions/editions.html
+++ b/bookwyrm/templates/book/editions/editions.html
@@ -46,7 +46,25 @@
     {% endfor %}
 </div>
 
-<div>
+<div class="block">
     {% include 'snippets/pagination.html' with page=editions path=request.path %}
 </div>
+
+<div class="block has-text-centered help">
+    <p>
+        {% trans "Can't find the edition you're looking for?" %}
+    </p>
+
+    <form action="{% url 'create-book-data' %}" method="POST" name="add-edition-form">
+        {% csrf_token %}
+        {{ work_form }}
+        <input type="hidden" name="parent_work" value="{{ work.id }}">
+        <div>
+            <button class="button is-small" type="submit">
+                {% trans "Add another edition" %}
+            </button>
+        </div>
+    </form>
+</div>
+
 {% endblock %}

From c67f92af465fc12473bc9becbe3a4520c2efd346 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 25 Feb 2022 16:40:34 -0800
Subject: [PATCH 03/11] Add editions view

---
 bookwyrm/forms.py                             |  27 ++-
 bookwyrm/templates/book/edit/edit_book.html   |  16 +-
 .../templates/book/edit/edit_book_form.html   |   5 +
 bookwyrm/urls.py                              |   3 +-
 bookwyrm/views/__init__.py                    |   2 +-
 bookwyrm/views/books/edit_book.py             | 217 ++++++++++++------
 bookwyrm/views/books/editions.py              |   3 +-
 7 files changed, 196 insertions(+), 77 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 7ae4e446..9e694156 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -264,17 +264,40 @@ class FileLinkForm(CustomForm):
                 )
 
 
+class EditionFromWorkForm(CustomForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # make all fields hidden
+        for visible in self.visible_fields():
+            visible.field.widget = forms.HiddenInput()
+
+    class Meta:
+        model = models.Work
+        fields = [
+            "title",
+            "subtitle",
+            "authors",
+            "description",
+            "languages",
+            "series",
+            "series_number",
+            "subjects",
+            "subject_places",
+            "cover",
+            "first_published_date",
+        ]
+
 class EditionForm(CustomForm):
     class Meta:
         model = models.Edition
         exclude = [
+            "authors",
+            "parent_work",
             "remote_id",
             "origin_id",
             "created_date",
             "updated_date",
             "edition_rank",
-            "authors",
-            "parent_work",
             "shelves",
             "connector",
             "search_vector",
diff --git a/bookwyrm/templates/book/edit/edit_book.html b/bookwyrm/templates/book/edit/edit_book.html
index 3d41058e..79ed1cc0 100644
--- a/bookwyrm/templates/book/edit/edit_book.html
+++ b/bookwyrm/templates/book/edit/edit_book.html
@@ -3,18 +3,24 @@
 {% load humanize %}
 {% load utilities %}
 
-{% block title %}{% if book %}{% blocktrans with book_title=book.title %}Edit "{{ book_title }}"{% endblocktrans %}{% else %}{% trans "Add Book" %}{% endif %}{% endblock %}
+{% block title %}
+    {% if book.title %}
+        {% blocktrans with book_title=book.title %}Edit "{{ book_title }}"{% endblocktrans %}
+    {% else %}
+        {% trans "Add Book" %}
+    {% endif %}
+{% endblock %}
 
 {% block content %}
 <header class="block">
     <h1 class="title level-left">
-        {% if book %}
+        {% if book.title %}
         {% blocktrans with book_title=book.title %}Edit "{{ book_title }}"{% endblocktrans %}
         {% else %}
         {% trans "Add Book" %}
         {% endif %}
     </h1>
-    {% if book %}
+    {% if book.created_date %}
     <dl>
         <dt class="is-pulled-left mr-5 has-text-weight-semibold">{% trans "Added:" %}</dt>
         <dd class="ml-2">{{ book.created_date | naturaltime }}</dd>
@@ -33,7 +39,7 @@
 
 <form
     class="block"
-    {% if book %}
+    {% if book.id %}
         name="edit-book"
         action="{{ book.local_path }}/{% if confirm_mode %}confirm{% else %}edit{% endif %}"
     {% else %}
@@ -119,7 +125,7 @@
     {% if not confirm_mode %}
     <div class="block">
         <button class="button is-primary" type="submit">{% trans "Save" %}</button>
-        {% if book %}
+        {% if book.id %}
         <a class="button" href="{{ book.local_path }}">{% trans "Cancel" %}</a>
         {% else %}
         <a href="/" class="button" data-back>
diff --git a/bookwyrm/templates/book/edit/edit_book_form.html b/bookwyrm/templates/book/edit/edit_book_form.html
index fd2516a6..e2d7121f 100644
--- a/bookwyrm/templates/book/edit/edit_book_form.html
+++ b/bookwyrm/templates/book/edit/edit_book_form.html
@@ -9,6 +9,8 @@
 {% csrf_token %}
 
 <input type="hidden" name="last_edited_by" value="{{ request.user.id }}">
+<input type="hidden" name="parent_work" value="{% firstof book.parent_work.id form.parent_work %}">
+
 <div class="columns">
     <div class="column is-half">
         <section class="block">
@@ -123,8 +125,11 @@
             </h2>
             <div class="box">
                 {% if book.authors.exists %}
+                {# preserve authors if the book is unsaved #}
+                {{ form.authors.as_hidden }}
                 <fieldset>
                     {% for author in book.authors.all %}
+                    {{ form.authors.as_hidden }}
                     <div class="is-flex is-justify-content-space-between">
                         <label class="label mb-2">
                             <input type="checkbox" name="remove_authors" value="{{ author.id }}" {% if author.id|stringformat:"i" in remove_authors %}checked{% endif %} aria-describedby="desc_remove_author_{{author.id}}">
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index d2caa76e..3826f062 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -496,7 +496,8 @@ urlpatterns = [
     ),
     re_path(rf"{BOOK_PATH}/edit/?$", views.EditBook.as_view(), name="edit-book"),
     re_path(rf"{BOOK_PATH}/confirm/?$", views.ConfirmEditBook.as_view()),
-    re_path(r"^create-book/?$", views.EditBook.as_view(), name="create-book"),
+    re_path(r"^create-book/data/?$", views.create_book_from_data, name="create-book-data"),
+    re_path(r"^create-book/?$", views.CreateBook.as_view(), name="create-book"),
     re_path(r"^create-book/confirm/?$", views.ConfirmEditBook.as_view()),
     re_path(rf"{BOOK_PATH}/editions(.json)?/?$", views.Editions.as_view()),
     re_path(
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 76e9ff02..2bf08d87 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -37,7 +37,7 @@ from .books.books import (
     resolve_book,
 )
 from .books.books import update_book_from_remote
-from .books.edit_book import EditBook, ConfirmEditBook
+from .books.edit_book import EditBook, ConfirmEditBook, CreateBook, create_book_from_data
 from .books.editions import Editions, switch_edition
 from .books.links import BookFileLinks, AddFileLink, delete_link
 
diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py
index 0b81acf8..bef2fbb3 100644
--- a/bookwyrm/views/books/edit_book.py
+++ b/bookwyrm/views/books/edit_book.py
@@ -1,5 +1,5 @@
 """ the good stuff! the books! """
-from re import sub
+from re import sub, findall
 from dateutil.parser import parse as dateparse
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.postgres.search import SearchRank, SearchVector
@@ -31,18 +31,16 @@ from .books import set_cover_from_url
 class EditBook(View):
     """edit a book"""
 
-    def get(self, request, book_id=None):
+    def get(self, request, book_id):
         """info about a book"""
-        book = None
-        if book_id:
-            book = get_edition(book_id)
-            if not book.description:
-                book.description = book.parent_work.description
+        book = get_edition(book_id)
+        if not book.description:
+            book.description = book.parent_work.description
         data = {"book": book, "form": forms.EditionForm(instance=book)}
         return TemplateResponse(request, "book/edit/edit_book.html", data)
 
     # pylint: disable=too-many-locals
-    def post(self, request, book_id=None):
+    def post(self, request, book_id):
         """edit a book cool"""
         # returns None if no match is found
         book = models.Edition.objects.filter(id=book_id).first()
@@ -50,66 +48,13 @@ class EditBook(View):
 
         data = {"book": book, "form": form}
         if not form.is_valid():
+            print("FORM NOT VALID", form.errors)
             return TemplateResponse(request, "book/edit/edit_book.html", data)
 
-        # filter out empty author fields
-        add_author = [author for author in request.POST.getlist("add_author") if author]
-        if add_author:
-            data["add_author"] = add_author
-            data["author_matches"] = []
-            data["isni_matches"] = []
-
-            for author in add_author:
-                if not author:
-                    continue
-                # check for existing authors
-                vector = SearchVector("name", weight="A") + SearchVector(
-                    "aliases", weight="B"
-                )
-
-                author_matches = (
-                    models.Author.objects.annotate(search=vector)
-                    .annotate(rank=SearchRank(vector, author))
-                    .filter(rank__gt=0.4)
-                    .order_by("-rank")[:5]
-                )
-
-                isni_authors = find_authors_by_name(
-                    author, description=True
-                )  # find matches from ISNI API
-
-                # dedupe isni authors we already have in the DB
-                exists = [
-                    i
-                    for i in isni_authors
-                    for a in author_matches
-                    if sub(r"\D", "", str(i.isni)) == sub(r"\D", "", str(a.isni))
-                ]
-
-                # pylint: disable=cell-var-from-loop
-                matches = list(filter(lambda x: x not in exists, isni_authors))
-                # combine existing and isni authors
-                matches.extend(author_matches)
-
-                data["author_matches"].append(
-                    {
-                        "name": author.strip(),
-                        "matches": matches,
-                        "existing_isnis": exists,
-                    }
-                )
-
-        # we're creating a new book
-        if not book:
-            # check if this is an edition of an existing work
-            author_text = book.author_text if book else add_author
-            data["book_matches"] = book_search.search(
-                f'{form.cleaned_data.get("title")} {author_text}',
-                min_confidence=0.5,
-            )[:5]
+        data = add_authors(request, data)
 
         # either of the above cases requires additional confirmation
-        if add_author or not book:
+        if data.get("add_author"):
             # creting a book or adding an author to a book needs another step
             data["confirm_mode"] = True
             # this isn't preserved because it isn't part of the form obj
@@ -137,6 +82,85 @@ class EditBook(View):
             book.authors.remove(author_id)
 
         book = form.save(commit=False)
+
+        url = request.POST.get("cover-url")
+        if url:
+            image = set_cover_from_url(url)
+            if image:
+                book.cover.save(*image, save=False)
+
+        book.save()
+        return redirect(f"/book/{book.id}")
+
+
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch"
+)
+class CreateBook(View):
+    """brand new book"""
+
+    def get(self, request):
+        """info about a book"""
+        data = {"form": forms.EditionForm()}
+        return TemplateResponse(request, "book/edit/edit_book.html", data)
+
+    # pylint: disable=too-many-locals
+    def post(self, request):
+        """create a new book"""
+        # returns None if no match is found
+        form = forms.EditionForm(request.POST, request.FILES)
+
+        data = {"form": form}
+        if not form.is_valid():
+            print(form.errors)
+            return TemplateResponse(request, "book/edit/edit_book.html", data)
+
+        data = add_authors(request, data)
+        author_text = ", ".join(data.get("add_author", []))
+
+        # check if this is an edition of an existing work
+        data["book_matches"] = book_search.search(
+            f'{form.cleaned_data.get("title")} {author_text}',
+            min_confidence=0.1,
+        )[:5]
+
+        parent_work_id = request.POST.get("parent_work")
+        if not parent_work_id or data.get("add_authors"):
+            # creting a book or adding an author to a book needs another step
+            data["confirm_mode"] = True
+            # this isn't preserved because it isn't part of the form obj
+            data["remove_authors"] = request.POST.getlist("remove_authors")
+            data["cover_url"] = request.POST.get("cover-url")
+
+            # make sure the dates are passed in as datetime, they're currently a string
+            # QueryDicts are immutable, we need to copy
+            formcopy = data["form"].data.copy()
+            formcopy["parent_work"] = parent_work_id
+            try:
+                formcopy["first_published_date"] = dateparse(
+                    formcopy["first_published_date"]
+                )
+            except (MultiValueDictKeyError, ValueError):
+                pass
+            try:
+                formcopy["published_date"] = dateparse(formcopy["published_date"])
+            except (MultiValueDictKeyError, ValueError):
+                pass
+            data["form"].data = formcopy
+            return TemplateResponse(request, "book/edit/edit_book.html", data)
+
+        book = form.save(commit=False)
+        parent_work = get_object_or_404(models.Work, id=parent_work_id)
+        book.parent_work = parent_work
+
+        if request.POST.get("authors"):
+            author_ids = findall(r"\d+", request.POST["authors"])
+            # django can't parse the authors form element
+            book.authors.add(
+                *models.Author.objects.filter(id__in=author_ids)
+            )
+
         url = request.POST.get("cover-url")
         if url:
             image = set_cover_from_url(url)
@@ -145,14 +169,73 @@ class EditBook(View):
         book.save()
         return redirect(f"/book/{book.id}")
 
+def add_authors(request, data):
+    """helper for adding authors"""
+    add_author = [author for author in request.POST.getlist("add_author") if author]
+    if not add_author:
+        return data
+
+    data["add_author"] = add_author
+    data["author_matches"] = []
+    data["isni_matches"] = []
+
+    for author in add_author:
+        # filter out empty author fields
+        if not author:
+            continue
+        # check for existing authors
+        vector = SearchVector("name", weight="A") + SearchVector(
+            "aliases", weight="B"
+        )
+
+        author_matches = (
+            models.Author.objects.annotate(search=vector)
+            .annotate(rank=SearchRank(vector, author))
+            .filter(rank__gt=0.4)
+            .order_by("-rank")[:5]
+        )
+
+        isni_authors = find_authors_by_name(
+            author, description=True
+        )  # find matches from ISNI API
+
+        # dedupe isni authors we already have in the DB
+        exists = [
+            i
+            for i in isni_authors
+            for a in author_matches
+            if sub(r"\D", "", str(i.isni)) == sub(r"\D", "", str(a.isni))
+        ]
+
+        # pylint: disable=cell-var-from-loop
+        matches = list(filter(lambda x: x not in exists, isni_authors))
+        # combine existing and isni authors
+        matches.extend(author_matches)
+
+        data["author_matches"].append(
+            {
+                "name": author.strip(),
+                "matches": matches,
+                "existing_isnis": exists,
+            }
+        )
+        return data
+
 
 @require_POST
 @permission_required("bookwyrm.edit_book", raise_exception=True)
 def create_book_from_data(request):
     """create a book with starter data"""
-    data = {"form": forms.EditionForm(request.POST)}
-    return TemplateResponse(request, "book/edit/edit_book.html", data)
+    author_ids = findall(r"\d+", request.POST.get("authors"))
+    book = {
+        "parent_work": {"id": request.POST.get("parent_work")},
+        "authors": models.Author.objects.filter(
+            id__in=author_ids
+        ).all(),
+    }
 
+    data = {"book": book, "form": forms.EditionForm(request.POST)}
+    return TemplateResponse(request, "book/edit/edit_book.html", data)
 
 
 @method_decorator(login_required, name="dispatch")
@@ -211,7 +294,7 @@ class ConfirmEditBook(View):
                 book.authors.add(author)
 
             # create work, if needed
-            if not book_id:
+            if not book.parent_work:
                 work_match = request.POST.get("parent_work")
                 if work_match and work_match != "0":
                     work = get_object_or_404(models.Work, id=work_match)
diff --git a/bookwyrm/views/books/editions.py b/bookwyrm/views/books/editions.py
index 81d07322..9f7bf8af 100644
--- a/bookwyrm/views/books/editions.py
+++ b/bookwyrm/views/books/editions.py
@@ -11,7 +11,7 @@ from django.template.response import TemplateResponse
 from django.views import View
 from django.views.decorators.http import require_POST
 
-from bookwyrm import models
+from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH
 from bookwyrm.views.helpers import is_api_request
@@ -61,6 +61,7 @@ class Editions(View):
         data = {
             "editions": paginated.get_page(request.GET.get("page")),
             "work": work,
+            "work_form": forms.EditionFromWorkForm(instance=work),
             "languages": languages,
             "formats": set(
                 e.physical_format.lower() for e in editions if e.physical_format

From b001c31f973706d95291b352e0d32f81a9d3b2af Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 25 Feb 2022 16:54:03 -0800
Subject: [PATCH 04/11] Save author along with added edition

---
 bookwyrm/templates/book/edit/edit_book_form.html | 3 +--
 bookwyrm/views/books/edit_book.py                | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/book/edit/edit_book_form.html b/bookwyrm/templates/book/edit/edit_book_form.html
index e2d7121f..8fcc07fe 100644
--- a/bookwyrm/templates/book/edit/edit_book_form.html
+++ b/bookwyrm/templates/book/edit/edit_book_form.html
@@ -126,10 +126,9 @@
             <div class="box">
                 {% if book.authors.exists %}
                 {# preserve authors if the book is unsaved #}
-                {{ form.authors.as_hidden }}
+                <input type="hidden" name="authors" value="{% for author in book.authors %}{{ author.id }},{% endfor %}">
                 <fieldset>
                     {% for author in book.authors.all %}
-                    {{ form.authors.as_hidden }}
                     <div class="is-flex is-justify-content-space-between">
                         <label class="label mb-2">
                             <input type="checkbox" name="remove_authors" value="{{ author.id }}" {% if author.id|stringformat:"i" in remove_authors %}checked{% endif %} aria-describedby="desc_remove_author_{{author.id}}">
diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py
index bef2fbb3..16d9d78e 100644
--- a/bookwyrm/views/books/edit_book.py
+++ b/bookwyrm/views/books/edit_book.py
@@ -150,7 +150,7 @@ class CreateBook(View):
             data["form"].data = formcopy
             return TemplateResponse(request, "book/edit/edit_book.html", data)
 
-        book = form.save(commit=False)
+        book = form.save()
         parent_work = get_object_or_404(models.Work, id=parent_work_id)
         book.parent_work = parent_work
 

From 29a6d74ff241e3acdc96e3362d2593d0829b8f62 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 25 Feb 2022 17:23:13 -0800
Subject: [PATCH 05/11] Python formatting

---
 bookwyrm/forms.py                 |  1 +
 bookwyrm/urls.py                  |  4 +++-
 bookwyrm/views/__init__.py        |  7 ++++++-
 bookwyrm/views/books/edit_book.py | 13 ++++---------
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 9e694156..47a57466 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -287,6 +287,7 @@ class EditionFromWorkForm(CustomForm):
             "first_published_date",
         ]
 
+
 class EditionForm(CustomForm):
     class Meta:
         model = models.Edition
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 3826f062..fcdc1fe7 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -496,7 +496,9 @@ urlpatterns = [
     ),
     re_path(rf"{BOOK_PATH}/edit/?$", views.EditBook.as_view(), name="edit-book"),
     re_path(rf"{BOOK_PATH}/confirm/?$", views.ConfirmEditBook.as_view()),
-    re_path(r"^create-book/data/?$", views.create_book_from_data, name="create-book-data"),
+    re_path(
+        r"^create-book/data/?$", views.create_book_from_data, name="create-book-data"
+    ),
     re_path(r"^create-book/?$", views.CreateBook.as_view(), name="create-book"),
     re_path(r"^create-book/confirm/?$", views.ConfirmEditBook.as_view()),
     re_path(rf"{BOOK_PATH}/editions(.json)?/?$", views.Editions.as_view()),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 2bf08d87..6d8247ca 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -37,7 +37,12 @@ from .books.books import (
     resolve_book,
 )
 from .books.books import update_book_from_remote
-from .books.edit_book import EditBook, ConfirmEditBook, CreateBook, create_book_from_data
+from .books.edit_book import (
+    EditBook,
+    ConfirmEditBook,
+    CreateBook,
+    create_book_from_data,
+)
 from .books.editions import Editions, switch_edition
 from .books.links import BookFileLinks, AddFileLink, delete_link
 
diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py
index 16d9d78e..a6afaea7 100644
--- a/bookwyrm/views/books/edit_book.py
+++ b/bookwyrm/views/books/edit_book.py
@@ -157,9 +157,7 @@ class CreateBook(View):
         if request.POST.get("authors"):
             author_ids = findall(r"\d+", request.POST["authors"])
             # django can't parse the authors form element
-            book.authors.add(
-                *models.Author.objects.filter(id__in=author_ids)
-            )
+            book.authors.add(*models.Author.objects.filter(id__in=author_ids))
 
         url = request.POST.get("cover-url")
         if url:
@@ -169,6 +167,7 @@ class CreateBook(View):
         book.save()
         return redirect(f"/book/{book.id}")
 
+
 def add_authors(request, data):
     """helper for adding authors"""
     add_author = [author for author in request.POST.getlist("add_author") if author]
@@ -184,9 +183,7 @@ def add_authors(request, data):
         if not author:
             continue
         # check for existing authors
-        vector = SearchVector("name", weight="A") + SearchVector(
-            "aliases", weight="B"
-        )
+        vector = SearchVector("name", weight="A") + SearchVector("aliases", weight="B")
 
         author_matches = (
             models.Author.objects.annotate(search=vector)
@@ -229,9 +226,7 @@ def create_book_from_data(request):
     author_ids = findall(r"\d+", request.POST.get("authors"))
     book = {
         "parent_work": {"id": request.POST.get("parent_work")},
-        "authors": models.Author.objects.filter(
-            id__in=author_ids
-        ).all(),
+        "authors": models.Author.objects.filter(id__in=author_ids).all(),
     }
 
     data = {"book": book, "form": forms.EditionForm(request.POST)}

From eea7d9d4e558beafee81f1bbaa8b0958e4961108 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 25 Feb 2022 17:55:30 -0800
Subject: [PATCH 06/11] Retain author across saves

---
 bookwyrm/views/books/edit_book.py | 125 +++++++++++++++---------------
 1 file changed, 62 insertions(+), 63 deletions(-)

diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py
index a6afaea7..f1f5e666 100644
--- a/bookwyrm/views/books/edit_book.py
+++ b/bookwyrm/views/books/edit_book.py
@@ -39,42 +39,20 @@ class EditBook(View):
         data = {"book": book, "form": forms.EditionForm(instance=book)}
         return TemplateResponse(request, "book/edit/edit_book.html", data)
 
-    # pylint: disable=too-many-locals
     def post(self, request, book_id):
         """edit a book cool"""
-        # returns None if no match is found
-        book = models.Edition.objects.filter(id=book_id).first()
+        book = get_object_or_404(models.Edition, id=book_id)
         form = forms.EditionForm(request.POST, request.FILES, instance=book)
 
         data = {"book": book, "form": form}
         if not form.is_valid():
-            print("FORM NOT VALID", form.errors)
             return TemplateResponse(request, "book/edit/edit_book.html", data)
 
         data = add_authors(request, data)
 
         # either of the above cases requires additional confirmation
         if data.get("add_author"):
-            # creting a book or adding an author to a book needs another step
-            data["confirm_mode"] = True
-            # this isn't preserved because it isn't part of the form obj
-            data["remove_authors"] = request.POST.getlist("remove_authors")
-            data["cover_url"] = request.POST.get("cover-url")
-
-            # make sure the dates are passed in as datetime, they're currently a string
-            # QueryDicts are immutable, we need to copy
-            formcopy = data["form"].data.copy()
-            try:
-                formcopy["first_published_date"] = dateparse(
-                    formcopy["first_published_date"]
-                )
-            except (MultiValueDictKeyError, ValueError):
-                pass
-            try:
-                formcopy["published_date"] = dateparse(formcopy["published_date"])
-            except (MultiValueDictKeyError, ValueError):
-                pass
-            data["form"].data = formcopy
+            data = copy_form(data)
             return TemplateResponse(request, "book/edit/edit_book.html", data)
 
         remove_authors = request.POST.getlist("remove_authors")
@@ -110,64 +88,72 @@ class CreateBook(View):
         """create a new book"""
         # returns None if no match is found
         form = forms.EditionForm(request.POST, request.FILES)
-
         data = {"form": form}
+
+        # collect data provided by the work or import item
+        parent_work_id = request.POST.get("parent_work")
+        authors = None
+        if request.POST.get("authors"):
+            author_ids = findall(r"\d+", request.POST["authors"])
+            authors = models.Author.objects.filter(id__in=author_ids)
+
+        # fake book in case we need to keep editing
+        if parent_work_id:
+            data["book"] = {
+                "parent_work": {"id": parent_work_id},
+                "authors": authors,
+            }
+
         if not form.is_valid():
-            print(form.errors)
             return TemplateResponse(request, "book/edit/edit_book.html", data)
 
         data = add_authors(request, data)
-        author_text = ", ".join(data.get("add_author", []))
 
         # check if this is an edition of an existing work
+        author_text = ", ".join(data.get("add_author", []))
         data["book_matches"] = book_search.search(
             f'{form.cleaned_data.get("title")} {author_text}',
             min_confidence=0.1,
         )[:5]
 
-        parent_work_id = request.POST.get("parent_work")
-        if not parent_work_id or data.get("add_authors"):
-            # creting a book or adding an author to a book needs another step
-            data["confirm_mode"] = True
-            # this isn't preserved because it isn't part of the form obj
-            data["remove_authors"] = request.POST.getlist("remove_authors")
-            data["cover_url"] = request.POST.get("cover-url")
-
-            # make sure the dates are passed in as datetime, they're currently a string
-            # QueryDicts are immutable, we need to copy
-            formcopy = data["form"].data.copy()
-            formcopy["parent_work"] = parent_work_id
-            try:
-                formcopy["first_published_date"] = dateparse(
-                    formcopy["first_published_date"]
-                )
-            except (MultiValueDictKeyError, ValueError):
-                pass
-            try:
-                formcopy["published_date"] = dateparse(formcopy["published_date"])
-            except (MultiValueDictKeyError, ValueError):
-                pass
-            data["form"].data = formcopy
+        # go to confirm mode
+        if not parent_work_id or data.get("add_author"):
+            data = copy_form(data)
             return TemplateResponse(request, "book/edit/edit_book.html", data)
 
-        book = form.save()
-        parent_work = get_object_or_404(models.Work, id=parent_work_id)
-        book.parent_work = parent_work
+        with transaction.atomic():
+            book = form.save()
+            parent_work = get_object_or_404(models.Work, id=parent_work_id)
+            book.parent_work = parent_work
 
-        if request.POST.get("authors"):
-            author_ids = findall(r"\d+", request.POST["authors"])
-            # django can't parse the authors form element
-            book.authors.add(*models.Author.objects.filter(id__in=author_ids))
+            if authors:
+                book.authors.add(*authors)
 
-        url = request.POST.get("cover-url")
-        if url:
-            image = set_cover_from_url(url)
-            if image:
-                book.cover.save(*image, save=False)
-        book.save()
+            url = request.POST.get("cover-url")
+            if url:
+                image = set_cover_from_url(url)
+                if image:
+                    book.cover.save(*image, save=False)
+
+            book.save()
         return redirect(f"/book/{book.id}")
 
 
+def copy_form(data):
+    """helper to re-create the date fields in the form"""
+    formcopy = data["form"].data.copy()
+    try:
+        formcopy["first_published_date"] = dateparse(formcopy["first_published_date"])
+    except (MultiValueDictKeyError, ValueError):
+        pass
+    try:
+        formcopy["published_date"] = dateparse(formcopy["published_date"])
+    except (MultiValueDictKeyError, ValueError):
+        pass
+    data["form"].data = formcopy
+    return data
+
+
 def add_authors(request, data):
     """helper for adding authors"""
     add_author = [author for author in request.POST.getlist("add_author") if author]
@@ -178,6 +164,12 @@ def add_authors(request, data):
     data["author_matches"] = []
     data["isni_matches"] = []
 
+    # creting a book or adding an author to a book needs another step
+    data["confirm_mode"] = True
+    # this isn't preserved because it isn't part of the form obj
+    data["remove_authors"] = request.POST.getlist("remove_authors")
+    data["cover_url"] = request.POST.get("cover-url")
+
     for author in add_author:
         # filter out empty author fields
         if not author:
@@ -256,6 +248,13 @@ class ConfirmEditBook(View):
             # save book
             book = form.save()
 
+            # add known authors
+            authors = None
+            if request.POST.get("authors"):
+                author_ids = findall(r"\d+", request.POST["authors"])
+                authors = models.Author.objects.filter(id__in=author_ids)
+                book.authors.add(*authors)
+
             # get or create author as needed
             for i in range(int(request.POST.get("author-match-count", 0))):
                 match = request.POST.get(f"author_match-{i}")

From 5255abb2afef7e048410e6dd8e338e6b2be46ae7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 16 Mar 2022 17:55:41 -0700
Subject: [PATCH 07/11] Fixes create book view unit test

---
 bookwyrm/tests/views/books/test_edit_book.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/books/test_edit_book.py b/bookwyrm/tests/views/books/test_edit_book.py
index cfb0d766..cabfe972 100644
--- a/bookwyrm/tests/views/books/test_edit_book.py
+++ b/bookwyrm/tests/views/books/test_edit_book.py
@@ -60,7 +60,7 @@ class EditBookViews(TestCase):
 
     def test_edit_book_create_page(self):
         """there are so many views, this just makes sure it LOADS"""
-        view = views.EditBook.as_view()
+        view = views.CreateBook.as_view()
         request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True

From 997a671cfb6be33a7b7d3ff973a04017a47cdf65 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 17 Mar 2022 07:34:59 -0700
Subject: [PATCH 08/11] Consistent style for edit book confirm mode

---
 bookwyrm/templates/book/edit/edit_book.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/edit/edit_book.html b/bookwyrm/templates/book/edit/edit_book.html
index 79ed1cc0..b088c1e8 100644
--- a/bookwyrm/templates/book/edit/edit_book.html
+++ b/bookwyrm/templates/book/edit/edit_book.html
@@ -103,7 +103,7 @@
                             <input type="radio" name="parent_work" value="{{ match.parent_work.id }}"> {{ match.parent_work.title }}
                         </label>
                         {% endfor %}
-                        <label>
+                        <label class="label mt-2">
                             <input type="radio" name="parent_work" value="0" required> {% trans "This is a new work" %}
                         </label>
                     </fieldset>

From 26f0501e2f756fd475bee5081c881527b88af0ff Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 17 Mar 2022 07:40:55 -0700
Subject: [PATCH 09/11] SHow editions link on all book pages

---
 bookwyrm/templates/book/book.html | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index fa098281..453480f9 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -208,9 +208,17 @@
                 {% endif %}
 
 
-                {% if book.parent_work.editions.count > 1 %}
-                <p>{% blocktrans with path=book.parent_work.local_path count=book.parent_work.editions.count %}<a href="{{ path }}/editions">{{ count }} editions</a>{% endblocktrans %}</p>
-                {% endif %}
+                {% with work=book.parent_work %}
+                <p>
+                    <a href="{{ work.local_path }}/editions">
+                        {% blocktrans trimmed count counter=work.editions.count with count=work.editions.count|intcomma %}
+                            {{ count }} edition
+                            {% plural %}
+                            {{ count }} editions
+                        {% endblocktrans %}
+                    </a>
+                </p>
+                {% endwith %}
             </div>
 
             {# user's relationship to the book #}

From a684d86d15f5f1715ab49d6f9228ada016aaaf40 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 17 Mar 2022 08:02:59 -0700
Subject: [PATCH 10/11] Fixes subjects in add edition view

---
 bookwyrm/forms/books.py                        |  1 -
 bookwyrm/templates/book/editions/editions.html | 13 ++++++++++++-
 bookwyrm/views/books/edit_book.py              |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/forms/books.py b/bookwyrm/forms/books.py
index 20f307fa..d96ad067 100644
--- a/bookwyrm/forms/books.py
+++ b/bookwyrm/forms/books.py
@@ -86,7 +86,6 @@ class EditionForm(CustomForm):
             "ASIN": forms.TextInput(attrs={"aria-describedby": "desc_ASIN"}),
         }
 
-
 class EditionFromWorkForm(CustomForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
diff --git a/bookwyrm/templates/book/editions/editions.html b/bookwyrm/templates/book/editions/editions.html
index 5d674d47..e15e7a74 100644
--- a/bookwyrm/templates/book/editions/editions.html
+++ b/bookwyrm/templates/book/editions/editions.html
@@ -57,7 +57,18 @@
 
     <form action="{% url 'create-book-data' %}" method="POST" name="add-edition-form">
         {% csrf_token %}
-        {{ work_form }}
+        {{ work_form.title }}
+        {{ work_form.subtitle }}
+        {{ work_form.authors }}
+        {{ work_form.description }}
+        {{ work_form.languages }}
+        {{ work_form.series }}
+        {{ work_form.cover }}
+        {{ work_form.first_published_date }}
+        {% for subject in work.subjects %}
+        <input type="hidden" name="subjects" value="{{ subject }}">
+        {% endfor %}
+
         <input type="hidden" name="parent_work" value="{{ work.id }}">
         <div>
             <button class="button is-small" type="submit">
diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py
index f1f5e666..40cc44ca 100644
--- a/bookwyrm/views/books/edit_book.py
+++ b/bookwyrm/views/books/edit_book.py
@@ -219,6 +219,7 @@ def create_book_from_data(request):
     book = {
         "parent_work": {"id": request.POST.get("parent_work")},
         "authors": models.Author.objects.filter(id__in=author_ids).all(),
+        "subjects": request.POST.getlist("subjects"),
     }
 
     data = {"book": book, "form": forms.EditionForm(request.POST)}

From 0101d2561a9f1247138001a7f50b77c031073920 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 17 Mar 2022 08:18:44 -0700
Subject: [PATCH 11/11] Python formatting

---
 bookwyrm/forms/books.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/forms/books.py b/bookwyrm/forms/books.py
index d96ad067..20f307fa 100644
--- a/bookwyrm/forms/books.py
+++ b/bookwyrm/forms/books.py
@@ -86,6 +86,7 @@ class EditionForm(CustomForm):
             "ASIN": forms.TextInput(attrs={"aria-describedby": "desc_ASIN"}),
         }
 
+
 class EditionFromWorkForm(CustomForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)