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

get_or_create fix, handle frame upload, remove dead code

Browse source
This commit is contained in:
j 2010-02-06 17:04:20 +05:30
commit 50f014f622
3 changed files with 15 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

9
oxdb/backend/models.py
View file

@ -989,10 +989,10 @@ def timeline_path(f):
return os.path.join(url_hash[:2], url_hash[2:4], url_hash[4:6], url_hash, name)
def frame_path(f):
position = oxlib.formatTime(f.position*1000).replace(':', '.')
position = oxlib.formatDuration(f.position*1000).replace(':', '.')
name = "%s.%s" % (position, 'png')
url_hash = f.file.oshash
return os.path.join(url_hash[:2], url_hash[2:4], url_hash[4:6], url_hash, name)
return os.path.join(url_hash[:2], url_hash[2:4], url_hash[4:6], url_hash, 'frames', name)
FILE_TYPES = (
(0, 'unknown'),
@ -1236,8 +1236,9 @@ class ArchiveFile(models.Model):
try:
f = model.objects.by_oshash(oshash=oshash)
except model.DoesNotExist:
file = File.objects.get_or_create(oshash)
file.save()
file, created = File.objects.get_or_create(oshash)
if created:
file.save()
f = model.objects.create(archive=archive, file=file)
f.save()
return f