some code cleanup, added silk to look into some queries.

cbreader/settings.py

@@ -37,6 +37,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'silk',
     'captcha',
     'comic',
     'comic_auth',
@@ -51,6 +52,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
+    'silk.middleware.SilkyMiddleware',
 )
 
 ROOT_URLCONF = 'cbreader.urls'

cbreader/urls.py

@@ -15,8 +15,9 @@ Including another URLconf
 """
 from django.conf.urls import include, url
 from django.contrib import admin
-import comic_auth.views
+
 import comic.views
+import comic_auth.views
 
 urlpatterns = [
     url(r'^$', comic.views.comic_redirect),
@@ -25,5 +26,5 @@ urlpatterns = [
     url(r'^setup/', comic.views.initial_setup),
     url(r'^comic/', include('comic.urls')),
     url(r'^admin/', include(admin.site.urls)),
-
+    url(r'^silk/', include('silk.urls', namespace='silk'))
 ]

comic/models.py

@@ -35,25 +35,23 @@ class Directory(models.Model):
 
     @property
     def path(self):
-        l = self.get_path_items()
+        return self.get_path()
-        l.reverse()
-        return path.sep.join(l)
 
     def get_path(self):
-        l = self.get_path_items()
+        path_items = self.get_path_items()
-        l.reverse()
+        path_items.reverse()
-        return path.sep.join(l)
+        return path.sep.join(path_items)
 
-    def get_path_items(self, p=False):
+    def get_path_items(self, p=None):
-        if not p:
+        if p is None:
             p = []
         p.append(self.name)
         if self.parent:
             self.parent.get_path_items(p)
         return p
 
-    def get_path_objects(self, p=False):
+    def get_path_objects(self, p=None):
-        if not p:
+        if p is None:
             p = []
         p.append(self)
         if self.parent:
@@ -103,25 +101,27 @@ class ComicBook(models.Model):
 
     @property
     def page_count(self):
-        page_count = ComicPage.objects.filter(Comic=self).count()
+        return ComicPage.objects.filter(Comic=self).count()
-        return page_count
 
     class Navigation:
-        def __init__(self):
+        next_index = 0
-            self.next_index = 0
+        next_path = ''
-            self.next_path = ''
+        prev_index = 0
-            self.prev_index = 0
+        prev_path = ''
-            self.prev_path = ''
+        cur_index = 0
-            self.cur_index = 0
+        cur_path = ''
-            self.cur_path = ''
+        q_prev_to_directory = False
-            self.q_prev_to_directory = False
+        q_next_to_directory = False
-            self.q_next_to_directory = False
+
+        def __init__(self, **kwargs):
+            for arg in kwargs:
+                setattr(self, arg, kwargs[arg])
 
     def nav(self, page, user):
-        out = self.Navigation()
+        out = self.Navigation(
-        out.cur_index = page
+            cur_index=page,
-        out.cur_path = urlsafe_base64_encode(self.selector.bytes)
+            cur_path=urlsafe_base64_encode(self.selector.bytes)
-
+        )
         if page == 0:
             out.prev_path, out.prev_index = self.nav_get_prev_comic(user)
             if out.prev_index == -1:
@@ -137,7 +137,6 @@ class ComicBook(models.Model):
         else:
             out.next_index = page + 1
             out.next_path = out.cur_path
-
         return out
 
     def nav_get_prev_comic(self, user):
@@ -231,10 +230,7 @@ class ComicBook(models.Model):
 
     @property
     def pages(self):
-        out = []
+        return [cp for cp in ComicPage.objects.filter(Comic=self).order_by('index')]
-        for item in ComicPage.objects.filter(Comic=self).order_by('index'):
-            out.append(item)
-        return out
 
     def page_name(self, index):
         return ComicPage.objects.get(Comic=self, index=index).page_file_name