made major changes to interface.

can now mark comics as read!
also added a recently added section.

comic/views.py

@@ -6,18 +6,20 @@ from django.contrib.auth import login, authenticate
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.models import User
 from django.db.models import Max
+from django.db.transaction import atomic
 from django.http import HttpResponse
 from django.shortcuts import render, redirect, get_object_or_404
-from django.utils.http import urlsafe_base64_decode
+from django.utils.http import urlsafe_base64_decode, urlsafe_base64_encode
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.views.decorators.http import require_POST
 
 from .forms import SettingsForm, AccountForm, EditUserForm, AddUserForm, InitialSetupForm
 from .models import Setting, ComicBook, ComicStatus, Directory, ComicPage
 from .util import generate_breadcrumbs_from_path, generate_breadcrumbs_from_menu, \
-    generate_title_from_path, Menu, generate_directory
+    generate_title_from_path, Menu, generate_directory, generate_label
 
 
+# noinspection PyTypeChecker
 @ensure_csrf_cookie
 @login_required
 def comic_list(request, directory_selector=False):
@@ -42,10 +44,8 @@ def comic_list(request, directory_selector=False):
         title = generate_title_from_path('Home')
         breadcrumbs = generate_breadcrumbs_from_path()
         json_url = '/comic/list_json/'
-    files = generate_directory(request.user)
 
     return render(request, 'comic/comic_list.html', {
-        'file_list': files,
         'breadcrumbs': breadcrumbs,
         'menu': Menu(request.user, 'Browse'),
         'title': title,
@@ -67,6 +67,9 @@ def comic_list_json(request, directory_selector=False):
     response_data['data'] = []
     for file in files:
         response_data['data'].append({
+            'blank': '',
+            'selector': file.selector,
+            'type': file.type,
             'icon': icon_str.format(file.icon),
             'name': file.name,
             'label': file.label,
@@ -78,6 +81,87 @@ def comic_list_json(request, directory_selector=False):
     )
 
 
+@login_required
+def recent_comics(request):
+    return render(request,
+                  'comic/recent_comics.html',
+                  {
+                      'breadcrumbs': generate_breadcrumbs_from_menu([('Recent', '/comic/recent/')]),
+                      'menu': Menu(request.user, 'Recent'),
+                      'title': 'Recent Comics'
+                  })
+
+
+@login_required
+@require_POST
+def recent_comics_json(request):
+    start = int(request.POST['start'])
+    end = start + int(request.POST['length'])
+    icon = '<span class="glyphicon glyphicon-book"></span>'
+    comics = ComicBook.objects.all()
+    response_data = dict()
+    response_data['recordsTotal'] = comics.count()
+    if request.POST['search[value]']:
+        comics = comics.filter(file_name__contains=request.POST['search[value]'])
+    order_string = ''
+    # Ordering
+    if request.POST['order[0][dir]'] == 'desc':
+        order_string += '-'
+    if request.POST['order[0][dir]'] == '3':
+        order_string += 'date_added'
+    elif request.POST['order[0][dir]'] == '2':
+        order_string += 'date_added'
+    else:
+        order_string += 'date_added'
+    comics = comics.order_by(order_string)
+    response_data['recordsFiltered'] = comics.count()
+    response_data['data'] = list()
+    for book in comics[start:end]:
+        status, created = ComicStatus.objects.get_or_create(comic=book,
+                                                            user=request.user)
+        if created:
+            status.save()
+        response_data['data'].append({
+            'selector': urlsafe_base64_encode(book.selector.bytes).decode(),
+            'icon': icon,
+            'type': 'book',
+            'name': book.file_name,
+            'date': book.date_added.strftime('%d/%m/%y-%H:%M'),
+            'label': generate_label(book, status),
+            'url': '/comic/read/{0}/{1}/'.format(urlsafe_base64_encode(book.selector.bytes).decode(),
+                                                 status.last_read_page)
+        })
+    return HttpResponse(
+        json.dumps(response_data),
+        content_type="application/json"
+    )
+
+
+@login_required
+@require_POST
+def comic_edit(request):
+    if 'selected' not in request.POST:
+        return HttpResponse(status=200)
+    if request.POST['func'] == 'choose':
+        return HttpResponse(status=200)
+    selected = [uuid.UUID(bytes=urlsafe_base64_decode(item)) for item in request.POST.getlist('selected')]
+    comics = ComicBook.objects.filter(selector__in=selected)
+    with atomic():
+        for comic in comics:
+            status, _ = ComicStatus.objects.get_or_create(comic=comic,
+                                                          user=request.user)
+            if request.POST['func'] == 'read':
+                status.unread = False
+                status.finished = True
+                status.last_read_page = comic.page_count - 1
+            elif request.POST['func'] == 'unread':
+                status.unread = True
+                status.finished = False
+                status.last_read_page = 0
+            status.save()
+    return HttpResponse(status=200)
+
+
 @login_required
 def account_page(request):
     success_message = []