ajurna/cbwebreader
1
0
Fork 0
mirror of https://github.com/ajurna/cbwebreader.git synced 2025-12-06 06:17:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

optimised directory listing query part 2

Browse Source
This commit is contained in:
ajurna
2020-05-22 16:37:39 +01:00
parent 26bdd684a4
commit fdeee527cc
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
comic/util.py
View File

@@ -1,11 +1,10 @@
from collections import OrderedDict from collections import OrderedDict
from os import listdir, path from os import listdir, path
from django.db.models import Count, Q from django.db.models import Count, Q, F
from django.db.transaction import atomic
from django.utils.http import urlsafe_base64_encode from django.utils.http import urlsafe_base64_encode
from .models import ComicBook, ComicStatus, Directory, Setting from .models import ComicBook, Directory, Setting
def generate_title_from_path(file_path): def generate_title_from_path(file_path):
@@ -109,12 +108,9 @@ class DirFile:
else: else:
self.icon = "fa-book" self.icon = "fa-book"
self.name = comic.file_name self.name = comic.file_name
status, created = ComicStatus.objects.get_or_create(comic=comic, user=user)
if created:
status.save()
self.selector = urlsafe_base64_encode(comic.selector.bytes) self.selector = urlsafe_base64_encode(comic.selector.bytes)
self.location = "/comic/read/{0}/".format(self.selector) self.location = "/comic/read/{0}/".format(self.selector)
self.label = generate_label(comic, status) self.label = generate_label(comic)
self.type = "book" self.type = "book"
def __repr__(self): def __repr__(self):
@@ -146,6 +142,8 @@ def generate_directory(user, directory=False):
total_read=Count('comicbook__comicstatus', total_read=Count('comicbook__comicstatus',
Q(comicbook__comicstatus__finished=True, Q(comicbook__comicstatus__finished=True,
comicbook__comicstatus__user=user))) comicbook__comicstatus__user=user)))
file_list_obj = file_list_obj.annotate(total_pages=Count('comicpage')).annotate(
last_read_page=F('comicstatus__last_read_page')).annotate(finished=F('comicstatus__finished')).annotate(unread=F('comicstatus__unread'))
for directory_obj in dir_list_obj: for directory_obj in dir_list_obj:
df = DirFile() df = DirFile()
@@ -158,6 +156,7 @@ def generate_directory(user, directory=False):
df.populate_comic(file_obj, user) df.populate_comic(file_obj, user)
files.append(df) files.append(df)
file_list.remove(file_obj.file_name) file_list.remove(file_obj.file_name)
for directory_name in dir_list: for directory_name in dir_list:
if directory: if directory:
directory_obj = Directory(name=directory_name, parent=directory) directory_obj = Directory(name=directory_name, parent=directory)
@@ -181,15 +180,18 @@ def generate_directory(user, directory=False):
return files return files
def generate_label(book, status): def generate_label(book):
if status.unread: unread_text = '<center><span class="label label-default">Unread</span></center>'
label_text = '<center><span class="label label-default">Unread</span></center>' if not hasattr(book, 'unread'):
elif (status.last_read_page + 1) == book.page_count: label_text = unread_text
elif book.unread or book.unread is None:
label_text = unread_text
elif book.finished:
label_text = '<center><span class="label label-success">Read</span></center>' label_text = '<center><span class="label label-success">Read</span></center>'
else: else:
label_text = '<center><span class="label label-primary">%s/%s</span></center>' % ( label_text = '<center><span class="label label-primary">%s/%s</span></center>' % (
status.last_read_page + 1, book.last_read_page + 1,
book.page_count, book.total_pages,
) )
return label_text return label_text