diff --git a/pandora/archive/views.py b/pandora/archive/views.py index 88126020..8bb2374d 100644 --- a/pandora/archive/views.py +++ b/pandora/archive/views.py @@ -31,6 +31,7 @@ import models from backend.utils import oxid, parse_path import backend.models +import backend.tasks @login_required_json def api_removeVolume(request): @@ -220,9 +221,9 @@ def firefogg_upload(request): if not f.save_chunk(c, chunk_id): response['result'] = -1 elif form.cleaned_data['done']: - #FIXME: send message to encode deamon to create derivates instead f.available = True f.save() + backend.tasks.updateStreams.delay(f.item.itemId) response['result'] = 1 response['done'] = 1 return render_to_json_response(response) diff --git a/pandora/backend/models.py b/pandora/backend/models.py index 443594dc..8429dad5 100644 --- a/pandora/backend/models.py +++ b/pandora/backend/models.py @@ -275,6 +275,7 @@ class Item(models.Model): layers['cuts'] = self.metadata.get('cuts', {}) layers['subtitles'] = {} + #FIXME: subtitles should be stored in Layer qs = self.files.filter(is_subtitle=True, is_main=True, available=True) if qs.count()>0: layers['subtitles'] = qs[0].srt() @@ -462,9 +463,13 @@ class Item(models.Model): def timeline_prefix(self): return os.path.join(settings.MEDIA_ROOT, itemid_path(self.itemId), 'timeline') + def main_videos(self): + #FIXME: needs to check if more than one user has main files and only take from "higher" user + return self.files.filter(is_main=True, is_video=True, available=True) + def updateStreams(self): files = {} - for f in self.files.filter(is_main=True, is_video=True, available=True): + for f in self.main_videos(): files[utils.sort_title(f.name)] = f.video.path #FIXME: how to detect if something changed? @@ -556,7 +561,7 @@ class Item(models.Model): def local_posters(self): part = 1 posters = {} - for f in self.files.filter(is_main=True, available=True): + for f in self.main_videos(): for frame in f.frames.all(): path = os.path.join(itemid_path(self.itemId), 'poster.pandora.%s.%s.jpg'%(part, frame.position)) path = os.path.abspath(os.path.join(settings.MEDIA_ROOT, path)) @@ -568,7 +573,7 @@ class Item(models.Model): posters = self.local_posters() for poster in posters: frame = posters[poster] - cmd = ['oxposter', + cmd = [settings.ITEM_POSTER, '-t', self.get('title'), '-d', ', '.join(self.get('directors', ['Unknown Director'])), '-f', frame, diff --git a/pandora/backend/tasks.py b/pandora/backend/tasks.py index 7fbf533f..37be7100 100644 --- a/pandora/backend/tasks.py +++ b/pandora/backend/tasks.py @@ -28,20 +28,11 @@ def findItem(fileId): f.findItem() @task(ignore_resulsts=True, queue="encoding") -def extractData(fileId): +def updateStreams(itemId): ''' - update file stuff - create derivates and other related stuff for a file + create stream, extract timeline and create derivatives ''' - f = models.File.objects.get(pk=fileId) - f.extract() - -@task(ignore_resulsts=True, queue="encoding") -def updateItem(movidId): - ''' - update item - create proxy stream and other related files extracted from itemFiles - ''' - m = models.Item.objects.get(pk=itemId) - m.extract() + item = models.Item.objects.get(itemId=itemId) + if item.files.filter(is_main=True, is_video=True, availble=False).count() == 0: + item.updateStreams() diff --git a/pandora/scripts/item_icon b/pandora/scripts/item_icon new file mode 100755 index 00000000..c9fca1d3 --- /dev/null +++ b/pandora/scripts/item_icon @@ -0,0 +1,54 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# vi:si:et:sw=4:sts=4:ts=4 +from __future__ import division +import Image +import ImageDraw +from optparse import OptionParser +import os +from ox.image import drawText, wrapText +import sys + + +static_root = os.path.join(os.path.dirname(__file__), '..', 'static') + +def render_icon(frame, timeline, icon): + icon_width = 256 + icon_height = 256 + icon_image = Image.new('RGBA', (icon_width, icon_height)) + frame_width = icon_width + frame_ratio = 4 / 3 + frame_height = int(round(frame_width / frame_ratio)) + frame_image = Image.open(frame) + frame_image_ratio = frame_image.size[0] / frame_image.size[1] + if frame_ratio < frame_image_ratio: + frame_image = frame_image.resize((int(frame_height * frame_image_ratio), frame_height), Image.ANTIALIAS) + left = int((frame_image.size[0] - frame_width) / 2) + frame_image = frame_image.crop((left, 0, left + frame_width, frame_height)) + else: + frame_image = frame_image.resize((frame_width, int(frame_width / frame_image_ratio)), Image.ANTIALIAS) + top = int((frame_image.size[1] - frame_height) / 2) + frame_image = frame_image.crop((0, top, frame_width, top + frame_height)) + icon_image.paste(frame_image, (0, 0)) + timeline_image = Image.open(timeline) + timeline_image = timeline_image.resize((icon_width, 64), Image.ANTIALIAS) + icon_image.paste(timeline_image, (0, icon_height - 64)) + mask_image = Image.open(ox.path.join(static_root, 'png', 'icon.mask.png')) + mask_image = mask_image.resize((icon_width, icon_height)) + icon_image.putalpha(mask_image) + icon_image.save(icon) + +def main(): + parser = OptionParser() + parser.add_option('-f', '--frame', dest='frame', help='Poster frame (image file to be read)') + parser.add_option('-l', '--timeline', dest='timeline', help='Timeline (image file to be read)') + parser.add_option('-i', '--icon', dest='icon', help='Icon (image file to be written)') + (options, args) = parser.parse_args() + if options.icon == None: + parser.print_help() + sys.exit() + render_icon(opt.frame, opt.timeline, opt.icon) + +if __name__ == "__main__": + main() + diff --git a/pandora/scripts/list_icon b/pandora/scripts/list_icon new file mode 100755 index 00000000..048fb068 --- /dev/null +++ b/pandora/scripts/list_icon @@ -0,0 +1,55 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# vi:si:et:sw=4:sts=4:ts=4 +from __future__ import division +import Image +import ImageDraw +from optparse import OptionParser +import os +from ox.image import drawText, wrapText +import sys + + +static_root = os.path.join(os.path.dirname(__file__), '..', 'static') + +def render_list_icon(frames, icon): + icon_width = 256 + icon_height = 256 + icon_image = Image.new('RGBA', (icon_width, icon_height)) + frame_height = icon_height / 4 + frame_ratio = 4 / 3 + frame_width = int(round(frame_height * frame_ratio)) + for i, frame in enumerate(frames): + frame_image = Image.open(frame) + frame_image_ratio = frame_image.size[0] / frame_image.size[1] + frame_width_ = frame_width + (1 if i % 2 == 1 else 0) + if frame_ratio < frame_image_ratio: + frame_image = frame_image.resize((int(frame_height * frame_image_ratio), frame_height), Image.ANTIALIAS) + left = int((frame_image.size[0] - frame_width_) / 2) + frame_image = frame_image.crop((left, 0, left + frame_width_, frame_height)) + else: + frame_image = frame_image.resize((frame_width_, int(frame_width_ / frame_image_ratio)), Image.ANTIALIAS) + top = int((frame_image.size[1] - frame_height) / 2) + frame_image = frame_image.crop((0, top, frame_width_, top + frame_height)) + icon_image.paste(frame_image, (i % 3 * frame_width + (1 if i % 2 == 2 else 0), int(i / 3) * frame_height)) + mask_image = Image.open(ox.path.join(static_root, 'png', 'icon.mask.png')) + mask_image = mask_image.resize((icon_width, icon_height)) + icon_image.putalpha(mask_image) + icon_image.save(icon) + +def main(): + parser = OptionParser() + parser.add_option('-f', '--frames', dest='frames', help='Poster frames (image files to be read)', default='') + parser.add_option('-i', '--icon', dest='icon', help='Icon (image file to be written)') + (options, args) = parser.parse_args() + if options.icon == None: + parser.print_help() + sys.exit() + + frames = options.frames.replace(', ', ',').split(',') + + render_list_icon(frames, opt.icon) + +if __name__ == "__main__": + main() + diff --git a/pandora/scripts/oxdb_poster b/pandora/scripts/oxdb_poster new file mode 100755 index 00000000..ced07986 --- /dev/null +++ b/pandora/scripts/oxdb_poster @@ -0,0 +1,147 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# vi:si:et:sw=4:sts=4:ts=4 +from __future__ import division +import Image +import ImageDraw +from optparse import OptionParser +import os +from ox.image import drawText, wrapText +import sys + + +static_root = os.path.join(os.path.dirname(__file__), '..', 'static') + +def render_poster(title, director, year, series, oxdb_id, imdb_id, frame, timeline, poster): + def get_oxdb_color(oxdb_id, series=False): + i = int(round((int(oxdb_id[2:10], 16) * 762 / pow(2, 32)))) + if i < 127: + color = (127, i, 0) + elif i < 254: + color = (254 - i, 127, 0) + elif i < 381: + color = (0, 127, i - 254) + elif i < 508: + color = (0, 508 - i, 127) + elif i < 635: + color = (i - 508, 0, 127) + else: + color = (127, 0, 762 - i) + if series: + color = tuple(map(lambda x: x + 128, color)) + return color + + poster_width = 640 + poster_height = 1024 + poster_ratio = poster_width / poster_height + poster_image = Image.new('RGB', (poster_width, poster_height)) + draw = ImageDraw.Draw(poster_image) + font_file = os.path.join(static_root, 'ttf', 'DejaVuSansCondensedBold.ttf') + font_size = { + 'small': 28, + 'large': 42, + } + + # frame + if frame: + frame_width = poster_width + frame_ratio = 4 / 3 + frame_height = int(round(frame_width / frame_ratio)) + frame_image = Image.open(frame) + frame_image_ratio = frame_image.size[0] / frame_image.size[1] + if frame_ratio < frame_image_ratio: + frame_image = frame_image.resize((int(frame_height * frame_image_ratio), frame_height), Image.ANTIALIAS) + left = int((frame_image.size[0] - frame_width) / 2) + frame_image = frame_image.crop((left, 0, left + frame_width, frame_height)) + else: + frame_image = frame_image.resize((frame_width, int(frame_width / frame_image_ratio)), Image.ANTIALIAS) + top = int((frame_image.size[1] - frame_height) / 2) + frame_image = frame_image.crop((0, top, frame_width, top + frame_height)) + poster_image.paste(frame_image, (0, 0)) + + # timeline + timeline_width = poster_width + timeline_height = 64 + timeline_image = Image.open(timeline) + timeline_image = timeline_image.resize((timeline_width, timeline_height), Image.ANTIALIAS) + poster_image.paste(timeline_image, (0, frame_height)) + + # text + text_width = poster_width + text_height = poster_height - frame_height - timeline_height + text_top = frame_height + timeline_height + text_bottom = text_top + text_height + text_margin = 16 + text_color = get_oxdb_color(oxdb_id, series) + font_color = tuple(map(lambda x: x - 128 if series else x + 128, text_color)) + draw.rectangle([(0, text_top), (text_width, text_bottom)], fill=text_color) + offset_top = text_top + text_margin + if not director: + title_max_lines = 7 + else: + title_max_lines = min(len(wrapText(title, text_width - 2 * text_margin, 0, font_file, font_size['large'])), 6) + director_max_lines = 9 - int((title_max_lines * 3 - 1) / 2) + if director: + lines = wrapText(director, text_width - 2 * text_margin, director_max_lines, font_file, font_size['small']) + for i, line in enumerate(lines): + size = drawText(poster_image, (text_margin, offset_top), line, font_file, font_size['small'], font_color) + offset_top += font_size['small'] + 2 + offset_top += size[1] - font_size['small'] + text_margin / 2 + lines = wrapText(title, text_width - 2 * text_margin, title_max_lines, font_file, font_size['large']) + for i, line in enumerate(lines): + size = drawText(poster_image, (text_margin, offset_top + 5), line, font_file, font_size['large'], font_color) + offset_top += font_size['large'] + 3 + offset_top += size[1] - font_size['small'] + text_margin / 2 + if year: + drawText(poster_image, (text_margin, offset_top), year, font_file, font_size['small'], font_color) + drawText(poster_image, (text_margin, text_bottom - text_margin - font_size['large'] + 2), oxdb_id, font_file, font_size['large'], font_color) + + # logo + logo_height = 32 + logo_image = Image.open(os.path.join(static_root, 'png', 'logo.poster.png')) + logo_width = int(round(logo_height * logo_image.size[0] / logo_image.size[1])) + logo_image = logo_image.resize((logo_width, logo_height), Image.ANTIALIAS) + logo_left = text_width - text_margin - logo_width + logo_top = text_bottom - text_margin - logo_height + for y in range(logo_height): + for x in range(logo_width): + poster_color = poster_image.getpixel((logo_left + x, logo_top + y)) + logo_color = logo_image.getpixel((x, y))[0] + alpha = logo_image.getpixel((x, y))[3] + if series: + poster_color = tuple(map(lambda x: x - (logo_color - 16) * alpha / 255, poster_color)) + else: + poster_color = tuple(map(lambda x: x + (logo_color - 16) * alpha / 255, poster_color)) + poster_image.putpixel((logo_left + x, logo_top + y), poster_color) + + poster_image.save(poster) + +def main(): + parser = OptionParser() + parser.add_option('-o', '--oxdbid', dest='oxdb_id', help='0xDB Id') + parser.add_option('-i', '--imdbid', dest='imdb_id', help='IMDb Id') + parser.add_option('-t', '--title', dest='title', help='Title') + parser.add_option('-d', '--director', dest='director', help='Director(s)', default='') + parser.add_option('-y', '--year', dest='year', help='Year') + parser.add_option('-s', '--series', dest='series', help='Movie is an episode of a series', action='store_true') + parser.add_option('-f', '--frame', dest='frame', help='Poster frame (image file to be read)') + parser.add_option('-l', '--timeline', dest='timeline', help='Timeline (image file to be read)') + parser.add_option('-p', '--poster', dest='poster', help='Poster (image file to be written)') + (options, args) = parser.parse_args() + + if None in (options.oxdb_id, options.title, options.poster): + parser.print_help() + sys.exit() + + opt = {} + for key in ('oxdb_id', 'imdb_id', 'title', 'director', 'year', 'series', 'frame', 'timeline', 'poster'): + opt[key] = getattr(options, key) + + opt['title'] = opt['title'].decode('utf-8') + opt['director'] = opt['director'].decode('utf-8') + + render_poster(**opt) + +if __name__ == "__main__": + main() + diff --git a/pandora/scripts/padma_poster b/pandora/scripts/padma_poster new file mode 100755 index 00000000..90f58ec5 --- /dev/null +++ b/pandora/scripts/padma_poster @@ -0,0 +1,73 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# vi:si:et:sw=4:sts=4:ts=4 +from __future__ import division +import Image +import ImageDraw +from optparse import OptionParser +import os +from ox.image import drawText, wrapText +import sys + +static_root = os.path.join(os.path.dirname(__file__), '..', 'static') + +def render_poster(id, title, frame, timeline, poster): + poster_width = 640 + poster_height = 1024 + poster_ratio = poster_width / poster_height + poster_color = (255, 255, 0) + poster_image = Image.new('RGB', (poster_width, poster_height)) + font_file = os.path.join(static_root, 'ttf', 'DejaVuSansCondensedBold.ttf') + font_size = 48 + + # timeline + timeline_height = 64 + timeline_lines = 16 + timeline_image = Image.open(timeline) + timeline_image = timeline_image.resize((10240, timeline_height), Image.ANTIALIAS) + for i in range(timeline_lines): + line_image = timeline_image.crop((i * poster_width, 0, (i + 1) * poster_width, 64)) + poster_image.paste(line_image, (0, i * timeline_height)) + + # id + text = 'Pad.ma/' + id + text_image = Image.new('RGB', (1, 1)) + text_size = drawText(text_image, (0, 0), text, font_file, font_size, poster_color) + text_width = poster_width + text_height = timeline_height + text_left = int((poster_width - text_width) / 2) + text_top = 14 * timeline_height + for y in range(text_top, text_top + text_height): + for x in range(text_left, text_left + text_width): + if y < text_top + 4 or y >= text_top + text_height - 4: + poster_image.putpixel((x, y), poster_color) + else: + pixel = list(poster_image.getpixel((x, y))) + for c in range(3): + pixel[c] = (pixel[c] + poster_color[c]) / 4 + poster_image.putpixel((x, y), tuple(pixel)) + drawText(poster_image, ((poster_width - text_size[0]) / 2, text_top + (text_height - text_size[1]) / 2), text, font_file, font_size, poster_color) + poster_image.save(poster) + +def main(): + parser = OptionParser() + parser.add_option('-i', '--id', dest='id', help='Pad.ma Id') + parser.add_option('-t', '--title', dest='title', help='Title', default='') + parser.add_option('-f', '--frame', dest='frame', help='Poster frame (image file to be read)') + parser.add_option('-l', '--timeline', dest='timeline', help='Timeline (image file to be read)') + parser.add_option('-p', '--poster', dest='poster', help='Poster (image file to be written)') + (options, args) = parser.parse_args() + if None in (options.id, options.poster): + parser.print_help() + sys.exit() + opt = {} + for key in ('id', 'title', 'frame', 'timeline', 'poster'): + opt[key] = getattr(options, key) + + opt['title'] = opt['title'].decode('utf-8') + + render_poster(**opt) + +if __name__ == "__main__": + main() + diff --git a/pandora/settings.py b/pandora/settings.py index 6b5c9669..62b12c8e 100644 --- a/pandora/settings.py +++ b/pandora/settings.py @@ -151,6 +151,10 @@ POSTER_PRECEDENCE=('local', 'criterion.com', 'wikipedia.org', 'impawards.com', ' #0xdb.org #POSTER_SERVICES=['http://data.0xdb.org/poster/'] +ITEM_POSTER = join('scripts', 'oxdb_poster') +ITEM_ICON = join('scripts', 'item_icon') +LIST_ICON = join('scripts', 'list_icon') + #overwrite default settings with local settings try: from local_settings import * diff --git a/pandora/static/png/icon.mask.png b/pandora/static/png/icon.mask.png new file mode 100644 index 00000000..4e4d636f Binary files /dev/null and b/pandora/static/png/icon.mask.png differ diff --git a/pandora/static/png/logo.poster.png b/pandora/static/png/logo.poster.png new file mode 100644 index 00000000..bd1cfe90 Binary files /dev/null and b/pandora/static/png/logo.poster.png differ diff --git a/pandora/static/ttf/DejaVuSansCondensedBold.ttf b/pandora/static/ttf/DejaVuSansCondensedBold.ttf new file mode 100644 index 00000000..cb48a02b Binary files /dev/null and b/pandora/static/ttf/DejaVuSansCondensedBold.ttf differ