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

fixing bug

Browse Source
This commit is contained in:
ajurna
2020-05-22 09:46:10 +01:00
parent 341513b016
commit ce83b3a639
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
comic/util.py
View File

@@ -146,27 +146,28 @@ def generate_directory(user, directory=False):
files.append(df) files.append(df)
dir_list.remove(directory_obj.name) dir_list.remove(directory_obj.name)
with atomic():
for file_obj in file_list_obj: for file_obj in file_list_obj:
df = DirFile()
df.populate_comic(file_obj, user)
files.append(df)
file_list.remove(file_obj.file_name)
for directory_name in dir_list:
if directory:
directory_obj = Directory(name=directory_name, parent=directory)
else:
directory_obj = Directory(name=directory_name)
directory_obj.save()
df = DirFile()
df.populate_directory(directory_obj, user)
files.append(df)
for file_name in file_list:
if file_name.lower()[-4:] in [".rar", ".zip", ".cbr", ".cbz", ".pdf"]:
book = ComicBook.process_comic_book(file_name, directory)
df = DirFile() df = DirFile()
df.populate_comic(file_obj, user) df.populate_comic(book, user)
files.append(df) files.append(df)
file_list.remove(file_obj.file_name)
for directory_name in dir_list:
if directory:
directory_obj = Directory(name=directory_name, parent=directory)
else:
directory_obj = Directory(name=directory_name)
directory_obj.save()
df = DirFile()
df.populate_directory(directory_obj, user)
files.append(df)
for file_name in file_list:
if file_name.lower()[-4:] in [".rar", ".zip", ".cbr", ".cbz", ".pdf"]:
book = ComicBook.process_comic_book(file_name, directory)
df = DirFile()
df.populate_comic(book, user)
files.append(df)
files.sort(key=lambda x: x.name) files.sort(key=lambda x: x.name)
files.sort(key=lambda x: x.type, reverse=True) files.sort(key=lambda x: x.type, reverse=True)
return files return files