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

add support for direct video uploads with server side transcoding, ticket #1351

Browse source
This commit is contained in:
j 2013-03-26 11:54:03 +00:00
commit 9153c80844
6 changed files with 290 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
pandora/archive/models.py
View file

@ -76,6 +76,7 @@ class File(models.Model):
available = models.BooleanField(default = False)
selected = models.BooleanField(default = False)
uploading = models.BooleanField(default = False)
encoding = models.BooleanField(default = False)
wanted = models.BooleanField(default = False)
is_audio = models.BooleanField(default=False)
@ -248,6 +249,25 @@ class File(models.Model):
(not self.item or self.item.user == user)
def save_chunk(self, chunk, chunk_id=-1, done=False):
if not self.available:
if not self.data:
name = 'data.%s' % self.info.get('extension', 'avi')
self.data.name = self.get_path(name)
ox.makedirs(os.path.dirname(self.data.path))
with open(self.data.path, 'w') as f:
f.write(chunk.read())
self.save()
else:
with open(self.data.path, 'a') as f:
f.write(chunk.read())
if done:
self.info.update(ox.avinfo(self.data.path))
self.parse_info()
self.save()
return True
return False
def save_chunk_stream(self, chunk, chunk_id=-1, done=False):
if not self.available:
config = settings.CONFIG['video']
stream, created = Stream.objects.get_or_create(
@ -282,6 +302,7 @@ class File(models.Model):
'audioCodec': self.audio_codec,
'available': self.available,
'duration': duration,
'encoding': self.encoding,
'framerate': self.framerate,
'id': self.oshash,
'instances': [i.json() for i in self.instances.all()],
@ -472,6 +493,15 @@ class Stream(models.Model):
else:
self.available = False
self.save()
elif self.file.data:
video = self.file.data.path
target = self.video.path
info = ox.avinfo(video)
if extract.stream(video, target, self.name(), info):
self.available = True
else:
self.available = False
self.save()
def make_timeline(self):
if self.available and not self.source: