yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into create-book

Browse Source
This commit is contained in:
Mouse Reeve
2021-03-08 10:07:02 -08:00
committed by GitHub
parent a5baa1f5c6 a8b29b213d
commit 01a2a77cbb
201 changed files with 10253 additions and 8555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
bookwyrm/views/books.py
View File

@ -1,4 +1,5 @@
''' the good stuff! the books! '''
""" the good stuff! the books! """
from django.core.paginator import Paginator
from django.contrib.auth.decorators import login_required, permission_required
from django.contrib.postgres.search import SearchRank, SearchVector
from django.core.paginator import Paginator
@ -21,11 +22,12 @@ from .helpers import privacy_filter
# pylint: disable= no-self-use
class Book(View):
''' a book! this is the stuff '''
""" a book! this is the stuff """
def get(self, request, book_id):
''' info about a book '''
""" info about a book """
try:
page = int(request.GET.get('page', 1))
page = int(request.GET.get("page", 1))
except ValueError:
page = 1
@ -51,30 +53,28 @@ class Book(View):
reviews = get_activity_feed(request.user, queryset=reviews)
# the reviews to show
paginated = Paginator(reviews.exclude(
Q(content__isnull=True) | Q(content='')
), PAGE_LENGTH)
paginated = Paginator(
reviews.exclude(Q(content__isnull=True) | Q(content="")), PAGE_LENGTH
)
reviews_page = paginated.page(page)
user_tags = readthroughs = user_shelves = other_edition_shelves = []
if request.user.is_authenticated:
user_tags = models.UserTag.objects.filter(
book=book, user=request.user
).values_list('tag__identifier', flat=True)
).values_list("tag__identifier", flat=True)
readthroughs = models.ReadThrough.objects.filter(
user=request.user,
book=book,
).order_by('start_date')
).order_by("start_date")
for readthrough in readthroughs:
readthrough.progress_updates = \
readthrough.progressupdate_set.all() \
.order_by('-updated_date')
readthrough.progress_updates = (
readthrough.progressupdate_set.all().order_by("-updated_date")
)
user_shelves = models.ShelfBook.objects.filter(
user=request.user, book=book
)
user_shelves = models.ShelfBook.objects.filter(user=request.user, book=book)
other_edition_shelves = models.ShelfBook.objects.filter(
~Q(book=book),
@ -83,28 +83,28 @@ class Book(View):
)
data = {
'book': book,
'reviews': reviews_page,
'review_count': reviews.count(),
'ratings': reviews.filter(Q(content__isnull=True) | Q(content='')),
'rating': reviews.aggregate(Avg('rating'))['rating__avg'],
'tags': models.UserTag.objects.filter(book=book),
'lists': privacy_filter(
"book": book,
"reviews": reviews_page,
"review_count": reviews.count(),
"ratings": reviews.filter(Q(content__isnull=True) | Q(content="")),
"rating": reviews.aggregate(Avg("rating"))["rating__avg"],
"tags": models.UserTag.objects.filter(book=book),
"lists": privacy_filter(
request.user, book.list_set.filter(listitem__approved=True)
),
'user_tags': user_tags,
'user_shelves': user_shelves,
'other_edition_shelves': other_edition_shelves,
'readthroughs': readthroughs,
'path': '/book/%s' % book_id,
"user_tags": user_tags,
"user_shelves": user_shelves,
"other_edition_shelves": other_edition_shelves,
"readthroughs": readthroughs,
"path": "/book/%s" % book_id,
}
return TemplateResponse(request, 'book.html', data)
return TemplateResponse(request, "book.html", data)
@method_decorator(login_required, name='dispatch')
@method_decorator(login_required, name="dispatch")
@method_decorator(
permission_required('bookwyrm.edit_book', raise_exception=True),
name='dispatch')
permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch"
)
class EditBook(View):
''' edit a book '''
def get(self, request, book_id=None):
@ -218,81 +218,81 @@ class ConfirmEditBook(View):
for author_id in request.POST.getlist('remove_authors'):
book.authors.remove(author_id)
return redirect('/book/%s' % book.id)
return redirect("/book/%s" % book.id)
class Editions(View):
''' list of editions '''
""" list of editions """
def get(self, request, book_id):
''' list of editions of a book '''
""" list of editions of a book """
work = get_object_or_404(models.Work, id=book_id)
if is_api_request(request):
return ActivitypubResponse(work.to_edition_list(**request.GET))
data = {
'editions': work.editions.order_by('-edition_rank').all(),
'work': work,
"editions": work.editions.order_by("-edition_rank").all(),
"work": work,
}
return TemplateResponse(request, 'editions.html', data)
return TemplateResponse(request, "editions.html", data)
@login_required
@require_POST
def upload_cover(request, book_id):
''' upload a new cover '''
""" upload a new cover """
book = get_object_or_404(models.Edition, id=book_id)
form = forms.CoverForm(request.POST, request.FILES, instance=book)
if not form.is_valid():
return redirect('/book/%d' % book.id)
return redirect("/book/%d" % book.id)
book.last_edited_by = request.user
book.cover = form.files['cover']
book.cover = form.files["cover"]
book.save()
return redirect('/book/%s' % book.id)
return redirect("/book/%s" % book.id)
@login_required
@require_POST
@permission_required('bookwyrm.edit_book', raise_exception=True)
@permission_required("bookwyrm.edit_book", raise_exception=True)
def add_description(request, book_id):
''' upload a new cover '''
if not request.method == 'POST':
return redirect('/')
""" upload a new cover """
if not request.method == "POST":
return redirect("/")
book = get_object_or_404(models.Edition, id=book_id)
description = request.POST.get('description')
description = request.POST.get("description")
book.description = description
book.last_edited_by = request.user
book.save()
return redirect('/book/%s' % book.id)
return redirect("/book/%s" % book.id)
@require_POST
def resolve_book(request):
''' figure out the local path to a book from a remote_id '''
remote_id = request.POST.get('remote_id')
""" figure out the local path to a book from a remote_id """
remote_id = request.POST.get("remote_id")
connector = connector_manager.get_or_create_connector(remote_id)
book = connector.get_or_create_book(remote_id)
return redirect('/book/%d' % book.id)
return redirect("/book/%d" % book.id)
@login_required
@require_POST
@transaction.atomic
def switch_edition(request):
''' switch your copy of a book to a different edition '''
edition_id = request.POST.get('edition')
""" switch your copy of a book to a different edition """
edition_id = request.POST.get("edition")
new_edition = get_object_or_404(models.Edition, id=edition_id)
shelfbooks = models.ShelfBook.objects.filter(
book__parent_work=new_edition.parent_work,
shelf__user=request.user
book__parent_work=new_edition.parent_work, shelf__user=request.user
)
for shelfbook in shelfbooks.all():
with transaction.atomic():
@ -300,16 +300,15 @@ def switch_edition(request):
created_date=shelfbook.created_date,
user=shelfbook.user,
shelf=shelfbook.shelf,
book=new_edition
book=new_edition,
)
shelfbook.delete()
readthroughs = models.ReadThrough.objects.filter(
book__parent_work=new_edition.parent_work,
user=request.user
book__parent_work=new_edition.parent_work, user=request.user
)
for readthrough in readthroughs.all():
readthrough.book = new_edition
readthrough.save()
return redirect('/book/%d' % new_edition.id)
return redirect("/book/%d" % new_edition.id)