Easier cutting.

[audio.git] / src / archive / tasks.py

diff --git a/src/archive/tasks.py b/src/archive/tasks.py
index 17d98cc..3538a73 100644 (file)
--- a/src/archive/tasks.py
+++ b/src/archive/tasks.py
@@ -10,6 +10,7 @@ from tempfile import NamedTemporaryFile
 from time import sleep
 
 from celery.task import Task
+from django.conf import settings
 from django.db.models import F
 from django.contrib.auth.models import User
 from mutagen import File
@@ -81,10 +82,8 @@ class AudioFormatTask(Task):
             'parts_count': audiobook.parts_count,
             'source_sha1': audiobook.source_sha1,
 
-            'project': {
-                'description': audiobook.project.get_description(),
-                'icon': audiobook.project.icon.url,
-            }
+            'project_description': audiobook.project.get_description(),
+            'project_icon': audiobook.project.get_icon_url(),
         }
         with open(path, 'rb') as f:
             api_call(user, UPLOAD_URL, data=data, files={
@@ -102,7 +101,10 @@ class AudioFormatTask(Task):
         else:
             user = None
 
-        out_file = NamedTemporaryFile(delete=False, prefix='%d-' % aid, suffix='.%s' % self.ext)
+        out_file = NamedTemporaryFile(
+            delete=False, prefix='%d-' % aid, suffix='.%s' % self.ext,
+            dir=settings.FILE_UPLOAD_TEMP_DIR
+        )
         out_file.close()
         self.encode(self.get_source_file_paths(audiobook), out_file.name)
         self.set_status(aid, status.TAGGING)