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

fix upload_to callbacks

Browse source
This commit is contained in:
j 2016-04-29 13:46:47 +02:00
parent 2812834ce3
commit 9c7552699f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pandora/archive/models.py
View file

@ -23,8 +23,7 @@ from person.models import get_name_sort
from chunk import save_chunk from chunk import save_chunk
import extract import extract
def get_path(f, x): return f.path(x) def data_path(f, x): return f.get_path('data.bin')
def get_data_path(f, x): return get_path(f, 'data.bin')
class File(models.Model): class File(models.Model):
AV_INFO = ( AV_INFO = (
@ -92,7 +91,7 @@ class File(models.Model):
#upload and data handling #upload and data handling
data = models.FileField(null=True, blank=True, data = models.FileField(null=True, blank=True,
upload_to=get_data_path) upload_to=data_path)
def __unicode__(self): def __unicode__(self):
return self.path return self.path
@ -634,6 +633,8 @@ def delete_frame(sender, **kwargs):
pre_delete.connect(delete_frame, sender=Frame) pre_delete.connect(delete_frame, sender=Frame)
def stream_path(f, x): return f.path(x)
class Stream(models.Model): class Stream(models.Model):
class Meta: class Meta:
@ -643,7 +644,7 @@ class Stream(models.Model):
resolution = models.IntegerField(default=96) resolution = models.IntegerField(default=96)
format = models.CharField(max_length=255, default='webm') format = models.CharField(max_length=255, default='webm')
media = models.FileField(default=None, blank=True, upload_to=get_path) media = models.FileField(default=None, blank=True, upload_to=stream_path)
source = models.ForeignKey('Stream', related_name='derivatives', default=None, null=True) source = models.ForeignKey('Stream', related_name='derivatives', default=None, null=True)
available = models.BooleanField(default=False) available = models.BooleanField(default=False)
oshash = models.CharField(max_length=16, null=True, db_index=True) oshash = models.CharField(max_length=16, null=True, db_index=True)