X-Git-Url: https://git.mdrn.pl/audio.git/blobdiff_plain/cf1c5c7118e320bdd5b9fa6dcef8585ba117ebb6..6eabd357bc96f9c952e759852b1a19d2c5cf6b83:/src/archive/tasks.py

diff --git a/src/archive/tasks.py b/src/archive/tasks.py
index 157824a..9d236db 100644
--- a/src/archive/tasks.py
+++ b/src/archive/tasks.py
@@ -80,6 +80,11 @@ class AudioFormatTask(Task):
             'part_index': audiobook.index,
             'parts_count': audiobook.parts_count,
             'source_sha1': audiobook.source_sha1,
+
+            'project': {
+                'description': audiobook.project.get_description(),
+                'icon': audiobook.project.get_icon_url(),
+            }
         }
         with open(path, 'rb') as f:
             api_call(user, UPLOAD_URL, data=data, files={
@@ -89,6 +94,7 @@ class AudioFormatTask(Task):
     def run(self, uid, aid, publish=True):
         aid = int(aid)
         audiobook = Audiobook.objects.get(id=aid)
+        self.audiobook = audiobook
         self.set_status(aid, status.ENCODING)
 
         if uid:
@@ -98,7 +104,7 @@ class AudioFormatTask(Task):
 
         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)
@@ -111,6 +117,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)
@@ -149,7 +158,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'),
@@ -184,7 +195,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'),