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

some fixes for bytes/string conversions.

Browse Source
This commit is contained in:
Ajurna
2018-04-06 15:44:17 +01:00
parent 8d9422e0e3
commit 6feeab5937
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
comic/models.py
View File

@@ -120,7 +120,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) cur_path=urlsafe_base64_encode(self.selector.bytes).decode()
) )
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)
@@ -149,7 +149,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) comic_path = urlsafe_base64_encode(self.directory.selector.bytes).decode()
else: else:
comic_path = '' comic_path = ''
index = -1 index = -1
@@ -171,10 +171,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) comic_path = urlsafe_base64_encode(book.selector.bytes).decode()
else: else:
if self.directory: if self.directory:
comic_path = urlsafe_base64_encode(self.directory.selector.bytes) comic_path = urlsafe_base64_encode(self.directory.selector.bytes).decode()
else: else:
comic_path = '' comic_path = ''
index = -1 index = -1
@@ -204,12 +204,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) comic_path = urlsafe_base64_encode(book.selector.bytes).decode()
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) comic_path = urlsafe_base64_encode(self.directory.selector.bytes).decode()
else: else:
comic_path = '' comic_path = ''
index = -1 index = -1