diff --git a/etc/apache2/vhost.conf.in b/etc/apache2/vhost.conf.in index ecc38d758..59dd098ea 100644 --- a/etc/apache2/vhost.conf.in +++ b/etc/apache2/vhost.conf.in @@ -38,6 +38,10 @@ ProxyPass / http://127.0.0.1:2620/ ProxyPassReverse / http://127.0.0.1:2620/ + LogLevel warn + ErrorLog /var/log/apache2/pandora_error.log + CustomLog /var/log/apache2/pandora_access.log combined + ServerSignature Off diff --git a/pandora/archive/extract.py b/pandora/archive/extract.py index 3903b7951..49cb5a727 100644 --- a/pandora/archive/extract.py +++ b/pandora/archive/extract.py @@ -85,6 +85,13 @@ def stream(video, target, profile, info): audioquality = 2 audiobitrate = None audiochannels = 2 + elif profile == '432p': + height = 432 + audiorate = 44100 + audioquality = 2 + audiobitrate = None + audiochannels = 2 + elif profile == '360p': height = 360 @@ -92,6 +99,13 @@ def stream(video, target, profile, info): audioquality = 1 audiobitrate = None audiochannels = 1 + elif profile == '288p': + height = 288 + + audiorate = 44100 + audioquality = 0 + audiobitrate = None + audiochannels = 1 elif profile == '240p': height = 240 @@ -99,6 +113,13 @@ def stream(video, target, profile, info): audioquality = 0 audiobitrate = None audiochannels = 1 + elif profile == '144p': + height = 144 + + audiorate = 22050 + audioquality = -1 + audiobitrate = '22k' + audiochannels = 1 else: height = 96 diff --git a/pandora/urls.py b/pandora/urls.py index db4d0b741..a831e30e2 100644 --- a/pandora/urls.py +++ b/pandora/urls.py @@ -4,6 +4,7 @@ import os from django.conf.urls.defaults import * from ox.django.http import HttpFileResponse +from django.views.generic.simple import redirect_to from django.conf import settings