fix

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

diff --git a/src/archive/tasks.py b/src/archive/tasks.py
index e50d9b2..d95baac 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 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
 from django.db.models import F
 from django.contrib.auth.models import User
 from mutagen import File


@@ -38,10 +39,7 @@ class AudioFormatTask(Task):
         raise NotImplemented
 
     @classmethod
         raise NotImplemented
 
     @classmethod

-    def set_tags(cls, audiobook, file_name):
-        tags = getattr(audiobook, "get_%s_tags" % cls.prefix)()['tags']
-        if not tags.get('flac_sha1'):
-            tags['flac_sha1'] = audiobook.get_source_sha1()
+    def set_tags(cls, tags, file_name):

         audio = File(file_name)
         for k, v in tags.items():
             audio[k] = v
         audio = File(file_name)
         for k, v in tags.items():
             audio[k] = v


@@ -60,10 +58,8 @@ class AudioFormatTask(Task):
             **{field: getattr(audiobook, field)})
 
     @classmethod
             **{field: getattr(audiobook, field)})
 
     @classmethod

-    def published(cls, aid):
+    def published(cls, aid, tags):

         kwargs = {
         kwargs = {

-            "%s_published_tags" % cls.prefix: F("%s_tags" % cls.prefix),
-            "%s_tags" % cls.prefix: None,

             "%s_published" % cls.prefix: datetime.now(),
             '%s_status' % cls.prefix: None,
         }
             "%s_published" % cls.prefix: datetime.now(),
             '%s_status' % cls.prefix: None,
         }


@@ -71,15 +67,17 @@ class AudioFormatTask(Task):
 
     @classmethod
     def put(cls, user, audiobook, path):
 
     @classmethod
     def put(cls, user, audiobook, path):

-        tags = getattr(audiobook, "get_%s_tags" % cls.prefix)()

         data = {
         data = {

-            'book': tags['url'],
+            'book': audiobook.url,

             'type': cls.ext,
             'type': cls.ext,

-            'name': tags['name'],
+            'name': audiobook.title,                ##### IS IT USED?

             'part_name': audiobook.part_name,
             'part_index': audiobook.index,
             'parts_count': audiobook.parts_count,
             'source_sha1': audiobook.source_sha1,
             'part_name': audiobook.part_name,
             'part_index': audiobook.index,
             'parts_count': audiobook.parts_count,
             'source_sha1': audiobook.source_sha1,

+
+            '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={
         }
         with open(path, 'rb') as f:
             api_call(user, UPLOAD_URL, data=data, files={


@@ -89,6 +87,7 @@ class AudioFormatTask(Task):
     def run(self, uid, aid, publish=True):
         aid = int(aid)
         audiobook = Audiobook.objects.get(id=aid)
     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:
         self.set_status(aid, status.ENCODING)
 
         if uid:


@@ -96,23 +95,28 @@ class AudioFormatTask(Task):
         else:
             user = None
 
         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)
         out_file.close()
         self.encode(self.get_source_file_paths(audiobook), out_file.name)
         self.set_status(aid, status.TAGGING)

-        self.set_tags(audiobook, out_file.name)
+
+        tags = audiobook.new_publish_tags()
+        self.set_tags(tags, out_file.name)

         self.set_status(aid, status.SENDING)
 
         if publish:
             self.put(user, audiobook, out_file.name)
         self.set_status(aid, status.SENDING)
 
         if publish:
             self.put(user, audiobook, out_file.name)

-            self.published(aid)
+            self.published(aid, tags)

         else:
             self.set_status(aid, None)
 
         self.save(audiobook, out_file.name)
 
     def get_source_file_paths(self, audiobook):
         else:
             self.set_status(aid, None)
 
         self.save(audiobook, out_file.name)
 
     def get_source_file_paths(self, audiobook):

-        return [audiobook.source_file.path]
+        return [audiobook.prepare_audio()]

 
     def on_failure(self, exc, task_id, args, kwargs, einfo):
         aid = (args[0], kwargs.get('aid'))[0]
 
     def on_failure(self, exc, task_id, args, kwargs, einfo):
         aid = (args[0], kwargs.get('aid'))[0]


@@ -167,12 +171,9 @@ class Mp3Task(AudioFormatTask):
             ])
 
     @classmethod
             ])
 
     @classmethod

-    def set_tags(cls, audiobook, file_name):
-        mp3_tags = audiobook.get_mp3_tags()['tags']
-        if not mp3_tags.get('flac_sha1'):
-            mp3_tags['flac_sha1'] = audiobook.get_source_sha1()
+    def set_tags(cls, tags, file_name):

         audio = id3.ID3(file_name)
         audio = id3.ID3(file_name)

-        for k, v in mp3_tags.items():
+        for k, v in tags.items():

             factory_tuple = cls.TAG_MAP[k]
             factory, tagtype = factory_tuple[:2]
             audio.add(factory(tagtype, v, *factory_tuple[2:]))
             factory_tuple = cls.TAG_MAP[k]
             factory, tagtype = factory_tuple[:2]
             audio.add(factory(tagtype, v, *factory_tuple[2:]))