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

more moving around

Browse source
This commit is contained in:
j 2010-11-08 17:34:25 +01:00
commit bdb0365fb1
36 changed files with 200 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pandora/archive/models.py
View file

@ -22,8 +22,8 @@ from ox.normalize import canonicalTitle, canonicalName
from firefogg import Firefogg
import chardet
from backend import utils
from pandora.backend.models import Item
from item import utils
from item.models import Item
import extract
@ -143,7 +143,7 @@ class File(models.Model):
#upload and data handling
video = models.FileField(null=True, blank=True, upload_to=lambda f, x: file_path(f, '%s.webm'%settings.VIDEO_PROFILE))
data = models.FileField(null=True, blank=True, upload_to=lambda f, x: file_path(f, 'data.raw'))
data = models.FileField(null=True, blank=True, upload_to=lambda f, x: file_path(f, 'data.bin'))
def contents(self):
if self.data != None:

10
pandora/archive/views.py
View file

@ -29,9 +29,9 @@ import ox
import models
from backend.utils import oxid, parse_path
import backend.models
import backend.tasks
from item.utils import oxid, parse_path
import item.models
import item.tasks
@login_required_json
def api_removeVolume(request):
@ -114,7 +114,7 @@ def api_update(request):
else:
if not item:
item_info = parse_path(folder)
item = backend.models.getItem(item_info)
item = item.models.getItem(item_info)
file_object = models.File()
file_object.oshash = oshash
file_object.name = name
@ -223,7 +223,7 @@ def firefogg_upload(request):
elif form.cleaned_data['done']:
f.available = True
f.save()
backend.tasks.updateStreams.delay(f.item.itemId)
item.tasks.updateStreams.delay(f.item.itemId)
response['result'] = 1
response['done'] = 1
return render_to_json_response(response)