0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

Merge changes

Browse source
This commit is contained in:
j 2016-09-05 18:17:06 +02:00
commit 5d43ed0585
8 changed files with 50 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pandora/item/models.py
View file

@ -1632,7 +1632,7 @@ class Item(models.Model):
value=value,
user=user
)
annotation.save()
annotation.save(async=True)
# otherwise add empty 5 seconds annotation every minute
if not subtitles_added:
start = offset and int(offset / 60) * 60 + 60 or 0
@ -1647,7 +1647,7 @@ class Item(models.Model):
value='',
user=user
)
annotation.save()
annotation.save(async=True)
offset += f.duration
# remove left over clips without annotations
Clip.objects.filter(item=self, annotations__id=None).delete()

30
pandora/item/timelines.py
View file

@ -9,6 +9,16 @@ import re
from PIL import Image
from ox.utils import json
__all__ = ['join_tiles', 'split_tiles']
def divide(num, by):
# divide(100, 3) -> [33, 33, 34]
arr = []
div = int(num / by)
mod = num % by
for i in range(int(by)):
arr.append(div + (i > by - 1 - mod))
return arr
def join_tiles(source_paths, durations, target_path):
'''
@ -17,15 +27,6 @@ def join_tiles(source_paths, durations, target_path):
be written to target_path.
'''
def divide(num, by):
# divide(100, 3) -> [33, 33, 34]
arr = []
div = int(num / by)
mod = num % by
for i in range(int(by)):
arr.append(div + (i > by - 1 - mod))
return arr
def get_file_info(file_name):
for mode in modes:
if re.match('^timeline' + mode + '64p\d+\.jpg', file_name):
@ -86,11 +87,12 @@ def join_tiles(source_paths, durations, target_path):
#print(image_file)
if mode == full_tile_mode:
# render full tile
resized = data['target_images']['large'].resize((
data['full_tile_widths'][0], large_tile_h
), Image.ANTIALIAS)
data['target_images']['full'].paste(resized, (data['full_tile_offset'], 0))
data['full_tile_offset'] += data['full_tile_widths'][0]
if data['full_tile_widths'][0]:
resized = data['target_images']['large'].resize((
data['full_tile_widths'][0], large_tile_h
), Image.ANTIALIAS)
data['target_images']['full'].paste(resized, (data['full_tile_offset'], 0))
data['full_tile_offset'] += data['full_tile_widths'][0]
data['full_tile_widths'] = data['full_tile_widths'][1:]
large_tile_i += 1
# open next large tile