massive change on how files are accessed.

moved from prviding a path to using unique id's
if there might have been any directory traversal issues they should be gone now.

comic/util.py

@@ -1,14 +1,15 @@
+from collections import OrderedDict
+from os import path, listdir
+
 from django.utils.http import urlsafe_base64_encode
 
-from os import path
-from collections import OrderedDict
-import os
+from .models import ComicBook, Setting, ComicStatus, Directory
 
 
-def generate_title_from_path(path):
-    if path == '':
+def generate_title_from_path(file_path):
+    if file_path == '':
         return 'CBWebReader'
-    return 'CBWebReader - ' + ' - '.join(path.split(os.sep))
+    return 'CBWebReader - ' + ' - '.join(file_path.split(path.sep))
 
 
 class Menu:
@@ -39,19 +40,22 @@ class Breadcrumb:
         return self.name
 
 
-def generate_breadcrumbs_from_path(comic_path):
+def generate_breadcrumbs_from_path(directory=False):
+    """
+
+    :type directory: Directory
+    """
     output = [Breadcrumb()]
-    prefix = '/comic/'
+    prefix = b'/comic/'
     last = ''
-    comic_path = path.normpath(comic_path)
-    folders = comic_path.split(os.sep)
-    for item in folders:
-        if item == '.':
-            continue
+    if directory:
+        folders = directory.get_path_objects()
+    else:
+        folders = []
+    for item in folders[::-1]:
         bc = Breadcrumb()
-        bc.name = item
-        last = path.join(last, item)
-        bc.url = prefix + urlsafe_base64_encode(last.encode()).decode()
+        bc.name = item.name
+        bc.url = prefix + urlsafe_base64_encode(item.selector.bytes)
         output.append(bc)
     return output
 
@@ -66,12 +70,93 @@ def generate_breadcrumbs_from_menu(paths):
     return output
 
 
+def generate_directory(user, directory=False):
+    """
+
+    :type user: User
+    :type directory: Directory
+    """
+    base_dir = Setting.objects.get(name='BASE_DIR').value
+    files = []
+    if directory:
+        dir_path = directory.path
+        ordered_dir_list = get_ordered_dir_list(path.join(base_dir, directory.path))
+    else:
+        dir_path = ''
+        ordered_dir_list = get_ordered_dir_list(base_dir)
+    for file_name in ordered_dir_list:
+        df = ComicBook.DirFile()
+        df.name = file_name
+        if path.isdir(path.join(base_dir, dir_path, file_name)):
+            if directory:
+                d = Directory.objects.get(name=file_name,
+                                          parent=directory)
+            else:
+                d = Directory.objects.get(name=file_name,
+                                          parent__isnull=True)
+            df.isdir = True
+            df.icon = 'glyphicon-folder-open'
+            df.location = urlsafe_base64_encode(d.selector.bytes)
+        elif file_name.lower()[-4:] in ['.rar', '.zip', '.cbr', '.cbz']:
+            df.iscb = True
+            df.icon = 'glyphicon-book'
+            try:
+                if directory:
+                    book = ComicBook.objects.get(file_name=file_name,
+                                                 directory=directory)
+                else:
+                    book = ComicBook.objects.get(file_name=file_name,
+                                                 directory__isnull=True)
+            except ComicBook.DoesNotExist:
+                book = ComicBook.process_comic_book(file_name, directory)
+            df.location = urlsafe_base64_encode(book.selector.bytes)
+            status, _ = ComicStatus.objects.get_or_create(comic=book, user=user)
+            last_page = status.last_read_page
+            if status.unread:
+                df.label = '<span class="label label-default pull-right">Unread</span>'
+            elif (last_page + 1) == book.page_count:
+                df.label = '<span class="label label-success pull-right">Read</span>'
+                df.cur_page = last_page
+            else:
+                label_text = '<span class="label label-primary pull-right">%s/%s</span>' % \
+                             (last_page + 1, book.page_count)
+                df.label = label_text
+                df.cur_page = last_page
+
+                # df.label = '<span class="label label-danger pull-right">Unprocessed</span>'
+        files.append(df)
+    return files
+
+
 def get_ordered_dir_list(folder):
     directories = []
     files = []
-    for item in os.listdir(folder):
+    for item in listdir(folder):
         if path.isdir(path.join(folder, item)):
             directories.append(item)
         else:
             files.append(item)
     return sorted(directories) + sorted(files)
+
+
+def scan_directory(directory=False):
+    """
+    TODO: Increase efficiency of this. reduce amount of queries.
+    :type directory: Directory
+    """
+    base_dir = Setting.objects.get(name='BASE_DIR').value
+    # filter(os.path.isdir, os.listdir(os.getcwd()))
+    if directory:
+        full_path = path.join(base_dir, directory.path)
+    else:
+        full_path = base_dir
+    dir_list = listdir(full_path)
+    directorys = [d for d in dir_list if path.isdir(path.join(full_path, d))]
+    for direct in directorys:
+        if directory:
+            d, created = Directory.objects.get_or_create(name=direct,
+                                                         parent=directory)
+        else:
+            d, created = Directory.objects.get_or_create(name=direct)
+        if created:
+            d.save()