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

change base_dir to not need value.

Browse Source 
renamed index to comic_list
This commit is contained in:
Ajurna
2015-06-18 22:56:01 +01:00
parent 4c3d75916f
commit f5c146e925
5 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
comic/models.py
View File

@@ -133,9 +133,9 @@ class ComicBook(models.Model):
return out return out
def process_comic_book(base_dir, comic_path, comic_file_name): def process_comic_book(base_dir, comic_path, comic_file_name):
try: try:
cbx = rarfile.RarFile(path.join(base_dir.value, comic_path)) cbx = rarfile.RarFile(path.join(base_dir, comic_path))
except rarfile.BadRarFile: except rarfile.BadRarFile:
cbx = zipfile.ZipFile(path.join(base_dir.value, comic_path)) cbx = zipfile.ZipFile(path.join(base_dir, comic_path))
except zipfile.BadZipfile: except zipfile.BadZipfile:
return False return False

0
comic/templates/comic/index.html → comic/templates/comic/comic_list.html
View File

11
comic/urls.py
View File

@@ -3,10 +3,9 @@ from django.conf.urls import url
from . import views from . import views
urlpatterns = [ urlpatterns = [
url(r'^$', views.index, name='index'), url(r'^$', views.comic_list, name='index'),
url(r'^(?P<comic_path>[\w]+)\/$', views.index, name='index'), url(r'^(?P<comic_path>[\w]+)/$', views.comic_list, name='comic_list'),
url(r'^read\/(?P<comic_path>[\w]+)\/(?P<page>[0-9]+)\/$', views.read_comic, name='read_comic'), url(r'^read/(?P<comic_path>[\w]+)/(?P<page>[0-9]+)/$', views.read_comic, name='read_comic'),
url(r'^read\/(?P<comic_path>[\w]+)\/(?P<page>[0-9]+)\/img$', views.get_image, name='get_image'), url(r'^read/(?P<comic_path>[\w]+)/(?P<page>[0-9]+)/img$', views.get_image, name='get_image'),
url(r"^file\/(?P<page>[0-9]+)\/(?P<file_name>[\w.\s'\(\)\-]+)\/$", views.read_comic, name='read_comic'),
url(r"^file\/(?P<page>[0-9]+)\/(?P<file_name>[\w.\s'\(\)\-]+)\/img$", views.get_image, name='get_image'),
] ]

4
comic/util.py
View File

@@ -43,10 +43,10 @@ def generate_breadcrumbs(comic_path):
def generate_directory(base_dir, comic_path): def generate_directory(base_dir, comic_path):
files = [] files = []
for fn in os.listdir(path.join(base_dir.value, comic_path)): for fn in os.listdir(path.join(base_dir, comic_path)):
df = DirFile() df = DirFile()
df.name = fn df.name = fn
if path.isdir(path.join(base_dir.value, comic_path, fn)): if path.isdir(path.join(base_dir, comic_path, fn)):
df.isdir = True df.isdir = True
df.icon = 'glyphicon-folder-open' df.icon = 'glyphicon-folder-open'
df.location = urlsafe_base64_encode(path.join(comic_path, fn)) df.location = urlsafe_base64_encode(path.join(comic_path, fn))

12
comic/views.py
View File

@@ -8,8 +8,8 @@ from util import generate_breadcrumbs, generate_directory
from os import path from os import path
def index(request, comic_path=''): def comic_list(request, comic_path=''):
base_dir = Setting.objects.get(name='BASE_DIR') base_dir = Setting.objects.get(name='BASE_DIR').value
comic_path = urlsafe_base64_decode(comic_path) comic_path = urlsafe_base64_decode(comic_path)
breadcrumbs = generate_breadcrumbs(comic_path) breadcrumbs = generate_breadcrumbs(comic_path)
files = generate_directory(base_dir, comic_path) files = generate_directory(base_dir, comic_path)
@@ -17,11 +17,11 @@ def index(request, comic_path=''):
'file_list': files, 'file_list': files,
'breadcrumbs': breadcrumbs, 'breadcrumbs': breadcrumbs,
}) })
return render(request, 'comic/index.html', context) return render(request, 'comic/comic_list.html', context)
def read_comic(request, comic_path, page): def read_comic(request, comic_path, page):
base_dir = Setting.objects.get(name='BASE_DIR') base_dir = Setting.objects.get(name='BASE_DIR').value
page = int(page) page = int(page)
decoded_path = urlsafe_base64_decode(comic_path) decoded_path = urlsafe_base64_decode(comic_path)
breadcrumbs = generate_breadcrumbs(decoded_path) breadcrumbs = generate_breadcrumbs(decoded_path)
@@ -42,7 +42,7 @@ def read_comic(request, comic_path, page):
def get_image(request, comic_path, page): def get_image(request, comic_path, page):
base_dir = Setting.objects.get(name='BASE_DIR') base_dir = Setting.objects.get(name='BASE_DIR').value
page = int(page) page = int(page)
decoded_path = urlsafe_base64_decode(comic_path) decoded_path = urlsafe_base64_decode(comic_path)
_, comic_file_name = path.split(decoded_path) _, comic_file_name = path.split(decoded_path)
@@ -50,6 +50,6 @@ def get_image(request, comic_path, page):
book = ComicBook.objects.get(file_name=comic_file_name) book = ComicBook.objects.get(file_name=comic_file_name)
except ComicBook.DoesNotExist: except ComicBook.DoesNotExist:
book = process_comic_book(base_dir, decoded_path, comic_file_name) book = process_comic_book(base_dir, decoded_path, comic_file_name)
full_path = path.join(base_dir.value, decoded_path) full_path = path.join(base_dir, decoded_path)
img, content = book.get_image(full_path, page) img, content = book.get_image(full_path, page)
return HttpResponse(img.read(), content_type=content) return HttpResponse(img.read(), content_type=content)