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

misc fixes. also fixed tests.

Browse Source
This commit is contained in:
ajurna@gmail.com
2016-04-05 14:34:41 +01:00
parent dd38e4c3f1
commit 9235380328
6 changed files with 109 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
comic/util.py
View File

@@ -107,12 +107,20 @@ def generate_directory(user, directory=False):
df = DirFile()
df.name = file_name
if path.isdir(path.join(base_dir, dir_path, file_name)):
if directory:
d = Directory.objects.get(name=file_name,
parent=directory)
else:
d = Directory.objects.get(name=file_name,
parent__isnull=True)
try:
if directory:
d = Directory.objects.get(name=file_name,
parent=directory)
else:
d = Directory.objects.get(name=file_name,
parent__isnull=True)
except Directory.DoesNotExist:
if directory:
d = Directory(name=file_name,
parent=directory)
else:
d = Directory(name=file_name)
d.save()
df.isdir = True
df.icon = 'glyphicon-folder-open'
df.location = '/comic/{0}/'.format(urlsafe_base64_encode(d.selector.bytes).decode())