X-Git-Url: https://git.mdrn.pl/audio.git/blobdiff_plain/d7186e88fcc0cf5d5449a16d3907e01aaafc484e..3d43625e3a4a34761b4aa628e7af9732a21447da:/src/archive/tasks.py?ds=sidebyside

diff --git a/src/archive/tasks.py b/src/archive/tasks.py
index b5675ce..e50d9b2 100644
--- a/src/archive/tasks.py
+++ b/src/archive/tasks.py
@@ -18,7 +18,7 @@ from mutagen import id3
 from apiclient import api_call
 from archive.constants import status
 from archive.models import Audiobook
-from archive.settings import BUILD_PATH, COVER_IMAGE, UPLOAD_URL
+from archive.settings import COVER_IMAGE, UPLOAD_URL
 from archive.utils import ExistingFile
 
 
@@ -91,19 +91,14 @@ class AudioFormatTask(Task):
         audiobook = Audiobook.objects.get(id=aid)
         self.set_status(aid, status.ENCODING)
 
-        user = User.objects.get(id=uid)
-
-        try:
-            os.makedirs(BUILD_PATH)
-        except OSError as e:
-            if e.errno == errno.EEXIST:
-                pass
-            else:
-                raise
+        if uid:
+            user = User.objects.get(id=uid)
+        else:
+            user = None
 
-        out_file = NamedTemporaryFile(delete=False, prefix='%d-' % aid, suffix='.%s' % self.ext, dir=BUILD_PATH)
+        out_file = NamedTemporaryFile(delete=False, prefix='%d-' % aid, suffix='.%s' % self.ext)
         out_file.close()
-        self.encode(audiobook.source_file.path, out_file.name)
+        self.encode(self.get_source_file_paths(audiobook), out_file.name)
         self.set_status(aid, status.TAGGING)
         self.set_tags(audiobook, out_file.name)
         self.set_status(aid, status.SENDING)
@@ -116,6 +111,9 @@ class AudioFormatTask(Task):
 
         self.save(audiobook, out_file.name)
 
+    def get_source_file_paths(self, audiobook):
+        return [audiobook.source_file.path]
+
     def on_failure(self, exc, task_id, args, kwargs, einfo):
         aid = (args[0], kwargs.get('aid'))[0]
         self.set_status(aid, None)
@@ -154,7 +152,9 @@ class Mp3Task(AudioFormatTask):
     }
 
     @staticmethod
-    def encode(in_path, out_path):
+    def encode(in_paths, out_path):
+        assert len(in_paths) == 1
+        in_path = in_paths[0]
         # 44.1kHz 64kbps mono MP3
         subprocess.check_call(['ffmpeg', 
             '-i', in_path.encode('utf-8'),
@@ -189,7 +189,9 @@ class OggTask(AudioFormatTask):
     prefix = ext = 'ogg'
 
     @staticmethod
-    def encode(in_path, out_path):
+    def encode(in_paths, out_path):
+        assert len(in_paths) == 1
+        in_path = in_paths[0]
         # 44.1kHz 64kbps mono Ogg Vorbis
         subprocess.check_call(['ffmpeg', 
             '-i', in_path.encode('utf-8'),