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

Refactoring codebase to remove .decode()

Browse Source
This commit is contained in:
Apoclyps
2019-07-24 07:43:05 +01:00
parent 44620b7b37
commit bd605e5832
6 changed files with 192 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cbreader/settings.py
View File

@@ -114,7 +114,7 @@ LOGIN_REDIRECT_URL = '/comic/'
LOGIN_URL = '/login/' LOGIN_URL = '/login/'
UNRAR_TOOL = 'C:/Program Files/WinRAR/unrar' UNRAR_TOOL = os.getenv("UNRAR_TOOL", None)
CBREADER_USE_RECAPTCHA = False CBREADER_USE_RECAPTCHA = False
RECAPTCHA_PRIVATE_KEY = '' RECAPTCHA_PRIVATE_KEY = ''

2
comic/feeds.py
View File

@@ -29,4 +29,4 @@ class RecentComics(Feed):
# item_link is only needed if NewsItem has no get_absolute_url method. # item_link is only needed if NewsItem has no get_absolute_url method.
def item_link(self, item: ComicBook) -> str: def item_link(self, item: ComicBook) -> str:
return '/comic/read/{0}/0/'.format(urlsafe_base64_encode(item.selector.bytes).decode()) return '/comic/read/{0}/0/'.format(urlsafe_base64_encode(item.selector.bytes))

14
comic/models.py
View File

@@ -80,7 +80,7 @@ class ComicBook(models.Model):
@property @property
def selector_string(self): def selector_string(self):
return urlsafe_base64_encode(self.selector.bytes).decode() return urlsafe_base64_encode(self.selector.bytes)
def get_image(self, page): def get_image(self, page):
base_dir = Setting.objects.get(name='BASE_DIR').value base_dir = Setting.objects.get(name='BASE_DIR').value
@@ -124,7 +124,7 @@ class ComicBook(models.Model):
def nav(self, page, user): def nav(self, page, user):
out = self.Navigation( out = self.Navigation(
cur_index=page, cur_index=page,
cur_path=urlsafe_base64_encode(self.selector.bytes).decode() cur_path=urlsafe_base64_encode(self.selector.bytes)
) )
if page == 0: if page == 0:
out.prev_path, out.prev_index = self.nav_get_prev_comic(user) out.prev_path, out.prev_index = self.nav_get_prev_comic(user)
@@ -153,7 +153,7 @@ class ComicBook(models.Model):
comic_index = dir_list.index(self.file_name) comic_index = dir_list.index(self.file_name)
if comic_index == 0: if comic_index == 0:
if self.directory: if self.directory:
comic_path = urlsafe_base64_encode(self.directory.selector.bytes).decode() comic_path = urlsafe_base64_encode(self.directory.selector.bytes)
else: else:
comic_path = '' comic_path = ''
index = -1 index = -1
@@ -175,10 +175,10 @@ class ComicBook(models.Model):
book = ComicBook.process_comic_book(prev_comic) book = ComicBook.process_comic_book(prev_comic)
cs, _ = ComicStatus.objects.get_or_create(comic=book, user=user) cs, _ = ComicStatus.objects.get_or_create(comic=book, user=user)
index = cs.last_read_page index = cs.last_read_page
comic_path = urlsafe_base64_encode(book.selector.bytes).decode() comic_path = urlsafe_base64_encode(book.selector.bytes)
else: else:
if self.directory: if self.directory:
comic_path = urlsafe_base64_encode(self.directory.selector.bytes).decode() comic_path = urlsafe_base64_encode(self.directory.selector.bytes)
else: else:
comic_path = '' comic_path = ''
index = -1 index = -1
@@ -208,12 +208,12 @@ class ComicBook(models.Model):
book = ComicBook.process_comic_book(next_comic) book = ComicBook.process_comic_book(next_comic)
if type(book) is str: if type(book) is str:
raise IndexError raise IndexError
comic_path = urlsafe_base64_encode(book.selector.bytes).decode() comic_path = urlsafe_base64_encode(book.selector.bytes)
cs, _ = ComicStatus.objects.get_or_create(comic=book, user=user) cs, _ = ComicStatus.objects.get_or_create(comic=book, user=user)
index = cs.last_read_page index = cs.last_read_page
except IndexError: except IndexError:
if self.directory: if self.directory:
comic_path = urlsafe_base64_encode(self.directory.selector.bytes).decode() comic_path = urlsafe_base64_encode(self.directory.selector.bytes)
else: else:
comic_path = '' comic_path = ''
index = -1 index = -1

332
comic/tests/test_models.py
View File

@@ -10,284 +10,304 @@ from comic.models import ComicBook, ComicPage, Setting, ComicStatus, Directory
from comic.util import generate_directory from comic.util import generate_directory
# Create your tests here.
class ComicBookTests(TestCase): class ComicBookTests(TestCase):
def setUp(self): def setUp(self):
Setting.objects.create(name='BASE_DIR', value=path.join(os.getcwd(), 'comic', 'test')) Setting.objects.create(
User.objects.create_user('test', 'test@test.com', 'test') name="BASE_DIR", value=path.join(os.getcwd(), "comic", "test")
)
User.objects.create_user("test", "test@test.com", "test")
user = User.objects.first() user = User.objects.first()
ComicBook.process_comic_book('test1.rar') ComicBook.process_comic_book("test1.rar")
book = ComicBook.process_comic_book('test2.rar') book = ComicBook.process_comic_book("test2.rar")
status = ComicStatus(user=user, status = ComicStatus(user=user, comic=book, last_read_page=2, unread=False)
comic=book,
last_read_page=2,
unread=False)
status.save() status.save()
ComicBook.process_comic_book('test4.rar') ComicBook.process_comic_book("test4.rar")
def test_comic_processing(self): def test_comic_processing(self):
book = ComicBook.objects.get(file_name='test1.rar') book = ComicBook.objects.get(file_name="test1.rar")
self.assertEqual(book.file_name, 'test1.rar') self.assertEqual(book.file_name, "test1.rar")
page0 = ComicPage.objects.get(Comic=book, index=0) page0 = ComicPage.objects.get(Comic=book, index=0)
self.assertEqual(page0.page_file_name, 'img1.jpg') self.assertEqual(page0.page_file_name, "img1.jpg")
self.assertEqual(page0.content_type, 'image/jpeg') self.assertEqual(page0.content_type, "image/jpeg")
page1 = ComicPage.objects.get(Comic=book, index=1) page1 = ComicPage.objects.get(Comic=book, index=1)
self.assertEqual(page1.page_file_name, 'img2.png') self.assertEqual(page1.page_file_name, "img2.png")
self.assertEqual(page1.content_type, 'image/png') self.assertEqual(page1.content_type, "image/png")
page2 = ComicPage.objects.get(Comic=book, index=2) page2 = ComicPage.objects.get(Comic=book, index=2)
self.assertEqual(page2.page_file_name, 'img3.gif') self.assertEqual(page2.page_file_name, "img3.gif")
self.assertEqual(page2.content_type, 'image/gif') self.assertEqual(page2.content_type, "image/gif")
page3 = ComicPage.objects.get(Comic=book, index=3) page3 = ComicPage.objects.get(Comic=book, index=3)
self.assertEqual(page3.page_file_name, 'img4.bmp') self.assertEqual(page3.page_file_name, "img4.bmp")
self.assertEqual(page3.content_type, 'image/bmp') self.assertEqual(page3.content_type, "image/bmp")
self.assertEqual(ComicPage.objects.filter(Comic=book).count(), 4) self.assertEqual(ComicPage.objects.filter(Comic=book).count(), 4)
def test_page_count(self): def test_page_count(self):
book = ComicBook.objects.get(file_name='test1.rar') book = ComicBook.objects.get(file_name="test1.rar")
self.assertEqual(book.page_count, 4) self.assertEqual(book.page_count, 4)
def test_is_last_page(self): def test_is_last_page(self):
book = ComicBook.objects.get(file_name='test1.rar') book = ComicBook.objects.get(file_name="test1.rar")
self.assertEqual(book.is_last_page(3), True) self.assertEqual(book.is_last_page(3), True)
self.assertEqual(book.is_last_page(2), False) self.assertEqual(book.is_last_page(2), False)
def test_get_image(self): def test_get_image(self):
book = ComicBook.objects.get(file_name='test1.rar') book = ComicBook.objects.get(file_name="test1.rar")
img, content_type = book.get_image(0) img, content_type = book.get_image(0)
self.assertEqual(content_type, 'image/jpeg') self.assertEqual(content_type, "image/jpeg")
self.assertEqual(img.read(), b'img1.jpg') self.assertEqual(img.read(), b"img1.jpg")
def test_nav_first_page_with_folder_above(self): def test_nav_first_page_with_folder_above(self):
book = ComicBook.objects.get(file_name='test1.rar') book = ComicBook.objects.get(file_name="test1.rar")
user = User.objects.get(username='test') user = User.objects.get(username="test")
nav = book.nav(0, user) nav = book.nav(0, user)
self.assertEqual(nav.next_index, 1) self.assertEqual(nav.next_index, 1)
self.assertEqual(nav.next_path.encode(), urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.next_path, urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.prev_index, -1) self.assertEqual(nav.prev_index, -1)
self.assertEqual(nav.prev_path, '') self.assertEqual(nav.prev_path, "")
self.assertEqual(nav.cur_index, 0) self.assertEqual(nav.cur_index, 0)
self.assertEqual(nav.cur_path.encode(), urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.cur_path, urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.q_prev_to_directory, True) self.assertEqual(nav.q_prev_to_directory, True)
self.assertEqual(nav.q_next_to_directory, False) self.assertEqual(nav.q_next_to_directory, False)
def test_nav_first_page_with_comic_above(self): def test_nav_first_page_with_comic_above(self):
prev_book = ComicBook.objects.get(file_name='test1.rar') prev_book = ComicBook.objects.get(file_name="test1.rar")
book = ComicBook.objects.get(file_name='test2.rar', book = ComicBook.objects.get(file_name="test2.rar", directory__isnull=True)
directory__isnull=True) user = User.objects.get(username="test")
user = User.objects.get(username='test')
nav = book.nav(0, user) nav = book.nav(0, user)
self.assertEqual(nav.next_index, 1) self.assertEqual(nav.next_index, 1)
self.assertEqual(nav.next_path.encode(), urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.next_path, urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.prev_index, 0) self.assertEqual(nav.prev_index, 0)
self.assertEqual(nav.prev_path.encode(), urlsafe_base64_encode(prev_book.selector.bytes)) self.assertEqual(nav.prev_path, urlsafe_base64_encode(prev_book.selector.bytes))
self.assertEqual(nav.cur_index, 0) self.assertEqual(nav.cur_index, 0)
self.assertEqual(nav.cur_path.encode(), urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.cur_path, urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.q_prev_to_directory, False) self.assertEqual(nav.q_prev_to_directory, False)
self.assertEqual(nav.q_next_to_directory, False) self.assertEqual(nav.q_next_to_directory, False)
def test_nav_last_page_with_comic_below(self): def test_nav_last_page_with_comic_below(self):
user = User.objects.get(username='test') user = User.objects.get(username="test")
book = ComicBook.objects.get(file_name='test1.rar', book = ComicBook.objects.get(file_name="test1.rar", directory__isnull=True)
directory__isnull=True) next_book = ComicBook.objects.get(file_name="test2.rar", directory__isnull=True)
next_book = ComicBook.objects.get(file_name='test2.rar',
directory__isnull=True)
nav = book.nav(3, user) nav = book.nav(3, user)
self.assertEqual(nav.next_index, 2) self.assertEqual(nav.next_index, 2)
self.assertEqual(nav.next_path.encode(), urlsafe_base64_encode(next_book.selector.bytes)) self.assertEqual(nav.next_path, urlsafe_base64_encode(next_book.selector.bytes))
self.assertEqual(nav.prev_index, 2) self.assertEqual(nav.prev_index, 2)
self.assertEqual(nav.prev_path.encode(), urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.prev_path, urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.cur_index, 3) self.assertEqual(nav.cur_index, 3)
self.assertEqual(nav.cur_path.encode(), urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.cur_path, urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.q_prev_to_directory, False) self.assertEqual(nav.q_prev_to_directory, False)
self.assertEqual(nav.q_next_to_directory, False) self.assertEqual(nav.q_next_to_directory, False)
def test_nav_last_page_with_nothing_below(self): def test_nav_last_page_with_nothing_below(self):
user = User.objects.get(username='test') user = User.objects.get(username="test")
book = ComicBook.objects.get(file_name='test4.rar') book = ComicBook.objects.get(file_name="test4.rar")
nav = book.nav(3, user) nav = book.nav(3, user)
self.assertEqual(nav.next_index, -1) self.assertEqual(nav.next_index, -1)
self.assertEqual(nav.next_path, '') self.assertEqual(nav.next_path, "")
self.assertEqual(nav.prev_index, 2) self.assertEqual(nav.prev_index, 2)
self.assertEqual(nav.prev_path.encode(), urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.prev_path, urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.cur_index, 3) self.assertEqual(nav.cur_index, 3)
self.assertEqual(nav.cur_path.encode(), urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.cur_path, urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.q_prev_to_directory, False) self.assertEqual(nav.q_prev_to_directory, False)
self.assertEqual(nav.q_next_to_directory, True) self.assertEqual(nav.q_next_to_directory, True)
def test_nav_in_comic(self): def test_nav_in_comic(self):
user = User.objects.get(username='test') user = User.objects.get(username="test")
book = ComicBook.objects.get(file_name='test1.rar', book = ComicBook.objects.get(file_name="test1.rar", directory__isnull=True)
directory__isnull=True)
nav = book.nav(1, user) nav = book.nav(1, user)
self.assertEqual(nav.next_index, 2) self.assertEqual(nav.next_index, 2)
self.assertEqual(nav.next_path.encode(), urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.next_path, urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.prev_index, 0) self.assertEqual(nav.prev_index, 0)
self.assertEqual(nav.prev_path.encode(), urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.prev_path, urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.cur_index, 1) self.assertEqual(nav.cur_index, 1)
self.assertEqual(nav.cur_path.encode(), urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.cur_path, urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.q_prev_to_directory, False) self.assertEqual(nav.q_prev_to_directory, False)
self.assertEqual(nav.q_next_to_directory, False) self.assertEqual(nav.q_next_to_directory, False)
def test_generate_directory(self): def test_generate_directory(self):
user = User.objects.get(username='test') user = User.objects.get(username="test")
folders = generate_directory(user) folders = generate_directory(user)
dir1 = folders[0] dir1 = folders[0]
self.assertEqual(dir1.name, 'test_folder') self.assertEqual(dir1.name, "test_folder")
self.assertEqual(dir1.type, 'directory') self.assertEqual(dir1.type, "directory")
self.assertEqual(dir1.icon, 'glyphicon-folder-open') self.assertEqual(dir1.icon, "glyphicon-folder-open")
d = Directory.objects.get(name='test_folder', d = Directory.objects.get(name="test_folder", parent__isnull=True)
parent__isnull=True) location = "/comic/{0}/".format(urlsafe_base64_encode(d.selector.bytes))
location = '/comic/{0}/'.format(urlsafe_base64_encode(d.selector.bytes).decode())
self.assertEqual(dir1.location, location) self.assertEqual(dir1.location, location)
self.assertEqual(dir1.label, '<center><span class="label label-default">Empty</span></center>') self.assertEqual(
dir1.label,
'<center><span class="label label-default">Empty</span></center>',
)
dir2 = folders[1] dir2 = folders[1]
self.assertEqual(dir2.name, 'test1.rar') self.assertEqual(dir2.name, "test1.rar")
self.assertEqual(dir2.type, 'book') self.assertEqual(dir2.type, "book")
self.assertEqual(dir2.icon, 'glyphicon-book') self.assertEqual(dir2.icon, "glyphicon-book")
c = ComicBook.objects.get(file_name='test1.rar', c = ComicBook.objects.get(file_name="test1.rar", directory__isnull=True)
directory__isnull=True) location = "/comic/read/{0}/{1}/".format(
location = '/comic/read/{0}/{1}/'.format(urlsafe_base64_encode(c.selector.bytes).decode(), urlsafe_base64_encode(c.selector.bytes), "0"
'0') )
self.assertEqual(dir2.location, location) self.assertEqual(dir2.location, location)
self.assertEqual(dir2.label, '<center><span class="label label-default">Unread</span></center>') self.assertEqual(
dir2.label,
'<center><span class="label label-default">Unread</span></center>',
)
dir3 = folders[2] dir3 = folders[2]
self.assertEqual(dir3.name, 'test2.rar') self.assertEqual(dir3.name, "test2.rar")
self.assertEqual(dir3.type, 'book') self.assertEqual(dir3.type, "book")
self.assertEqual(dir3.icon, 'glyphicon-book') self.assertEqual(dir3.icon, "glyphicon-book")
c = ComicBook.objects.get(file_name='test2.rar', c = ComicBook.objects.get(file_name="test2.rar", directory__isnull=True)
directory__isnull=True) location = "/comic/read/{0}/{1}/".format(
location = '/comic/read/{0}/{1}/'.format(urlsafe_base64_encode(c.selector.bytes).decode(), urlsafe_base64_encode(c.selector.bytes), "2"
'2') )
self.assertEqual(dir3.location, location) self.assertEqual(dir3.location, location)
self.assertEqual(dir3.label, '<center><span class="label label-primary">3/4</span></center>') self.assertEqual(
dir3.label, '<center><span class="label label-primary">3/4</span></center>'
)
dir4 = folders[3] dir4 = folders[3]
self.assertEqual(dir4.name, 'test3.rar') self.assertEqual(dir4.name, "test3.rar")
self.assertEqual(dir4.type, 'book') self.assertEqual(dir4.type, "book")
self.assertEqual(dir3.icon, 'glyphicon-book') self.assertEqual(dir3.icon, "glyphicon-book")
c = ComicBook.objects.get(file_name='test3.rar', c = ComicBook.objects.get(file_name="test3.rar", directory__isnull=True)
directory__isnull=True) location = "/comic/read/{0}/{1}/".format(
location = '/comic/read/{0}/{1}/'.format(urlsafe_base64_encode(c.selector.bytes).decode(), urlsafe_base64_encode(c.selector.bytes), "0"
'0') )
self.assertEqual(dir4.location, location) self.assertEqual(dir4.location, location)
self.assertEqual(dir4.label, '<center><span class="label label-default">Unread</span></center>') self.assertEqual(
dir4.label,
'<center><span class="label label-default">Unread</span></center>',
)
def test_pages(self): def test_pages(self):
book = ComicBook.objects.get(file_name='test1.rar') book = ComicBook.objects.get(file_name="test1.rar")
pages = book.pages pages = book.pages
self.assertEqual(pages[0].page_file_name, 'img1.jpg') self.assertEqual(pages[0].page_file_name, "img1.jpg")
self.assertEqual(pages[0].index, 0) self.assertEqual(pages[0].index, 0)
self.assertEqual(pages[1].page_file_name, 'img2.png') self.assertEqual(pages[1].page_file_name, "img2.png")
self.assertEqual(pages[1].index, 1) self.assertEqual(pages[1].index, 1)
self.assertEqual(pages[2].page_file_name, 'img3.gif') self.assertEqual(pages[2].page_file_name, "img3.gif")
self.assertEqual(pages[2].index, 2) self.assertEqual(pages[2].index, 2)
self.assertEqual(pages[3].page_file_name, 'img4.bmp') self.assertEqual(pages[3].page_file_name, "img4.bmp")
self.assertEqual(pages[3].index, 3) self.assertEqual(pages[3].index, 3)
def test_page_name(self): def test_page_name(self):
book = ComicBook.objects.get(file_name='test1.rar') book = ComicBook.objects.get(file_name="test1.rar")
self.assertEqual(book.page_name(0), 'img1.jpg') self.assertEqual(book.page_name(0), "img1.jpg")
def test_comic_list(self): def test_comic_list(self):
c = Client() c = Client()
response = c.get('/comic/') response = c.get("/comic/")
self.assertEqual(response.status_code, 302) self.assertEqual(response.status_code, 302)
c.login(username='test', password='test') c.login(username="test", password="test")
response = c.get('/comic/') response = c.get("/comic/")
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
user = User.objects.first() user = User.objects.first()
generate_directory(user) generate_directory(user)
directory = Directory.objects.first() directory = Directory.objects.first()
response = c.get(f'/comic/{urlsafe_base64_encode(directory.selector.bytes).decode()}/') response = c.get(f"/comic/{urlsafe_base64_encode(directory.selector.bytes)}/")
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
def test_comic_list_json(self): def test_comic_list_json(self):
c = Client() c = Client()
response = c.post('/comic/list_json/') response = c.post("/comic/list_json/")
self.assertEqual(response.status_code, 302) self.assertEqual(response.status_code, 302)
c.login(username='test', password='test') c.login(username="test", password="test")
response = c.post('/comic/list_json/') response = c.post("/comic/list_json/")
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
directory = Directory.objects.first() directory = Directory.objects.first()
response = c.post(f'/comic/list_json/{urlsafe_base64_encode(directory.selector.bytes).decode()}/') response = c.post(
f"/comic/list_json/{urlsafe_base64_encode(directory.selector.bytes)}/"
)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
def test_recent_comics(self): def test_recent_comics(self):
c = Client() c = Client()
response = c.get('/comic/recent/') response = c.get("/comic/recent/")
self.assertEqual(response.status_code, 302) self.assertEqual(response.status_code, 302)
c.login(username='test', password='test') c.login(username="test", password="test")
response = c.get('/comic/recent/') response = c.get("/comic/recent/")
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
def test_recent_comics_json(self): def test_recent_comics_json(self):
c = Client() c = Client()
response = c.post('/comic/recent/json/') response = c.post("/comic/recent/json/")
self.assertEqual(response.status_code, 302) self.assertEqual(response.status_code, 302)
c.login(username='test', password='test') c.login(username="test", password="test")
generate_directory(User.objects.first()) generate_directory(User.objects.first())
ComicStatus.objects.all().delete() ComicStatus.objects.all().delete()
req_data = { req_data = {
'start': '0', "start": "0",
'length': '10', "length": "10",
'search[value]': '', "search[value]": "",
'order[0][dir]': 'desc' "order[0][dir]": "desc",
} }
response = c.post('/comic/recent/json/', req_data) response = c.post("/comic/recent/json/", req_data)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
req_data['search[value]'] = 'test1.rar' req_data["search[value]"] = "test1.rar"
response = c.post('/comic/recent/json/', req_data) response = c.post("/comic/recent/json/", req_data)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.maxDiff = None self.maxDiff = None
book = ComicBook.objects.get(file_name='test1.rar') book = ComicBook.objects.get(file_name="test1.rar")
self.assertDictEqual(json.loads(response.content), self.assertDictEqual(
{'data': [{'date': book.date_added.strftime('%d/%m/%y-%H:%M'), json.loads(response.content),
'icon': '<span class="glyphicon glyphicon-book"></span>', {
'label': '<center><span class="label ' "data": [
'label-default">Unread</span></center>', {
'name': 'test1.rar', "date": book.date_added.strftime("%d/%m/%y-%H:%M"),
'selector': urlsafe_base64_encode(book.selector.bytes).decode(), "icon": '<span class="glyphicon glyphicon-book"></span>',
'type': 'book', "label": '<center><span class="label '
'url': f'/comic/read/' 'label-default">Unread</span></center>',
f'{urlsafe_base64_encode(book.selector.bytes).decode()}/0/'}], "name": "test1.rar",
'recordsFiltered': 1, "selector": urlsafe_base64_encode(book.selector.bytes),
'recordsTotal': 4}) "type": "book",
req_data['search[value]'] = '' "url": f"/comic/read/"
req_data['order[0][dir]'] = 3 f"{urlsafe_base64_encode(book.selector.bytes)}/0/",
response = c.post('/comic/recent/json/', req_data) }
],
"recordsFiltered": 1,
"recordsTotal": 4,
},
)
req_data["search[value]"] = ""
req_data["order[0][dir]"] = 3
response = c.post("/comic/recent/json/", req_data)
self.assertListEqual([x['name'] for x in json.loads(response.content)['data']], self.assertListEqual(
['test1.rar', 'test2.rar', 'test4.rar', 'test3.rar']) [x["name"] for x in json.loads(response.content)["data"]],
["test1.rar", "test2.rar", "test4.rar", "test3.rar"],
)
req_data['order[0][dir]'] = 2 req_data["order[0][dir]"] = 2
response = c.post('/comic/recent/json/', req_data) response = c.post("/comic/recent/json/", req_data)
self.assertListEqual([x['name'] for x in json.loads(response.content)['data']], self.assertListEqual(
['test1.rar', 'test2.rar', 'test4.rar', 'test3.rar']) [x["name"] for x in json.loads(response.content)["data"]],
["test1.rar", "test2.rar", "test4.rar", "test3.rar"],
)
def test_comic_edit(self): def test_comic_edit(self):
c = Client() c = Client()
book: ComicBook = ComicBook.objects.first() book: ComicBook = ComicBook.objects.first()
user = User.objects.get(username='test') user = User.objects.get(username="test")
response = c.get('/comic/edit/') response = c.get("/comic/edit/")
self.assertEqual(response.status_code, 302) self.assertEqual(response.status_code, 302)
c.login(username='test', password='test') c.login(username="test", password="test")
response = c.get('/comic/edit/') response = c.get("/comic/edit/")
self.assertEqual(response.status_code, 405) self.assertEqual(response.status_code, 405)
req_data = {"comic_list_length": 10, "func": "unread", "selected": book.selector_string} req_data = {
response = c.post('/comic/edit/', req_data) "comic_list_length": 10,
"func": "unread",
"selected": book.selector_string,
}
response = c.post("/comic/edit/", req_data)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
status = ComicStatus.objects.get(comic=book, user=user) status = ComicStatus.objects.get(comic=book, user=user)
@@ -295,34 +315,34 @@ class ComicBookTests(TestCase):
self.assertTrue(status.unread) self.assertTrue(status.unread)
self.assertFalse(status.finished) self.assertFalse(status.finished)
req_data['func'] = 'read' req_data["func"] = "read"
response = c.post('/comic/edit/', req_data) response = c.post("/comic/edit/", req_data)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
status.refresh_from_db() status.refresh_from_db()
self.assertEqual(status.last_read_page, 3) self.assertEqual(status.last_read_page, 3)
self.assertFalse(status.unread) self.assertFalse(status.unread)
self.assertTrue(status.finished) self.assertTrue(status.finished)
req_data['func'] = 'choose' req_data["func"] = "choose"
response = c.post('/comic/edit/', req_data) response = c.post("/comic/edit/", req_data)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
status.refresh_from_db() status.refresh_from_db()
self.assertEqual(status.last_read_page, 3) self.assertEqual(status.last_read_page, 3)
self.assertFalse(status.unread) self.assertFalse(status.unread)
self.assertTrue(status.finished) self.assertTrue(status.finished)
del req_data['selected'] del req_data["selected"]
response = c.post('/comic/edit/', req_data) response = c.post("/comic/edit/", req_data)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
def test_account_page(self): def test_account_page(self):
c = Client() c = Client()
user = User.objects.get(username='test') user = User.objects.get(username="test")
self.assertEqual(user.username, 'test') self.assertEqual(user.username, "test")
response = c.get('/comic/account/') response = c.get("/comic/account/")
self.assertEqual(response.status_code, 302) self.assertEqual(response.status_code, 302)
c.login(username='test', password='test') c.login(username="test", password="test")
response = c.get('/comic/account/') response = c.get("/comic/account/")
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)

8
comic/util.py
View File

@@ -56,12 +56,12 @@ def generate_breadcrumbs_from_path(directory=False, book=False):
for item in folders[::-1]: for item in folders[::-1]:
bc = Breadcrumb() bc = Breadcrumb()
bc.name = item.name 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) output.append(bc)
if book: if book:
bc = Breadcrumb() bc = Breadcrumb()
bc.name = book.file_name 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) output.append(bc)
return output return output
@@ -92,7 +92,7 @@ class DirFile:
def populate_directory(self, directory, user): def populate_directory(self, directory, user):
self.name = directory.name self.name = directory.name
self.icon = 'glyphicon-folder-open' self.icon = 'glyphicon-folder-open'
self.selector = urlsafe_base64_encode(directory.selector.bytes).decode() self.selector = urlsafe_base64_encode(directory.selector.bytes)
self.location = '/comic/{0}/'.format(self.selector) self.location = '/comic/{0}/'.format(self.selector)
self.label = generate_dir_status(user, directory) self.label = generate_dir_status(user, directory)
self.type = 'directory' self.type = 'directory'
@@ -111,7 +111,7 @@ class DirFile:
status, created = ComicStatus.objects.get_or_create(comic=comic, user=user) status, created = ComicStatus.objects.get_or_create(comic=comic, user=user)
if created: if created:
status.save() status.save()
self.selector = urlsafe_base64_encode(comic.selector.bytes).decode() self.selector = urlsafe_base64_encode(comic.selector.bytes)
self.location = '/comic/read/{0}/{1}/'.format(self.selector, self.location = '/comic/read/{0}/{1}/'.format(self.selector,
status.last_read_page) status.last_read_page)
self.label = generate_label(comic, status) self.label = generate_label(comic, status)

6
comic/views.py
View File

@@ -94,7 +94,7 @@ def recent_comics(request):
'breadcrumbs': generate_breadcrumbs_from_menu([('Recent', '/comic/recent/')]), 'breadcrumbs': generate_breadcrumbs_from_menu([('Recent', '/comic/recent/')]),
'menu': Menu(request.user, 'Recent'), 'menu': Menu(request.user, 'Recent'),
'title': 'Recent Comics', 'title': 'Recent Comics',
'feed_id': urlsafe_base64_encode(feed_id.feed_id.bytes).decode(), 'feed_id': urlsafe_base64_encode(feed_id.feed_id.bytes),
}) })
@@ -128,13 +128,13 @@ def recent_comics_json(request):
if created: if created:
status.save() status.save()
response_data['data'].append({ response_data['data'].append({
'selector': urlsafe_base64_encode(book.selector.bytes).decode(), 'selector': urlsafe_base64_encode(book.selector.bytes),
'icon': icon, 'icon': icon,
'type': 'book', 'type': 'book',
'name': book.file_name, 'name': book.file_name,
'date': book.date_added.strftime('%d/%m/%y-%H:%M'), 'date': book.date_added.strftime('%d/%m/%y-%H:%M'),
'label': generate_label(book, status), 'label': generate_label(book, status),
'url': '/comic/read/{0}/{1}/'.format(urlsafe_base64_encode(book.selector.bytes).decode(), 'url': '/comic/read/{0}/{1}/'.format(urlsafe_base64_encode(book.selector.bytes),
status.last_read_page) status.last_read_page)
}) })
return HttpResponse( return HttpResponse(