forked from 0x2620/pandora
dont fail if part has no timeline, look for timeline fallback from top
This commit is contained in:
parent
eee7d1baef
commit
495a22dd97
2 changed files with 8 additions and 3 deletions
|
@ -176,8 +176,13 @@ def join_tiles(source_paths, target_path):
|
|||
cuts = []
|
||||
offset = 0
|
||||
for i, path in enumerate(source_paths):
|
||||
with open(os.path.join(path, 'cuts.json'), 'r') as f:
|
||||
path_cuts = json.load(f)
|
||||
p = os.path.join(path, 'cuts.json')
|
||||
if os.path.exists(p)
|
||||
with open(p, 'r') as f:
|
||||
path_cuts = json.load(f)
|
||||
else:
|
||||
print p, 'missing'
|
||||
path_cuts = []
|
||||
if i > 0:
|
||||
cuts.append(offset)
|
||||
for cut in path_cuts:
|
||||
|
|
|
@ -734,7 +734,7 @@ def timeline(request, id, size, position=-1, format='jpg', mode=None):
|
|||
|
||||
path = timeline()
|
||||
while modes and not os.path.exists(path):
|
||||
mode = modes.pop()
|
||||
mode = modes.pop(0)
|
||||
path = timeline()
|
||||
return HttpFileResponse(path, content_type='image/jpeg')
|
||||
|
||||
|
|
Loading…
Reference in a new issue