mirror of
https://github.com/ajurna/cbwebreader.git
synced 2025-12-06 06:17:17 +00:00
code cleanup.
moved process_comic_book to static method.
This commit is contained in:
@@ -3,11 +3,12 @@ from django.template import RequestContext
|
||||
from django.utils.http import urlsafe_base64_decode
|
||||
from django.shortcuts import render
|
||||
|
||||
from comic.models import Setting, ComicBook, process_comic_book
|
||||
from comic.models import Setting, ComicBook
|
||||
from util import generate_breadcrumbs, generate_directory
|
||||
|
||||
from os import path
|
||||
|
||||
|
||||
def comic_list(request, comic_path=''):
|
||||
base_dir = Setting.objects.get(name='BASE_DIR').value
|
||||
comic_path = urlsafe_base64_decode(comic_path)
|
||||
@@ -29,7 +30,7 @@ def read_comic(request, comic_path, page):
|
||||
try:
|
||||
book = ComicBook.objects.get(file_name=comic_file_name)
|
||||
except ComicBook.DoesNotExist:
|
||||
book = process_comic_book(base_dir, decoded_path, comic_file_name)
|
||||
book = ComicBook.process_comic_book(base_dir, decoded_path, comic_file_name)
|
||||
book.last_read_page = page
|
||||
book.save()
|
||||
context = RequestContext(request, {
|
||||
@@ -41,7 +42,7 @@ def read_comic(request, comic_path, page):
|
||||
return render(request, 'comic/read_comic.html', context)
|
||||
|
||||
|
||||
def get_image(request, comic_path, page):
|
||||
def get_image(_, comic_path, page):
|
||||
base_dir = Setting.objects.get(name='BASE_DIR').value
|
||||
page = int(page)
|
||||
decoded_path = urlsafe_base64_decode(comic_path)
|
||||
@@ -49,7 +50,7 @@ def get_image(request, comic_path, page):
|
||||
try:
|
||||
book = ComicBook.objects.get(file_name=comic_file_name)
|
||||
except ComicBook.DoesNotExist:
|
||||
book = process_comic_book(base_dir, decoded_path, comic_file_name)
|
||||
book = ComicBook.process_comic_book(base_dir, decoded_path, comic_file_name)
|
||||
full_path = path.join(base_dir, decoded_path)
|
||||
img, content = book.get_image(full_path, page)
|
||||
return HttpResponse(img.read(), content_type=content)
|
||||
|
||||
Reference in New Issue
Block a user