ajurna/cbwebreader
1
0
Fork 0
mirror of https://github.com/ajurna/cbwebreader.git synced 2025-12-06 14:17:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7 from apoclyps/docker-support

Browse Source 
[ISSUE-3] Adding docker support
This commit is contained in:
Ajurna
2019-07-25 22:06:52 +01:00
committed by Apoclyps
parent 4287ae3153 2bc64f690a
commit f87ab8636b
54 changed files with 2106 additions and 1476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
comic/util.py
View File

@@ -8,32 +8,32 @@ from .models import ComicBook, Setting, ComicStatus, Directory
def generate_title_from_path(file_path):
if file_path == '':
return 'CBWebReader'
return 'CBWebReader - ' + ' - '.join(file_path.split(path.sep))
if file_path == "":
return "CBWebReader"
return "CBWebReader - " + " - ".join(file_path.split(path.sep))
class Menu:
def __init__(self, user, page=''):
def __init__(self, user, page=""):
"""
:type page: str
"""
self.menu_items = OrderedDict()
self.menu_items['Browse'] = '/comic/'
self.menu_items['Recent'] = '/comic/recent/'
self.menu_items['Account'] = '/comic/account/'
self.menu_items["Browse"] = "/comic/"
self.menu_items["Recent"] = "/comic/recent/"
self.menu_items["Account"] = "/comic/account/"
if user.is_superuser:
self.menu_items['Settings'] = '/comic/settings/'
self.menu_items['Users'] = '/comic/settings/users/'
self.menu_items['Logout'] = '/logout/'
self.menu_items["Settings"] = "/comic/settings/"
self.menu_items["Users"] = "/comic/settings/users/"
self.menu_items["Logout"] = "/logout/"
self.current_page = page
class Breadcrumb:
def __init__(self):
self.name = 'Home'
self.url = '/comic/'
self.name = "Home"
self.url = "/comic/"
def __str__(self):
return self.name
@@ -56,12 +56,12 @@ def generate_breadcrumbs_from_path(directory=False, book=False):
for item in folders[::-1]:
bc = Breadcrumb()
bc.name = item.name
bc.url = '/comic/' + urlsafe_base64_encode(item.selector.bytes).decode()
bc.url = "/comic/" + urlsafe_base64_encode(item.selector.bytes)
output.append(bc)
if book:
bc = Breadcrumb()
bc.name = book.file_name
bc.url = '/read/' + urlsafe_base64_encode(book.selector.bytes).decode()
bc.url = "/read/" + urlsafe_base64_encode(book.selector.bytes)
output.append(bc)
return output
@@ -79,46 +79,45 @@ def generate_breadcrumbs_from_menu(paths):
class DirFile:
def __init__(self):
self.name = ''
self.icon = ''
self.location = ''
self.label = ''
self.type = ''
self.selector = ''
self.name = ""
self.icon = ""
self.location = ""
self.label = ""
self.type = ""
self.selector = ""
def __str__(self):
return self.name
def populate_directory(self, directory, user):
self.name = directory.name
self.icon = 'glyphicon-folder-open'
self.selector = urlsafe_base64_encode(directory.selector.bytes).decode()
self.location = '/comic/{0}/'.format(self.selector)
self.icon = "glyphicon-folder-open"
self.selector = urlsafe_base64_encode(directory.selector.bytes)
self.location = "/comic/{0}/".format(self.selector)
self.label = generate_dir_status(user, directory)
self.type = 'directory'
self.type = "directory"
def populate_comic(self, comic, user):
if type(comic) == str:
self.icon = 'glyphicon-remove'
self.icon = "glyphicon-remove"
self.name = comic
self.selector = '0'
self.location = '/'
self.selector = "0"
self.location = "/"
self.label = '<center><span class="label label-danger">Error</span></center>'
self.type = 'book'
self.type = "book"
else:
self.icon = 'glyphicon-book'
self.icon = "glyphicon-book"
self.name = comic.file_name
status, created = ComicStatus.objects.get_or_create(comic=comic, user=user)
if created:
status.save()
self.selector = urlsafe_base64_encode(comic.selector.bytes).decode()
self.location = '/comic/read/{0}/{1}/'.format(self.selector,
status.last_read_page)
self.selector = urlsafe_base64_encode(comic.selector.bytes)
self.location = "/comic/read/{0}/{1}/".format(self.selector, status.last_read_page)
self.label = generate_label(comic, status)
self.type = 'book'
self.type = "book"
def __repr__(self):
return f'<DirFile: {self.name}: {self.type}>'
return f"<DirFile: {self.name}: {self.type}>"
def generate_directory(user, directory=False):
@@ -126,7 +125,7 @@ def generate_directory(user, directory=False):
:type user: User
:type directory: Directory
"""
base_dir = Setting.objects.get(name='BASE_DIR').value
base_dir = Setting.objects.get(name="BASE_DIR").value
files = []
if directory:
ordered_dir_list = listdir(path.join(base_dir, directory.path))
@@ -136,15 +135,11 @@ def generate_directory(user, directory=False):
dir_list = [x for x in ordered_dir_list if path.isdir(path.join(base_dir, x))]
file_list = [x for x in ordered_dir_list if x not in dir_list]
if directory:
dir_list_obj = Directory.objects.filter(name__in=dir_list,
parent=directory)
file_list_obj = ComicBook.objects.filter(file_name__in=file_list,
directory=directory)
dir_list_obj = Directory.objects.filter(name__in=dir_list, parent=directory)
file_list_obj = ComicBook.objects.filter(file_name__in=file_list, directory=directory)
else:
dir_list_obj = Directory.objects.filter(name__in=dir_list,
parent__isnull=True)
file_list_obj = ComicBook.objects.filter(file_name__in=file_list,
directory__isnull=True)
dir_list_obj = Directory.objects.filter(name__in=dir_list, parent__isnull=True)
file_list_obj = ComicBook.objects.filter(file_name__in=file_list, directory__isnull=True)
for directory_obj in dir_list_obj:
df = DirFile()
df.populate_directory(directory_obj, user)
@@ -159,8 +154,7 @@ def generate_directory(user, directory=False):
file_list.remove(file_obj.file_name)
for directory_name in dir_list:
if directory:
directory_obj = Directory(name=directory_name,
parent=directory)
directory_obj = Directory(name=directory_name, parent=directory)
else:
directory_obj = Directory(name=directory_name)
directory_obj.save()
@@ -168,7 +162,7 @@ def generate_directory(user, directory=False):
df.populate_directory(directory_obj, user)
files.append(df)
for file_name in file_list:
if file_name.lower()[-4:] in ['.rar', '.zip', '.cbr', '.cbz']:
if file_name.lower()[-4:] in [".rar", ".zip", ".cbr", ".cbz"]:
book = ComicBook.process_comic_book(file_name, directory)
df = DirFile()
df.populate_comic(book, user)
@@ -184,17 +178,17 @@ def generate_label(book, status):
elif (status.last_read_page + 1) == book.page_count:
label_text = '<center><span class="label label-success">Read</span></center>'
else:
label_text = '<center><span class="label label-primary">%s/%s</span></center>' % \
(status.last_read_page + 1, book.page_count)
label_text = '<center><span class="label label-primary">%s/%s</span></center>' % (
status.last_read_page + 1,
book.page_count,
)
return label_text
def generate_dir_status(user, directory):
cb_list = ComicBook.objects.filter(directory=directory)
total = cb_list.count()
total_read = ComicStatus.objects.filter(user=user,
comic__in=cb_list,
finished=True).count()
total_read = ComicStatus.objects.filter(user=user, comic__in=cb_list, finished=True).count()
if total == 0:
return '<center><span class="label label-default">Empty</span></center>'
elif total == total_read: