From f5c146e925abfd0a50da37ca2d019152d239f5b8 Mon Sep 17 00:00:00 2001
From: ajurna <ajurna@gmail.com>
Date: Thu, 18 Jun 2015 22:56:01 +0100
Subject: [PATCH] change base_dir to not need value. renamed index to
 comic_list

---
 comic/models.py                                      |  4 ++--
 .../templates/comic/{index.html => comic_list.html}  |  0
 comic/urls.py                                        | 11 +++++------
 comic/util.py                                        |  4 ++--
 comic/views.py                                       | 12 ++++++------
 5 files changed, 15 insertions(+), 16 deletions(-)
 rename comic/templates/comic/{index.html => comic_list.html} (100%)

diff --git a/comic/models.py b/comic/models.py
index 615eea6..aa583df 100644
--- a/comic/models.py
+++ b/comic/models.py
@@ -133,9 +133,9 @@ class ComicBook(models.Model):
         return out
 def process_comic_book(base_dir, comic_path, comic_file_name):
     try:
-        cbx = rarfile.RarFile(path.join(base_dir.value, comic_path))
+        cbx = rarfile.RarFile(path.join(base_dir, comic_path))
     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:
         return False
 
diff --git a/comic/templates/comic/index.html b/comic/templates/comic/comic_list.html
similarity index 100%
rename from comic/templates/comic/index.html
rename to comic/templates/comic/comic_list.html
diff --git a/comic/urls.py b/comic/urls.py
index 567be5c..d15e4e7 100644
--- a/comic/urls.py
+++ b/comic/urls.py
@@ -3,10 +3,9 @@ from django.conf.urls import url
 from . import views
 
 urlpatterns = [
-    url(r'^$', views.index, name='index'),
-    url(r'^(?P<comic_path>[\w]+)\/$', views.index, name='index'),
-    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"^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'),
+    url(r'^$', views.comic_list, 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]+)/img$', views.get_image, name='get_image'),
+
 ]
\ No newline at end of file
diff --git a/comic/util.py b/comic/util.py
index 39c8135..c32ae83 100644
--- a/comic/util.py
+++ b/comic/util.py
@@ -43,10 +43,10 @@ def generate_breadcrumbs(comic_path):
 
 def generate_directory(base_dir, comic_path):
     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.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.icon = 'glyphicon-folder-open'
             df.location = urlsafe_base64_encode(path.join(comic_path, fn))
diff --git a/comic/views.py b/comic/views.py
index 631bd2e..48cc148 100644
--- a/comic/views.py
+++ b/comic/views.py
@@ -8,8 +8,8 @@ from util import generate_breadcrumbs, generate_directory
 
 from os import path
 
-def index(request, comic_path=''):
-    base_dir = Setting.objects.get(name='BASE_DIR')
+def comic_list(request, comic_path=''):
+    base_dir = Setting.objects.get(name='BASE_DIR').value
     comic_path = urlsafe_base64_decode(comic_path)
     breadcrumbs = generate_breadcrumbs(comic_path)
     files = generate_directory(base_dir, comic_path)
@@ -17,11 +17,11 @@ def index(request, comic_path=''):
         'file_list': files,
         'breadcrumbs': breadcrumbs,
     })
-    return render(request, 'comic/index.html', context)
+    return render(request, 'comic/comic_list.html', context)
 
 
 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)
     decoded_path = urlsafe_base64_decode(comic_path)
     breadcrumbs = generate_breadcrumbs(decoded_path)
@@ -42,7 +42,7 @@ def read_comic(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)
     decoded_path = urlsafe_base64_decode(comic_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)
     except ComicBook.DoesNotExist:
         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)
     return HttpResponse(img.read(), content_type=content)