Add editions view

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
 

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)

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