added tests for the comicbook model

fixed bug related to last page link

comic/models.py

@@ -55,7 +55,7 @@ class ComicBook(models.Model):
             self.prev_path = ''
             self.cur_index = 0
             self.cur_path = ''
-            self.q_prev_comic = False
+            self.q_prev_to_directory = False
             self.q_next_to_directory = False
 
     def nav(self, comic_path, page):
@@ -94,7 +94,7 @@ class ComicBook(models.Model):
         else:
             prev_comic = dir_list[comic_index - 1]
             comic_path = path.join(directory, prev_comic)
-            if not path.isdir(path.join(base_dir, prev_comic)):
+            if not path.isdir(path.join(base_dir, directory, prev_comic)):
                 try:
                     book = ComicBook.objects.get(file_name=prev_comic)
                 except ComicBook.DoesNotExist:
@@ -192,7 +192,7 @@ class ComicBook(models.Model):
                 df.isdir = True
                 df.icon = 'glyphicon-folder-open'
                 df.location = urlsafe_base64_encode(path.join(comic_path, fn))
-            elif fn.lower().endswith('cbz') or fn.lower().endswith('cbr'):
+            elif fn.lower()[-4:] in ['.rar', '.zip', '.cbr', '.cbz']:
                 df.iscb = True
                 df.icon = 'glyphicon-book'
                 df.location = urlsafe_base64_encode(path.join(comic_path, fn))
@@ -213,20 +213,16 @@ class ComicBook(models.Model):
                     df.label = '<span class="label label-danger pull-right">Unprocessed</span>'
             files.append(df)
         return files
-    class Comic:
-        def __init__(self):
-            self.name = ''
-            self.index = 0
 
+    @property
     def pages(self):
         out = []
         for item in ComicPage.objects.filter(Comic=self).order_by('index'):
-            i = self.Comic()
-            i.name = item.page_file_name
-            i.index = item.index
-            out.append(i)
+            out.append(item)
         return out
 
+    def page_name(self, index):
+        return ComicPage.objects.get(Comic=self, index=index).page_file_name
 
 class ComicPage(models.Model):
     Comic = models.ForeignKey(ComicBook)

comic/templates/comic/read_comic.html

@@ -34,7 +34,7 @@
             <button type="button" data-toggle="dropdown" class="btn btn-default dropdown-toggle ">{{ orig_file_name }}<span class="caret"></span></button>
             <ul class="dropdown-menu" id="dropdown-list">
                 {% for file in book.pages %}
-                    <li><a href="/comic/read/{{ nav.cur_path }}/{{ file.index }}/">{{ file.name }}</a></li>
+                    <li><a href="/comic/read/{{ nav.cur_path }}/{{ file.index }}/">{{ file.page_file_name }}</a></li>
                 {% endfor %}
             </ul>
         </div>

comic/util.py

@@ -33,18 +33,12 @@ def generate_breadcrumbs(comic_path):
     return output
 
 
-
-
 def get_ordered_dir_list(folder):
     directories = []
     files = []
-    print(folder)
     for item in os.listdir(folder):
         if path.isdir(path.join(folder, item)):
             directories.append(item)
         else:
             files.append(item)
-    print(directories)
     return sorted(directories) + sorted(files)
-
-

comic/views.py

@@ -62,7 +62,7 @@ def read_comic(request, comic_path, page):
     book.save()
     context = RequestContext(request, {
         'book': book,
-        'orig_file_name': book.pages()[page].name,
+        'orig_file_name': book.page_name(page),
         'nav': book.nav(comic_path, page),
         'breadcrumbs': breadcrumbs,
     })