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 prev/next issues with directories being intersperced.

Browse Source
This commit is contained in:
Ajurna
2015-06-18 22:40:28 +01:00
parent fdf783dbc7
commit 02494bf9eb
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
comic/models.py
View File

@@ -79,10 +79,10 @@ class ComicBook(models.Model):
return out
def nav_get_prev_comic(self, comic_path):
base_dir = Setting.objects.get(name='BASE_DIR')
base_dir = Setting.objects.get(name='BASE_DIR').value
comic_path = urlsafe_base64_decode(comic_path)
directory, comic = path.split(comic_path)
dir_list = os.listdir(path.join(base_dir.value, directory))
dir_list = os.listdir(path.join(base_dir, directory))
comic_index = dir_list.index(comic)
if comic_index == 0:
comic_path = urlsafe_base64_encode(directory)
@@ -90,13 +90,18 @@ class ComicBook(models.Model):
else:
prev_comic = dir_list[comic_index - 1]
comic_path = path.join(directory, prev_comic)
try:
book = ComicBook.objects.get(file_name=prev_comic)
except ComicBook.DoesNotExist:
book = process_comic_book(base_dir, comic_path, prev_comic)
index = ComicPage.objects.filter(Comic=book).count() - 1
print index
comic_path = urlsafe_base64_encode(comic_path)
if not path.isdir(path.join(base_dir, prev_comic)):
print path.join(base_dir, prev_comic)
print path.join(base_dir, prev_comic)
try:
book = ComicBook.objects.get(file_name=prev_comic)
except ComicBook.DoesNotExist:
book = process_comic_book(base_dir, comic_path, prev_comic)
index = ComicPage.objects.filter(Comic=book).count() - 1
comic_path = urlsafe_base64_encode(comic_path)
else:
comic_path = urlsafe_base64_encode(directory)
index = -1
return comic_path, index
def nav_get_next_comic(self, comic_path):
base_dir = Setting.objects.get(name='BASE_DIR')