reqs fix

[audio.git] / apps / archive / views.py

diff --git a/apps/archive/views.py b/apps/archive/views.py
index 59239d2..d40f633 100644 (file)
--- a/apps/archive/views.py
+++ b/apps/archive/views.py
@@ -3,13 +3,14 @@
 from datetime import datetime
 import os
 import os.path
+from urllib import quote
 
 from archive import settings
 from django.contrib.auth import logout
-from django.contrib.auth.decorators import login_required, permission_required
+from django.contrib.auth.decorators import permission_required
 from django.core.urlresolvers import reverse
 from django.db.models import Q, Max
-from django.http import Http404
+from django.http import Http404, HttpResponse
 from django.shortcuts import render, redirect, get_object_or_404
 from django.views.decorators.http import require_POST
 
@@ -22,7 +23,6 @@ from archive import tasks
 from archive.utils import all_files
 
 
-@login_required
 def list_new(request):
     division = 'new'
 
@@ -151,7 +151,7 @@ def move_to_new(request, filename):
 
 @require_POST
 @permission_required('archive.change_audiobook')
-def publish(request, aid):
+def publish(request, aid, publish=True):
     """ mark file for publishing """
     audiobook = get_object_or_404(models.Audiobook, id=aid)
     tags = {
@@ -164,8 +164,8 @@ def publish(request, aid):
     audiobook.mp3_status = audiobook.ogg_status = status.WAITING
     audiobook.save()
     # isn't there a race here?
-    audiobook.mp3_task = tasks.Mp3Task.delay(aid).task_id
-    audiobook.ogg_task = tasks.OggTask.delay(aid).task_id
+    audiobook.mp3_task = tasks.Mp3Task.delay(aid, publish).task_id
+    audiobook.ogg_task = tasks.OggTask.delay(aid, publish).task_id
     audiobook.save()
 
     return redirect(file_managed, aid)
@@ -183,7 +183,22 @@ def cancel_publishing(request, aid):
     return redirect(file_managed, aid)
 
 
-@login_required
+def download(request, aid, which="source"):
+    if which not in ("source", "mp3", "ogg"):
+        raise Http404
+    audiobook = get_object_or_404(models.Audiobook, id=aid)
+    file_ = getattr(audiobook, "%s_file" % which)
+    if not file_:
+        raise Http404
+    ext = file_.path.rsplit('.', 1)[-1]
+    response = HttpResponse(mimetype='application/force-download')
+    
+    response['Content-Disposition'] = "attachment; filename*=UTF-8''%s.%s" % (
+        quote(audiobook.title.encode('utf-8'), safe=''), ext)
+    response['X-Sendfile'] = file_.path.encode('utf-8')
+    return response
+
+
 def list_unpublished(request):
     division = 'unpublished'
 
@@ -191,7 +206,6 @@ def list_unpublished(request):
     return render(request, "archive/list_unpublished.html", locals())
 
 
-@login_required
 def list_publishing(request):
     division = 'publishing'
 
@@ -209,7 +223,6 @@ def list_publishing(request):
     return render(request, "archive/list_publishing.html", locals())
 
 
-@login_required
 def list_published(request):
     division = 'published'
 
@@ -241,7 +254,6 @@ def file_managed(request, id):
     return render(request, "archive/file_managed.html", locals())
 
 
-@login_required
 def list_unmanaged(request):
     division = 'unmanaged'
 
@@ -249,7 +261,6 @@ def list_unmanaged(request):
     return render(request, "archive/list_unmanaged.html", locals())
 
 
-@login_required
 def file_unmanaged(request, filename):
     division = 'unmanaged'