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

made sorting work in all locations.

Browse Source
This commit is contained in:
Ajurna
2015-06-22 13:24:37 +01:00
parent 0e66f55f62
commit b7dcdc5d94
3 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
comic/util.py
View File

@@ -1,7 +1,5 @@
from django.utils.http import urlsafe_base64_encode
from comic.models import ComicBook
from os import path
import os
@@ -35,18 +33,7 @@ def generate_breadcrumbs(comic_path):
return output
class DirFile:
def __init__(self):
self.name = ''
self.isdir = False
self.icon = ''
self.iscb = False
self.location = ''
self.label = ''
self.cur_page = 0
def __str__(self):
return self.name
def get_ordered_dir_list(folder):
directories = []
@@ -60,30 +47,4 @@ def get_ordered_dir_list(folder):
print(directories)
return sorted(directories) + sorted(files)
def generate_directory(base_dir, comic_path):
files = []
for fn in get_ordered_dir_list(path.join(base_dir, comic_path)):
df = DirFile()
df.name = fn
if path.isdir(path.join(base_dir, comic_path, fn)):
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'):
df.iscb = True
df.icon = 'glyphicon-book'
df.location = urlsafe_base64_encode(path.join(comic_path, fn))
try:
book = ComicBook.objects.get(file_name=fn)
if book.unread:
df.label = '<span class="label label-default pull-right">Unread</span>'
else:
last_page = book.last_read_page
label_text = '<span class="label label-primary pull-right">%s/%s</span>' % \
(last_page, book.page_count)
df.label = label_text
df.cur_page = last_page
except ComicBook.DoesNotExist:
df.label = '<span class="label label-danger pull-right">Unprocessed</span>'
files.append(df)
return files