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

site config, user level, item level

Browse source
This commit is contained in:
j 2011-09-06 08:06:59 -04:00
commit cbd04a10c8
12 changed files with 71 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pandora/archive/models.py
View file

@ -17,7 +17,6 @@ import ox
from ox.normalize import canonicalTitle
import chardet
from app.models import site_config
from item import utils
from person.models import get_name_sort
@ -237,12 +236,11 @@ class File(models.Model):
return srt
def editable(self, user):
#FIXME: check that user has instance of this file
return True
return self.instances.filter(volume__user=user).count() > 0
def save_chunk(self, chunk, chunk_id=-1, done=False):
if not self.available:
config = site_config()['video']
config = settings.CONFIG['video']
stream, created = Stream.objects.get_or_create(
file=self,
resolution=config['resolutions'][0],
@ -485,7 +483,7 @@ class Stream(models.Model):
return self.file.path(name)
def extract_derivatives(self):
config = site_config()['video']
config = settings.CONFIG['video']
for resolution in config['resolutions']:
for f in config['formats']:
derivative, created = Stream.objects.get_or_create(file=self.file,

5
pandora/archive/views.py
View file

@ -14,7 +14,6 @@ from ox.django.decorators import login_required_json
from ox.django.shortcuts import render_to_json_response, get_object_or_404_json, json_response
from ox.django.views import task_status
from app.models import site_config
from item import utils
from item.models import get_item, Item
from item.views import parse_query
@ -114,7 +113,7 @@ actions.register(update, cache=False)
@login_required_json
def encodingProfile(request):
config = site_config()['video']
config = settings.CONFIG['video']
profile = "%sp.%s" % (config['resolutions'][0], config['formats'][0])
response = json_response({'profile': profile})
return render_to_json_response(response)
@ -172,7 +171,7 @@ class VideoChunkForm(forms.Form):
def firefogg_upload(request):
profile = request.GET['profile']
oshash = request.GET['id']
config = site_config()['video']
config = settings.CONFIG['video']
video_profile = "%sp.%s" % (config['resolutions'][0], config['formats'][0])
#handle video upload