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

serve frames and videos with X-Sendfile header

Browse source
This commit is contained in:
j 2010-02-16 18:11:57 +05:30
commit 1354a1ddc5
6 changed files with 51 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pandora/backend/models.py
View file

@ -10,6 +10,7 @@ from django.db.models import Q
from django.contrib.auth.models import User
from django.core.files.base import ContentFile
from django.utils import simplejson as json
from django.conf import settings
from oxdjango import fields
import oxlib
@ -430,6 +431,11 @@ class Movie(models.Model):
self.get('series_title', ''), self.get('episode_title', ''),
self.get('season', ''), self.get('episode', ''))
def frame(self, position, width=128):
#FIXME: compute offset and so on
f = self.files.all()[0]
return f.frame(position, width)
def updateFind(self):
try:
f = self.find
@ -1155,7 +1161,9 @@ class File(models.Model):
def frame(self, position, width=128):
videoFile = getattr(self, 'stream_%s'%settings.VIDEO_PROFILE).path
frameFolder = os.path.join(os.path.dirname(videoFile), 'frames')
extract.frame(videoFile, position, frameFolder, width)
if position<= self.duration:
return extract.frame(videoFile, position, frameFolder, width)
return None
def editable(self, user):
'''