Merge pull request #7 from apoclyps/docker-support

[ISSUE-3] Adding docker support

comic/views.py

@@ -18,8 +18,14 @@ from django.views.decorators.http import require_POST
 
 from .forms import SettingsForm, AccountForm, EditUserForm, AddUserForm, InitialSetupForm
 from .models import Setting, ComicBook, ComicStatus, Directory, ComicPage, UserMisc
-from .util import generate_breadcrumbs_from_path, generate_breadcrumbs_from_menu, \
-    generate_title_from_path, Menu, generate_directory, generate_label
+from .util import (
+    generate_breadcrumbs_from_path,
+    generate_breadcrumbs_from_menu,
+    generate_title_from_path,
+    Menu,
+    generate_directory,
+    generate_label,
+)
 
 
 # noinspection PyTypeChecker
@@ -27,11 +33,11 @@ from .util import generate_breadcrumbs_from_path, generate_breadcrumbs_from_menu
 @login_required
 def comic_list(request, directory_selector=False):
     try:
-        base_dir = Setting.objects.get(name='BASE_DIR').value
+        base_dir = Setting.objects.get(name="BASE_DIR").value
     except Setting.DoesNotExist:
-        return redirect('/comic/settings/')
+        return redirect("/comic/settings/")
     if not path.isdir(base_dir):
-        return redirect('/comic/settings/')
+        return redirect("/comic/settings/")
 
     if directory_selector:
         selector = uuid.UUID(bytes=urlsafe_base64_decode(directory_selector))
@@ -42,18 +48,17 @@ def comic_list(request, directory_selector=False):
     if directory:
         title = generate_title_from_path(directory.path)
         breadcrumbs = generate_breadcrumbs_from_path(directory)
-        json_url = '/comic/list_json/{0}/'.format(directory_selector)
+        json_url = "/comic/list_json/{0}/".format(directory_selector)
     else:
-        title = generate_title_from_path('Home')
+        title = generate_title_from_path("Home")
         breadcrumbs = generate_breadcrumbs_from_path()
-        json_url = '/comic/list_json/'
+        json_url = "/comic/list_json/"
 
-    return render(request, 'comic/comic_list.html', {
-        'breadcrumbs': breadcrumbs,
-        'menu': Menu(request.user, 'Browse'),
-        'title': title,
-        'json_url': json_url
-    })
+    return render(
+        request,
+        "comic/comic_list.html",
+        {"breadcrumbs": breadcrumbs, "menu": Menu(request.user, "Browse"), "title": title, "json_url": json_url},
+    )
 
 
 @login_required
@@ -67,100 +72,99 @@ def comic_list_json(request, directory_selector=False):
         directory = False
     files = generate_directory(request.user, directory)
     response_data = dict()
-    response_data['data'] = []
+    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,
-            'url': file.location,
-        })
-    return HttpResponse(
-        json.dumps(response_data),
-        content_type="application/json"
-    )
+        response_data["data"].append(
+            {
+                "blank": "",
+                "selector": file.selector,
+                "type": file.type,
+                "icon": icon_str.format(file.icon),
+                "name": file.name,
+                "label": file.label,
+                "url": file.location,
+            }
+        )
+    return HttpResponse(json.dumps(response_data), content_type="application/json")
 
 
 @login_required
 def recent_comics(request):
     feed_id, _ = UserMisc.objects.get_or_create(user=request.user)
 
-    return render(request,
-                  'comic/recent_comics.html',
-                  {
-                      'breadcrumbs': generate_breadcrumbs_from_menu([('Recent', '/comic/recent/')]),
-                      'menu': Menu(request.user, 'Recent'),
-                      'title': 'Recent Comics',
-                      'feed_id': urlsafe_base64_encode(feed_id.feed_id.bytes).decode(),
-                  })
-
-
-@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"
+    return render(
+        request,
+        "comic/recent_comics.html",
+        {
+            "breadcrumbs": generate_breadcrumbs_from_menu([("Recent", "/comic/recent/")]),
+            "menu": Menu(request.user, "Recent"),
+            "title": "Recent Comics",
+            "feed_id": urlsafe_base64_encode(feed_id.feed_id.bytes),
+        },
     )
 
 
+@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),
+                "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), 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:
+    if "selected" not in request.POST:
         return HttpResponse(status=200)
-    if request.POST['func'] == 'choose':
+    if request.POST["func"] == "choose":
         return HttpResponse(status=200)
-    selected = [uuid.UUID(bytes=urlsafe_base64_decode(item)) for item in request.POST.getlist('selected')]
+    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, _ = 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':
+            elif request.POST["func"] == "unread":
                 status.unread = True
                 status.finished = False
                 status.last_read_page = 0
@@ -174,44 +178,37 @@ def account_page(request):
     if request.POST:
         form = AccountForm(request.POST)
         if form.is_valid():
-            if form.cleaned_data['email'] != request.user.email:
-                request.user.email = form.cleaned_data['email']
-                success_message.append('Email Updated.')
-            if len(form.cleaned_data['password']) != 0:
-                request.user.set_password(form.cleaned_data['password'])
-                success_message.append('Password Updated.')
+            if form.cleaned_data["email"] != request.user.email:
+                request.user.email = form.cleaned_data["email"]
+                success_message.append("Email Updated.")
+            if len(form.cleaned_data["password"]) != 0:
+                request.user.set_password(form.cleaned_data["password"])
+                success_message.append("Password Updated.")
             request.user.save()
     else:
-        form = AccountForm(initial={
-            'username': request.user.username,
-            'email': request.user.email,
-        })
-    crumbs = [
-        ('Account', '/comic/account/'),
-    ]
+        form = AccountForm(initial={"username": request.user.username, "email": request.user.email})
+    crumbs = [("Account", "/comic/account/")]
     context = {
-        'form': form,
-        'menu': Menu(request.user, 'Account'),
-        'error_message': form.errors,
-        'success_message': '</br>'.join(success_message),
-        'breadcrumbs': generate_breadcrumbs_from_menu(crumbs),
-        'title': 'CBWebReader - Account',
+        "form": form,
+        "menu": Menu(request.user, "Account"),
+        "error_message": form.errors,
+        "success_message": "</br>".join(success_message),
+        "breadcrumbs": generate_breadcrumbs_from_menu(crumbs),
+        "title": "CBWebReader - Account",
     }
-    return render(request, 'comic/settings_page.html', context)
+    return render(request, "comic/settings_page.html", context)
 
 
 @user_passes_test(lambda u: u.is_superuser)
 def users_page(request):
     users = User.objects.all()
-    crumbs = [
-        ('Users', '/comic/settings/users/'),
-    ]
+    crumbs = [("Users", "/comic/settings/users/")]
     context = {
-        'users': users,
-        'menu': Menu(request.user, 'Users'),
-        'breadcrumbs': generate_breadcrumbs_from_menu(crumbs),
+        "users": users,
+        "menu": Menu(request.user, "Users"),
+        "breadcrumbs": generate_breadcrumbs_from_menu(crumbs),
     }
-    return render(request, 'comic/users_page.html', context)
+    return render(request, "comic/users_page.html", context)
 
 
 @user_passes_test(lambda u: u.is_superuser)
@@ -221,89 +218,78 @@ def user_config_page(request, user_id):
     if request.POST:
         form = EditUserForm(request.POST)
         if form.is_valid():
-            if 'password' in form.cleaned_data:
-                if len(form.cleaned_data['password']) != 0:
-                    user.set_password(form.cleaned_data['password'])
-                    success_message.append('Password Updated.')
-            if form.cleaned_data['email'] != user.email:
-                user.email = form.cleaned_data['email']
-                success_message.append('Email Updated.</br>')
+            if "password" in form.cleaned_data:
+                if len(form.cleaned_data["password"]) != 0:
+                    user.set_password(form.cleaned_data["password"])
+                    success_message.append("Password Updated.")
+            if form.cleaned_data["email"] != user.email:
+                user.email = form.cleaned_data["email"]
+                success_message.append("Email Updated.</br>")
             user.save()
     else:
         form = EditUserForm(initial=EditUserForm.get_initial_values(user))
 
     users = User.objects.all()
-    crumbs = [
-        ('Users', '/comic/settings/users/'),
-        (user.username, '/comic/settings/users/' + str(user.id)),
-    ]
+    crumbs = [("Users", "/comic/settings/users/"), (user.username, "/comic/settings/users/" + str(user.id))]
     context = {
-        'form': form,
-        'users': users,
-        'menu': Menu(request.user, 'Users'),
-        'error_message': form.errors,
-        'breadcrumbs': generate_breadcrumbs_from_menu(crumbs),
-        'success_message': '</br>'.join(success_message),
-        'title': 'CBWebReader - Edit User - ' + user.username,
+        "form": form,
+        "users": users,
+        "menu": Menu(request.user, "Users"),
+        "error_message": form.errors,
+        "breadcrumbs": generate_breadcrumbs_from_menu(crumbs),
+        "success_message": "</br>".join(success_message),
+        "title": "CBWebReader - Edit User - " + user.username,
     }
-    return render(request, 'comic/settings_page.html', context)
+    return render(request, "comic/settings_page.html", context)
 
 
 @user_passes_test(lambda u: u.is_superuser)
 def user_add_page(request):
-    success_message = ''
+    success_message = ""
     if request.POST:
         form = AddUserForm(request.POST)
         if form.is_valid():
-            user = User(
-                username=form.cleaned_data['username'],
-                email=form.cleaned_data['email'],
-            )
-            user.set_password(form.cleaned_data['password'])
+            user = User(username=form.cleaned_data["username"], email=form.cleaned_data["email"])
+            user.set_password(form.cleaned_data["password"])
             user.save()
             UserMisc.objects.create(user=user)
-            success_message = 'User {} created.'.format(user.username)
+            success_message = "User {} created.".format(user.username)
 
     else:
         form = AddUserForm()
-    crumbs = [
-        ('Users', '/comic/settings/users/'),
-        ('Add', '/comic/settings/users/add/'),
-    ]
+    crumbs = [("Users", "/comic/settings/users/"), ("Add", "/comic/settings/users/add/")]
     context = {
-        'form': form,
-        'menu': Menu(request.user, 'Users'),
-        'breadcrumbs': generate_breadcrumbs_from_menu(crumbs),
-        'error_message': form.errors,
-        'success_message': success_message,
-        'title': 'CBWebReader - Add User',
+        "form": form,
+        "menu": Menu(request.user, "Users"),
+        "breadcrumbs": generate_breadcrumbs_from_menu(crumbs),
+        "error_message": form.errors,
+        "success_message": success_message,
+        "title": "CBWebReader - Add User",
     }
-    return render(request, 'comic/settings_page.html', context)
+    return render(request, "comic/settings_page.html", context)
 
 
 @user_passes_test(lambda u: u.is_superuser)
 def settings_page(request):
     success_message = []
-    crumbs = [
-        ('Settings', '/comic/settings/'),
-    ]
+    crumbs = [("Settings", "/comic/settings/")]
     if request.POST:
         form = SettingsForm(request.POST)
         if form.is_valid():
-            base_dir = Setting.objects.get(name='BASE_DIR')
-            base_dir.value = form.cleaned_data['base_dir']
+            base_dir = Setting.objects.get(name="BASE_DIR")
+            base_dir.value = form.cleaned_data["base_dir"]
             base_dir.save()
-            success_message.append('Settings updated.')
+            success_message.append("Settings updated.")
     form = SettingsForm(initial=SettingsForm.get_initial_values())
     context = {
-        'error_message': form.errors,
-        'success_message': '</br>'.join(success_message),
-        'form': form,
-        'menu': Menu(request.user, 'Settings'),
-        'title': 'CBWebReader - Settings',
-        'breadcrumbs': generate_breadcrumbs_from_menu(crumbs),
+        "error_message": form.errors,
+        "success_message": "</br>".join(success_message),
+        "form": form,
+        "menu": Menu(request.user, "Settings"),
+        "title": "CBWebReader - Settings",
+        "breadcrumbs": generate_breadcrumbs_from_menu(crumbs),
     }
-    return render(request, 'comic/settings_page.html', context)
+    return render(request, "comic/settings_page.html", context)
 
 
 @login_required
@@ -317,21 +303,21 @@ def read_comic(request, comic_selector, page):
     status, _ = ComicStatus.objects.get_or_create(comic=book, user=request.user)
     status.unread = False
     status.last_read_page = page
-    if ComicPage.objects.filter(Comic=book).aggregate(Max('index'))['index__max'] == status.last_read_page:
+    if ComicPage.objects.filter(Comic=book).aggregate(Max("index"))["index__max"] == status.last_read_page:
         status.finished = True
     else:
         status.finished = False
     status.save()
-    title = 'CBWebReader - ' + book.file_name + ' - Page: ' + str(page)
+    title = "CBWebReader - " + book.file_name + " - Page: " + str(page)
     context = {
-        'book': book,
-        'orig_file_name': book.page_name(page),
-        'nav': book.nav(page, request.user),
-        'breadcrumbs': breadcrumbs,
-        'menu': Menu(request.user),
-        'title': title,
+        "book": book,
+        "orig_file_name": book.page_name(page),
+        "nav": book.nav(page, request.user),
+        "breadcrumbs": breadcrumbs,
+        "menu": Menu(request.user),
+        "title": title,
     }
-    return render(request, 'comic/read_comic.html', context)
+    return render(request, "comic/read_comic.html", context)
 
 
 @login_required
@@ -344,34 +330,29 @@ def get_image(_, comic_selector, page):
 
 def initial_setup(request):
     if User.objects.all().exists():
-        return redirect('/comic/')
+        return redirect("/comic/")
     if request.POST:
         form = InitialSetupForm(request.POST)
         if form.is_valid():
             user = User(
-                username=form.cleaned_data['username'],
-                email=form.cleaned_data['email'],
+                username=form.cleaned_data["username"],
+                email=form.cleaned_data["email"],
                 is_staff=True,
                 is_superuser=True,
             )
-            user.set_password(form.cleaned_data['password'])
+            user.set_password(form.cleaned_data["password"])
             user.save()
-            base_dir, _ = Setting.objects.get_or_create(name='BASE_DIR')
-            base_dir.value = form.cleaned_data['base_dir']
+            base_dir, _ = Setting.objects.get_or_create(name="BASE_DIR")
+            base_dir.value = form.cleaned_data["base_dir"]
             base_dir.save()
-            user = authenticate(username=form.cleaned_data['username'],
-                                password=form.cleaned_data['password'])
+            user = authenticate(username=form.cleaned_data["username"], password=form.cleaned_data["password"])
             login(request, user)
-            return redirect('/comic/')
+            return redirect("/comic/")
     else:
         form = InitialSetupForm()
-    context = {
-        'form': form,
-        'title': 'CBWebReader - Setup',
-        'error_message': form.errors,
-    }
-    return render(request, 'comic/settings_page.html', context)
+    context = {"form": form, "title": "CBWebReader - Setup", "error_message": form.errors}
+    return render(request, "comic/settings_page.html", context)
 
 
 def comic_redirect(_):
-    return redirect('/comic/')
+    return redirect("/comic/")