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

fixed issue with breadcrumbs missing comic.

Browse Source
This commit is contained in:
ajurna@gmail.com
2016-04-01 10:45:46 +01:00
parent 61838b7a11
commit 9a316ce1a1
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
comic/util.py
View File

@@ -40,14 +40,13 @@ class Breadcrumb:
return self.name return self.name
def generate_breadcrumbs_from_path(directory=False): def generate_breadcrumbs_from_path(directory=False, book=False):
""" """
:type directory: Directory :type directory: Directory
:type book: ComicBook
""" """
output = [Breadcrumb()] output = [Breadcrumb()]
prefix = b'/comic/'
last = ''
if directory: if directory:
folders = directory.get_path_objects() folders = directory.get_path_objects()
else: else:
@@ -55,8 +54,14 @@ def generate_breadcrumbs_from_path(directory=False):
for item in folders[::-1]: for item in folders[::-1]:
bc = Breadcrumb() bc = Breadcrumb()
bc.name = item.name bc.name = item.name
bc.url = prefix + urlsafe_base64_encode(item.selector.bytes) bc.url = b'/comic/' + urlsafe_base64_encode(item.selector.bytes)
output.append(bc) output.append(bc)
if book:
bc = Breadcrumb()
bc.name = book.file_name
bc.url = b'/read/' + urlsafe_base64_encode(book.selector.bytes)
output.append(bc)
return output return output

9
comic/views.py
View File

@@ -203,13 +203,8 @@ def read_comic(request, comic_selector, page):
selector = uuid.UUID(bytes=urlsafe_base64_decode(comic_selector)) selector = uuid.UUID(bytes=urlsafe_base64_decode(comic_selector))
book = get_object_or_404(ComicBook, selector=selector) book = get_object_or_404(ComicBook, selector=selector)
breadcrumbs = generate_breadcrumbs_from_path(book.directory) breadcrumbs = generate_breadcrumbs_from_path(book.directory, book)
#comic_file_path, comic_file_name = path.split(decoded_path)
#d = Directory.get_dir_from_path(comic_file_path)
#try:
# book = ComicBook.objects.get(file_name=comic_file_name)
#except ComicBook.DoesNotExist:
# book = ComicBook.process_comic_book(comic_file_name, d)
status, _ = ComicStatus.objects.get_or_create(comic=book, user=request.user) status, _ = ComicStatus.objects.get_or_create(comic=book, user=request.user)
status.unread = False status.unread = False
status.last_read_page = page status.last_read_page = page