decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

expose parts

Browse source
This commit is contained in:
j 2011-06-27 21:40:44 +02:00
parent 4f71992f2b
commit 1d38cede3b
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/item/models.py
View file

@ -589,7 +589,7 @@ class Item(models.Model):
def main_videos(self):
#FIXME: needs to check if more than one user has main files and only
# take from "higher" user
videos = self.files.filter(is_main=True, is_video=True, available=True).order_by('part')
videos = self.files.filter(is_main=True, is_video=True, available=True, instances__gt=0).order_by('part')
if videos.count()>0:
first = videos[0]
user = first.instances.all()[0].volume.user

4
pandora/item/urls.py
View file

@ -6,8 +6,8 @@ from django.conf.urls.defaults import *
urlpatterns = patterns("item.views",
(r'^(?P<id>[A-Z0-9].*)/frame/(?P<size>\d+)/(?P<position>[0-9\.,]+).jpg$', 'frame'),
(r'^(?P<id>[A-Z0-9].*)/(?P<profile>.*.webm)$', 'video'),
(r'^(?P<id>[A-Z0-9].*)/(?P<profile>.*.mp4)$', 'video'),
(r'^(?P<id>[A-Z0-9].*)/(?P<oshash>[a-f0-9]+)/(?P<profile>.*.[webm|ogv|mp4])$', 'video'),
(r'^(?P<id>[A-Z0-9].*)/(?P<profile>.*.[webm|ogv|mp4])$', 'video'),
(r'^(?P<id>[A-Z0-9].*)/poster\.(?P<size>\d+)\.jpg$', 'poster'),
(r'^(?P<id>[A-Z0-9].*)/poster\.(?P<size>large)\.jpg$', 'poster'),
(r'^(?P<id>[A-Z0-9].*)/poster\.jpg$', 'poster'),

11
pandora/item/views.py
View file

@ -3,6 +3,7 @@
from __future__ import division
import os.path
from datetime import datetime
import mimetypes
from django.db.models import Count, Sum, Max
from django.http import HttpResponse, Http404
@ -581,16 +582,20 @@ def timeline_overview(request, id, size):
return HttpFileResponse(timeline, content_type='image/png')
def video(request, id, profile):
def video(request, id, profile, oshash=None):
item = get_object_or_404(models.Item, itemId=id)
if oshash:
stream = get_object_or_404(item.files, oshash=oshash)
path = stream.video.path
else:
stream = get_object_or_404(item.streams, profile=profile)
path = stream.video.path
content_type = path.endswith('.mp4') and 'video/mp4' or 'video/webm'
#server side cutting
t = request.GET.get('t')
if t:
t = map(float, t.split(','))
ext = os.path.splitext(profile)[1]
content_type = mimetypes.guess_type(path)[0]
if len(t) == 2 and t[1] > t[0] and stream.info['duration']>=t[1]:
response = HttpResponse(extract.chop(path, t[0], t[1]), content_type=content_type)
filename = "Clip of %s - %s-%s - %s %s%s" % (
@ -613,4 +618,4 @@ def video(request, id, profile):
response = HttpFileResponse(path, content_type=content_type)
response['Content-Disposition'] = 'attachment; filename="%s"' % filename
return response
return HttpFileResponse(path, content_type=content_type)
return HttpFileResponse(path)