mirror of
https://github.com/ajurna/cbwebreader.git
synced 2025-12-06 06:17:17 +00:00
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.
This commit is contained in:
ajurna@gmail.com
279
comic/models.py
279
comic/models.py
@@ -1,13 +1,14 @@
|
||||
from django.db import models
|
||||
from django.db.transaction import atomic
|
||||
from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode
|
||||
from django.contrib.auth.models import User
|
||||
from django.conf import settings
|
||||
from django.db.transaction import atomic
|
||||
|
||||
from comic import rarfile
|
||||
from comic.util import get_ordered_dir_list
|
||||
|
||||
import uuid
|
||||
import zipfile
|
||||
from os import path
|
||||
from os import path, listdir
|
||||
|
||||
if settings.UNRAR_TOOL:
|
||||
rarfile.UNRAR_TOOL = settings.UNRAR_TOOL
|
||||
@@ -24,13 +25,67 @@ class Setting(models.Model):
|
||||
return self.__str__()
|
||||
|
||||
|
||||
class Directory(models.Model):
|
||||
name = models.CharField(max_length=100)
|
||||
parent = models.ForeignKey('Directory', null=True, blank=True)
|
||||
selector = models.UUIDField(unique=True, default=uuid.uuid4, db_index=True)
|
||||
|
||||
def __str__(self):
|
||||
return 'Directory: {0}; {1}'.format(self.name, self.parent)
|
||||
|
||||
@property
|
||||
def path(self):
|
||||
l = self.get_path_items()
|
||||
l.reverse()
|
||||
return path.sep.join(l)
|
||||
|
||||
def get_path(self):
|
||||
l = self.get_path_items()
|
||||
l.reverse()
|
||||
return path.sep.join(l)
|
||||
|
||||
def get_path_items(self, p=False):
|
||||
if not p:
|
||||
p = []
|
||||
p.append(self.name)
|
||||
if self.parent:
|
||||
self.parent.get_path_items(p)
|
||||
return p
|
||||
|
||||
def get_path_objects(self, p=False):
|
||||
if not p:
|
||||
p = []
|
||||
p.append(self)
|
||||
if self.parent:
|
||||
self.parent.get_path_objects(p)
|
||||
return p
|
||||
|
||||
@staticmethod
|
||||
def get_dir_from_path(file_path):
|
||||
file_path = file_path.split(path.sep)
|
||||
print(file_path)
|
||||
for d in Directory.objects.filter(name=file_path[-1]):
|
||||
print(d)
|
||||
if d.get_path_items() == file_path:
|
||||
return d
|
||||
|
||||
|
||||
class ComicBook(models.Model):
|
||||
file_name = models.CharField(max_length=100, unique=True)
|
||||
date_added = models.DateTimeField(auto_now_add=True)
|
||||
directory = models.ForeignKey(Directory, blank=True, null=True)
|
||||
selector = models.UUIDField(unique=True, default=uuid.uuid4, db_index=True)
|
||||
version = models.IntegerField(default=1)
|
||||
|
||||
def __str__(self):
|
||||
return self.file_name
|
||||
|
||||
def get_image(self, archive_path, page):
|
||||
def get_image(self, page):
|
||||
base_dir = Setting.objects.get(name='BASE_DIR').value
|
||||
if self.directory:
|
||||
archive_path = path.join(base_dir, self.directory.path, self.file_name)
|
||||
else:
|
||||
archive_path = path.join(base_dir, self.file_name)
|
||||
try:
|
||||
archive = rarfile.RarFile(archive_path)
|
||||
except rarfile.NotRarFile:
|
||||
@@ -62,120 +117,103 @@ class ComicBook(models.Model):
|
||||
self.q_prev_to_directory = False
|
||||
self.q_next_to_directory = False
|
||||
|
||||
def nav(self, comic_path, page):
|
||||
def nav(self, page, user):
|
||||
out = self.Navigation()
|
||||
out.cur_index = page
|
||||
out.cur_path = comic_path
|
||||
out.cur_path = urlsafe_base64_encode(self.selector.bytes)
|
||||
|
||||
if page == 0:
|
||||
out.prev_path, out.prev_index = self.nav_get_prev_comic(comic_path)
|
||||
out.prev_path, out.prev_index = self.nav_get_prev_comic(user)
|
||||
if out.prev_index == -1:
|
||||
out.q_prev_to_directory = True
|
||||
else:
|
||||
out.prev_index = page - 1
|
||||
out.prev_path = comic_path
|
||||
out.prev_path = out.cur_path
|
||||
|
||||
if self.is_last_page(page):
|
||||
out.next_path, out.next_index = self.nav_get_next_comic(comic_path)
|
||||
out.next_path, out.next_index = self.nav_get_next_comic(user)
|
||||
if out.next_index == -1:
|
||||
out.q_next_to_directory = True
|
||||
else:
|
||||
out.next_index = page + 1
|
||||
out.next_path = comic_path
|
||||
out.next_path = out.cur_path
|
||||
|
||||
return out
|
||||
|
||||
@staticmethod
|
||||
def nav_get_prev_comic(comic_path):
|
||||
def nav_get_prev_comic(self, user):
|
||||
base_dir = Setting.objects.get(name='BASE_DIR').value
|
||||
comic_path = urlsafe_base64_decode(comic_path).decode()
|
||||
directory, comic = path.split(comic_path)
|
||||
dir_list = get_ordered_dir_list(path.join(base_dir, directory))
|
||||
comic_index = dir_list.index(comic)
|
||||
if self.directory:
|
||||
folder = path.join(base_dir, self.directory.path)
|
||||
else:
|
||||
folder = base_dir
|
||||
dir_list = ComicBook.get_ordered_dir_list(folder)
|
||||
comic_index = dir_list.index(self.file_name)
|
||||
if comic_index == 0:
|
||||
comic_path = urlsafe_base64_encode(directory.encode())
|
||||
if self.directory:
|
||||
comic_path = urlsafe_base64_encode(self.directory.selector.bytes)
|
||||
else:
|
||||
comic_path = ''
|
||||
index = -1
|
||||
else:
|
||||
prev_comic = dir_list[comic_index - 1]
|
||||
comic_path = path.join(directory, prev_comic)
|
||||
if not path.isdir(path.join(base_dir, directory, prev_comic)):
|
||||
|
||||
if not path.isdir(path.join(folder, prev_comic)):
|
||||
try:
|
||||
book = ComicBook.objects.get(file_name=prev_comic)
|
||||
if self.directory:
|
||||
book = ComicBook.objects.get(file_name=prev_comic,
|
||||
directory=self.directory)
|
||||
else:
|
||||
book = ComicBook.objects.get(file_name=prev_comic,
|
||||
directory__isnull=True)
|
||||
except ComicBook.DoesNotExist:
|
||||
book = ComicBook.process_comic_book(base_dir, comic_path, prev_comic)
|
||||
index = ComicPage.objects.filter(Comic=book).count() - 1
|
||||
comic_path = urlsafe_base64_encode(comic_path.encode())
|
||||
if self.directory:
|
||||
book = ComicBook.process_comic_book(prev_comic, self.directory)
|
||||
else:
|
||||
book = ComicBook.process_comic_book(prev_comic)
|
||||
cs, _ = ComicStatus.objects.get_or_create(comic=book, user=user)
|
||||
index = cs.last_read_page
|
||||
comic_path = urlsafe_base64_encode(book.selector.bytes)
|
||||
else:
|
||||
comic_path = urlsafe_base64_encode(directory.encode())
|
||||
if self.directory:
|
||||
comic_path = urlsafe_base64_encode(self.directory.selector.bytes)
|
||||
else:
|
||||
comic_path = ''
|
||||
index = -1
|
||||
return comic_path, index
|
||||
|
||||
@staticmethod
|
||||
def nav_get_next_comic(comic_path):
|
||||
base_dir = Setting.objects.get(name='BASE_DIR')
|
||||
comic_path = urlsafe_base64_decode(comic_path).decode()
|
||||
directory, comic = path.split(comic_path)
|
||||
dir_list = get_ordered_dir_list(path.join(base_dir.value, directory))
|
||||
comic_index = dir_list.index(comic)
|
||||
def nav_get_next_comic(self, user):
|
||||
base_dir = Setting.objects.get(name='BASE_DIR').value
|
||||
if self.directory:
|
||||
folder = path.join(base_dir, self.directory.path)
|
||||
else:
|
||||
folder = base_dir
|
||||
dir_list = ComicBook.get_ordered_dir_list(folder)
|
||||
comic_index = dir_list.index(self.file_name)
|
||||
try:
|
||||
next_comic = dir_list[comic_index + 1]
|
||||
comic_path = path.join(directory, next_comic)
|
||||
comic_path = urlsafe_base64_encode(comic_path)
|
||||
index = 0
|
||||
try:
|
||||
if self.directory:
|
||||
book = ComicBook.objects.get(file_name=next_comic,
|
||||
directory=self.directory)
|
||||
else:
|
||||
book = ComicBook.objects.get(file_name=next_comic,
|
||||
directory__isnull=True)
|
||||
except ComicBook.DoesNotExist:
|
||||
if self.directory:
|
||||
book = ComicBook.process_comic_book(next_comic, self.directory)
|
||||
else:
|
||||
book = ComicBook.process_comic_book(next_comic)
|
||||
comic_path = urlsafe_base64_encode(book.selector.bytes)
|
||||
cs, _ = ComicStatus.objects.get_or_create(comic=book, user=user)
|
||||
index = cs.last_read_page
|
||||
except IndexError:
|
||||
comic_path = urlsafe_base64_encode(directory)
|
||||
if self.directory:
|
||||
comic_path = urlsafe_base64_encode(self.directory.selector.bytes)
|
||||
else:
|
||||
comic_path = ''
|
||||
index = -1
|
||||
return comic_path, index
|
||||
|
||||
@staticmethod
|
||||
def process_comic_book(base_dir, comic_path, comic_file_name):
|
||||
try:
|
||||
cbx = rarfile.RarFile(path.join(base_dir, comic_path))
|
||||
except rarfile.NotRarFile:
|
||||
cbx = zipfile.ZipFile(path.join(base_dir, comic_path))
|
||||
except zipfile.BadZipfile:
|
||||
return False
|
||||
with atomic():
|
||||
book = ComicBook(file_name=comic_file_name)
|
||||
book.save()
|
||||
i = 0
|
||||
for f in sorted([str(x) for x in cbx.namelist()], key=str.lower):
|
||||
try:
|
||||
dot_index = f.rindex('.') + 1
|
||||
except ValueError:
|
||||
continue
|
||||
ext = f.lower()[dot_index:]
|
||||
if ext in ['jpg', 'jpeg']:
|
||||
page = ComicPage(Comic=book,
|
||||
index=i,
|
||||
page_file_name=f,
|
||||
content_type='image/jpeg')
|
||||
page.save()
|
||||
|
||||
i += 1
|
||||
elif ext == 'png':
|
||||
page = ComicPage(Comic=book,
|
||||
index=i,
|
||||
page_file_name=f,
|
||||
content_type='image/png')
|
||||
page.save()
|
||||
i += 1
|
||||
elif ext == 'bmp':
|
||||
page = ComicPage(Comic=book,
|
||||
index=i,
|
||||
page_file_name=f,
|
||||
content_type='image/bmp')
|
||||
page.save()
|
||||
i += 1
|
||||
elif ext == 'gif':
|
||||
page = ComicPage(Comic=book,
|
||||
index=i,
|
||||
page_file_name=f,
|
||||
content_type='image/gif')
|
||||
page.save()
|
||||
i += 1
|
||||
return book
|
||||
|
||||
class DirFile:
|
||||
def __init__(self):
|
||||
self.name = ''
|
||||
@@ -192,7 +230,7 @@ class ComicBook(models.Model):
|
||||
@staticmethod
|
||||
def generate_directory(user, base_dir, comic_path):
|
||||
files = []
|
||||
for fn in get_ordered_dir_list(path.join(base_dir, comic_path)):
|
||||
for fn in ComicBook.get_ordered_dir_list(path.join(base_dir, comic_path)):
|
||||
df = ComicBook.DirFile()
|
||||
df.name = fn
|
||||
if path.isdir(path.join(base_dir, comic_path, fn)):
|
||||
@@ -232,6 +270,76 @@ class ComicBook(models.Model):
|
||||
def page_name(self, index):
|
||||
return ComicPage.objects.get(Comic=self, index=index).page_file_name
|
||||
|
||||
@staticmethod
|
||||
def process_comic_book(comic_file_name, directory=False):
|
||||
"""
|
||||
|
||||
:type comic_file_name: str
|
||||
:type directory: Directory
|
||||
"""
|
||||
try:
|
||||
book = ComicBook.objects.get(file_name=comic_file_name,
|
||||
version=0)
|
||||
book.directory = directory
|
||||
book.version = 1
|
||||
book.save()
|
||||
return book
|
||||
except ComicBook.DoesNotExist:
|
||||
pass
|
||||
base_dir = Setting.objects.get(name='BASE_DIR').value
|
||||
if directory:
|
||||
comic_full_path = path.join(base_dir, directory.get_path(), comic_file_name)
|
||||
else:
|
||||
comic_full_path = path.join(base_dir, comic_file_name)
|
||||
try:
|
||||
cbx = rarfile.RarFile(comic_full_path)
|
||||
except rarfile.NotRarFile:
|
||||
cbx = zipfile.ZipFile(comic_full_path)
|
||||
except zipfile.BadZipfile:
|
||||
return False
|
||||
with atomic():
|
||||
if directory:
|
||||
book = ComicBook(file_name=comic_file_name,
|
||||
directory=directory)
|
||||
else:
|
||||
book = ComicBook(file_name=comic_file_name)
|
||||
book.save()
|
||||
page_index = 0
|
||||
for page_file_name in sorted([str(x) for x in cbx.namelist()], key=str.lower):
|
||||
try:
|
||||
dot_index = page_file_name.rindex('.') + 1
|
||||
except ValueError:
|
||||
continue
|
||||
ext = page_file_name.lower()[dot_index:]
|
||||
if ext in ['jpg', 'jpeg']:
|
||||
content_type = 'image/jpeg'
|
||||
elif ext == 'png':
|
||||
content_type = 'image/png'
|
||||
elif ext == 'bmp':
|
||||
content_type = 'image/bmp'
|
||||
elif ext == 'gif':
|
||||
content_type = 'image/gif'
|
||||
else:
|
||||
content_type = 'text/plain'
|
||||
page = ComicPage(Comic=book,
|
||||
index=page_index,
|
||||
page_file_name=page_file_name,
|
||||
content_type=content_type)
|
||||
page.save()
|
||||
page_index += 1
|
||||
return book
|
||||
|
||||
@staticmethod
|
||||
def get_ordered_dir_list(folder):
|
||||
directories = []
|
||||
files = []
|
||||
for item in listdir(folder):
|
||||
if path.isdir(path.join(folder, item)):
|
||||
directories.append(item)
|
||||
else:
|
||||
files.append(item)
|
||||
return sorted(directories) + sorted(files)
|
||||
|
||||
|
||||
class ComicPage(models.Model):
|
||||
Comic = models.ForeignKey(ComicBook)
|
||||
@@ -246,5 +354,4 @@ class ComicStatus(models.Model):
|
||||
last_read_page = models.IntegerField(default=0)
|
||||
unread = models.BooleanField(default=True)
|
||||
|
||||
|
||||
# TODO: add support to reference items last being read
|
||||
|
||||
Reference in New Issue
Block a user