Skip to content

Commit

Permalink
Pre-populate sort title in edit book form if not provided
Browse files Browse the repository at this point in the history
It's confusing to edit a book when this isn't set, so this provides the
best-guess version of the sort title if there isn't one provided, and
allows the user to change it as needed.
  • Loading branch information
mouse-reeve committed Aug 7, 2023
1 parent 15e82ec commit 51201b5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
17 changes: 8 additions & 9 deletions bookwyrm/models/book.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,13 @@ def get_remote_id(self):
"""editions and works both use "book" instead of model_name"""
return f"https://{DOMAIN}/book/{self.id}"

def guess_sort_title(self):
"""Get a best-guess sort title for the current book"""
articles = chain(
*(LANGUAGE_ARTICLES.get(language, ()) for language in tuple(self.languages))
)
return re.sub(f'^{" |^".join(articles)} ', "", str(self.title).lower())

def __repr__(self):
# pylint: disable=consider-using-f-string
return "<{} key={!r} title={!r}>".format(
Expand Down Expand Up @@ -375,15 +382,7 @@ def save(self, *args: Any, **kwargs: Any) -> None:
# Create sort title by removing articles from title
if self.sort_title in [None, ""]:
if self.sort_title in [None, ""]:
articles = chain(
*(
LANGUAGE_ARTICLES.get(language, ())
for language in tuple(self.languages)
)
)
self.sort_title = re.sub(
f'^{" |^".join(articles)} ', "", str(self.title).lower()
)
self.sort_title = self.guess_sort_title()

return super().save(*args, **kwargs)

Expand Down
5 changes: 5 additions & 0 deletions bookwyrm/views/books/edit_book.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ class EditBook(View):
def get(self, request, book_id):
"""info about a book"""
book = get_edition(book_id)
# This doesn't update the sort title, just pre-populates it in the form
if book.sort_title in ["", None]:
print("hi")
book.sort_title = book.guess_sort_title()
if not book.description:
book.description = book.parent_work.description
data = {"book": book, "form": forms.EditionForm(instance=book)}
Expand All @@ -40,6 +44,7 @@ def get(self, request, book_id):
def post(self, request, book_id):
"""edit a book cool"""
book = get_object_or_404(models.Edition, id=book_id)

form = forms.EditionForm(request.POST, request.FILES, instance=book)

data = {"book": book, "form": form}
Expand Down

0 comments on commit 51201b5

Please sign in to comment.