Merge branch 'main' into book-file-links

bookwyrm/views/__init__.py

@@ -94,7 +94,7 @@ from .list import Lists, SavedLists, List, Curate, UserLists
 from .list import save_list, unsave_list, delete_list, unsafe_embed_list
 from .notifications import Notifications
 from .outbox import Outbox
-from .reading import create_readthrough, delete_readthrough, delete_progressupdate
+from .reading import ReadThrough, delete_readthrough, delete_progressupdate
 from .reading import ReadingStatus
 from .report import Report
 from .rss_feed import RssFeed

bookwyrm/views/admin/invite.py

@@ -16,7 +16,6 @@ from django.views.decorators.http import require_POST
 
 from bookwyrm import emailing, forms, models
 from bookwyrm.settings import PAGE_LENGTH
-from bookwyrm.views import helpers
 
 
 # pylint: disable= no-self-use
@@ -174,7 +173,6 @@ class InviteRequest(View):
         data = {
             "request_form": form,
             "request_received": received,
-            "books": helpers.get_landing_books(),
         }
         return TemplateResponse(request, "landing/landing.html", data)
 

bookwyrm/views/helpers.py

@@ -153,24 +153,6 @@ def is_blocked(viewer, user):
     return False
 
 
-def get_landing_books():
-    """list of books for the landing page"""
-
-    return list(
-        set(
-            models.Edition.objects.filter(
-                review__published_date__isnull=False,
-                review__deleted=False,
-                review__user__local=True,
-                review__privacy__in=["public", "unlisted"],
-            )
-            .exclude(cover__exact="")
-            .distinct()
-            .order_by("-review__published_date")[:6]
-        )
-    )
-
-
 def load_date_in_user_tz_as_utc(date_str: str, user: models.User) -> datetime:
     """ensures that data is stored consistently in the UTC timezone"""
     if not date_str:

bookwyrm/views/landing/landing.py

@@ -3,7 +3,6 @@ from django.template.response import TemplateResponse
 from django.views import View
 
 from bookwyrm import forms
-from bookwyrm.views import helpers
 from bookwyrm.views.feed import Feed
 
 
@@ -28,6 +27,5 @@ class Landing(View):
         data = {
             "register_form": forms.RegisterForm(),
             "request_form": forms.InviteRequestForm(),
-            "books": helpers.get_landing_books(),
         }
         return TemplateResponse(request, "landing/landing.html", data)

bookwyrm/views/reading.py

@@ -1,7 +1,6 @@
 """ the good stuff! the books! """
 from django.contrib.auth.decorators import login_required
 from django.core.cache import cache
-from django.core.cache.utils import make_template_fragment_key
 from django.db import transaction
 from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
@@ -10,16 +9,16 @@ from django.utils.decorators import method_decorator
 from django.views import View
 from django.views.decorators.http import require_POST
 
-from bookwyrm import models
+from bookwyrm import forms, models
 from bookwyrm.views.shelf.shelf_actions import unshelve
 from .status import CreateStatus
 from .helpers import get_edition, handle_reading_status, is_api_request
 from .helpers import load_date_in_user_tz_as_utc
 
 
-@method_decorator(login_required, name="dispatch")
 # pylint: disable=no-self-use
 # pylint: disable=too-many-return-statements
+@method_decorator(login_required, name="dispatch")
 class ReadingStatus(View):
     """consider reading a book"""
 
@@ -46,12 +45,10 @@ class ReadingStatus(View):
         if not identifier:
             return HttpResponseBadRequest()
 
-        # invalidate the template cache
-        cache_keys = [
-            make_template_fragment_key("shelve_button", [request.user.id, book_id]),
-            make_template_fragment_key("suggested_books", [request.user.id]),
-        ]
-        cache.delete_many(cache_keys)
+        # invalidate related caches
+        cache.delete(
+            f"active_shelf-{request.user.id}-{book_id}",
+        )
 
         desired_shelf = get_object_or_404(
             models.Shelf, identifier=identifier, user=request.user
@@ -118,6 +115,45 @@ class ReadingStatus(View):
         return redirect(referer)
 
 
+@method_decorator(login_required, name="dispatch")
+class ReadThrough(View):
+    """Add new read dates"""
+
+    def get(self, request, book_id, readthrough_id=None):
+        """standalone form in case of errors"""
+        book = get_object_or_404(models.Edition, id=book_id)
+        form = forms.ReadThroughForm()
+        data = {"form": form, "book": book}
+        if readthrough_id:
+            data["readthrough"] = get_object_or_404(
+                models.ReadThrough, id=readthrough_id
+            )
+        return TemplateResponse(request, "readthrough/readthrough.html", data)
+
+    def post(self, request):
+        """can't use the form normally because the dates are too finnicky"""
+        book_id = request.POST.get("book")
+        normalized_post = request.POST.copy()
+
+        normalized_post["start_date"] = load_date_in_user_tz_as_utc(
+            request.POST.get("start_date"), request.user
+        )
+        normalized_post["finish_date"] = load_date_in_user_tz_as_utc(
+            request.POST.get("finish_date"), request.user
+        )
+        form = forms.ReadThroughForm(request.POST)
+        if not form.is_valid():
+            book = get_object_or_404(models.Edition, id=book_id)
+            data = {"form": form, "book": book}
+            if request.POST.get("id"):
+                data["readthrough"] = get_object_or_404(
+                    models.ReadThrough, id=request.POST.get("id")
+                )
+            return TemplateResponse(request, "readthrough/readthrough.html", data)
+        form.save()
+        return redirect("book", book_id)
+
+
 @transaction.atomic
 def update_readthrough_on_shelve(
     user, annotated_book, status, start_date=None, finish_date=None
@@ -159,27 +195,6 @@ def delete_readthrough(request):
     return redirect(request.headers.get("Referer", "/"))
 
 
-@login_required
-@require_POST
-def create_readthrough(request):
-    """can't use the form because the dates are too finnicky"""
-    book = get_object_or_404(models.Edition, id=request.POST.get("book"))
-
-    start_date = load_date_in_user_tz_as_utc(
-        request.POST.get("start_date"), request.user
-    )
-    finish_date = load_date_in_user_tz_as_utc(
-        request.POST.get("finish_date"), request.user
-    )
-    models.ReadThrough.objects.create(
-        user=request.user,
-        book=book,
-        start_date=start_date,
-        finish_date=finish_date,
-    )
-    return redirect("book", book.id)
-
-
 @login_required
 @require_POST
 def delete_progressupdate(request):

bookwyrm/views/status.py

@@ -159,6 +159,7 @@ def update_progress(request, book_id):  # pylint: disable=unused-argument
 @require_POST
 def edit_readthrough(request):
     """can't use the form because the dates are too finnicky"""
+    # TODO: remove this, it duplicates the code in the ReadThrough view
     readthrough = get_object_or_404(models.ReadThrough, id=request.POST.get("id"))
     readthrough.raise_not_editable(request.user)