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

fixed tests not working

Browse Source
This commit is contained in:
ajurna
2019-02-07 15:17:28 +00:00
parent bc6504088f
commit e52ba3f393
2 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
comic/tests.py
View File

@@ -63,11 +63,11 @@ class ComicBookTests(TestCase):
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, urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.next_path.encode(), 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, urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.cur_path.encode(), 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)
@@ -79,11 +79,11 @@ class ComicBookTests(TestCase):
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, urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.next_path.encode(), urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.prev_index, 0) self.assertEqual(nav.prev_index, 0)
self.assertEqual(nav.prev_path, urlsafe_base64_encode(prev_book.selector.bytes)) self.assertEqual(nav.prev_path.encode(), urlsafe_base64_encode(prev_book.selector.bytes))
self.assertEqual(nav.cur_index, 0) self.assertEqual(nav.cur_index, 0)
self.assertEqual(nav.cur_path, urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.cur_path.encode(), 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)
@@ -95,11 +95,11 @@ class ComicBookTests(TestCase):
directory__isnull=True) 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, urlsafe_base64_encode(next_book.selector.bytes)) self.assertEqual(nav.next_path.encode(), urlsafe_base64_encode(next_book.selector.bytes))
self.assertEqual(nav.prev_index, 2) self.assertEqual(nav.prev_index, 2)
self.assertEqual(nav.prev_path, urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.prev_path.encode(), urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.cur_index, 3) self.assertEqual(nav.cur_index, 3)
self.assertEqual(nav.cur_path, urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.cur_path.encode(), 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)
@@ -110,9 +110,9 @@ class ComicBookTests(TestCase):
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, urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.prev_path.encode(), urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.cur_index, 3) self.assertEqual(nav.cur_index, 3)
self.assertEqual(nav.cur_path, urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.cur_path.encode(), 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)
@@ -122,11 +122,11 @@ class ComicBookTests(TestCase):
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, urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.next_path.encode(), urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.prev_index, 0) self.assertEqual(nav.prev_index, 0)
self.assertEqual(nav.prev_path, urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.prev_path.encode(), urlsafe_base64_encode(book.selector.bytes))
self.assertEqual(nav.cur_index, 1) self.assertEqual(nav.cur_index, 1)
self.assertEqual(nav.cur_path, urlsafe_base64_encode(book.selector.bytes)) self.assertEqual(nav.cur_path.encode(), 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)
@@ -135,54 +135,46 @@ class ComicBookTests(TestCase):
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.assertTrue(dir1.isdir) self.assertEqual(dir1.type, 'directory')
self.assertEqual(dir1.icon, 'glyphicon-folder-open') self.assertEqual(dir1.icon, 'glyphicon-folder-open')
self.assertFalse(dir1.iscb)
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).decode()) 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>')
self.assertEqual(dir1.cur_page, 0)
dir2 = folders[1] dir2 = folders[1]
self.assertEqual(dir2.name, 'test1.rar') self.assertEqual(dir2.name, 'test1.rar')
self.assertFalse(dir2.isdir) self.assertEqual(dir2.type, 'book')
self.assertEqual(dir2.icon, 'glyphicon-book') self.assertEqual(dir2.icon, 'glyphicon-book')
self.assertTrue(dir2.iscb)
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(urlsafe_base64_encode(c.selector.bytes).decode(), location = '/comic/read/{0}/{1}/'.format(urlsafe_base64_encode(c.selector.bytes).decode(),
'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>')
self.assertEqual(dir2.cur_page, 0)
dir3 = folders[2] dir3 = folders[2]
self.assertEqual(dir3.name, 'test2.rar') self.assertEqual(dir3.name, 'test2.rar')
self.assertFalse(dir3.isdir) self.assertEqual(dir3.type, 'book')
self.assertEqual(dir3.icon, 'glyphicon-book') self.assertEqual(dir3.icon, 'glyphicon-book')
self.assertTrue(dir3.iscb)
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(urlsafe_base64_encode(c.selector.bytes).decode(), location = '/comic/read/{0}/{1}/'.format(urlsafe_base64_encode(c.selector.bytes).decode(),
'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>')
self.assertEqual(dir3.cur_page, 2)
dir3 = folders[3] dir4 = folders[3]
self.assertEqual(dir3.name, 'test3.rar') self.assertEqual(dir4.name, 'test3.rar')
self.assertFalse(dir3.isdir) self.assertEqual(dir4.type, 'book')
self.assertEqual(dir3.icon, 'glyphicon-book') self.assertEqual(dir3.icon, 'glyphicon-book')
self.assertTrue(dir3.iscb)
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(urlsafe_base64_encode(c.selector.bytes).decode(), location = '/comic/read/{0}/{1}/'.format(urlsafe_base64_encode(c.selector.bytes).decode(),
'0') '0')
self.assertEqual(dir3.location, location) self.assertEqual(dir4.location, location)
self.assertEqual(dir3.label, '<center><span class="label label-default">Unread</span></center>') self.assertEqual(dir4.label, '<center><span class="label label-default">Unread</span></center>')
self.assertEqual(dir3.cur_page, 0)
def test_pages(self): def test_pages(self):
book = ComicBook.objects.get(file_name='test1.rar') book = ComicBook.objects.get(file_name='test1.rar')

6
comic/util.py
View File

@@ -117,6 +117,9 @@ class DirFile:
self.label = generate_label(comic, status) self.label = generate_label(comic, status)
self.type = 'book' self.type = 'book'
def __repr__(self):
return f'<DirFile: {self.name}: {self.type}>'
def generate_directory(user, directory=False): def generate_directory(user, directory=False):
""" """
@@ -147,6 +150,7 @@ def generate_directory(user, directory=False):
df.populate_directory(directory_obj, user) df.populate_directory(directory_obj, user)
files.append(df) files.append(df)
dir_list.remove(directory_obj.name) dir_list.remove(directory_obj.name)
with atomic(): with atomic():
for file_obj in file_list_obj: for file_obj in file_list_obj:
df = DirFile() df = DirFile()
@@ -169,6 +173,8 @@ def generate_directory(user, directory=False):
df = DirFile() df = DirFile()
df.populate_comic(book, user) df.populate_comic(book, user)
files.append(df) files.append(df)
files.sort(key=lambda x: x.name)
files.sort(key=lambda x: x.type, reverse=True)
return files return files