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

fixed bug where if duplicate pages exist comic will be rescanned.

Browse Source
This commit is contained in:
Ajurna
2021-04-08 15:51:30 +01:00
parent b19d3aeaa2
commit 53d1ae6364
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
comic/models.py
View File

@@ -111,7 +111,12 @@ class ComicBook(models.Model):
archive = zipfile.ZipFile(archive_path) archive = zipfile.ZipFile(archive_path)
except zipfile.BadZipfile: except zipfile.BadZipfile:
return False return False
page_obj = ComicPage.objects.get(Comic=self, index=page) try:
page_obj = ComicPage.objects.get(Comic=self, index=page)
except ComicPage.MultipleObjectsReturned:
ComicPage.objects.filter(Comic=self).delete()
self.process_comic_pages(archive, self)
page_obj = ComicPage.objects.get(Comic=self, index=page)
try: try:
out = (archive.open(page_obj.page_file_name), page_obj.content_type) out = (archive.open(page_obj.page_file_name), page_obj.content_type)
except rarfile.NoRarEntry: except rarfile.NoRarEntry:

13
comic/tests/test_models.py
View File

@@ -292,3 +292,16 @@ class ComicBookTests(TestCase):
c.login(username="test", password="test") c.login(username="test", password="test")
response = c.get(f"/comic/read/{urlsafe_base64_encode(book.selector.bytes)}/0/img") response = c.get(f"/comic/read/{urlsafe_base64_encode(book.selector.bytes)}/0/img")
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
def test_duplicate_pages(self):
c = Client()
user = User.objects.get(username="test")
generate_directory(user)
book = ComicBook.objects.get(file_name='test1.rar')
page = ComicPage.objects.get(Comic=book, index=0)
dup_page = ComicPage(Comic=book, index=0, page_file_name=page.page_file_name, content_type=page.content_type)
dup_page.save()
c.login(username="test", password="test")
response = c.get(f"/comic/read/{urlsafe_base64_encode(book.selector.bytes)}/0/img")
self.assertEqual(response.status_code, 200)