Easier cutting.

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

diff --git a/src/archive/tasks.py b/src/archive/tasks.py
index 76f640b..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 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


@@ -18,7 +19,7 @@ from mutagen import id3
 from apiclient import api_call
 from archive.constants import status
 from archive.models import Audiobook
 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
 
 
 from archive.utils import ExistingFile
 
 


@@ -31,7 +32,7 @@ class AudioFormatTask(Task):
     @classmethod
     def set_status(cls, aid, status):
         Audiobook.objects.filter(pk=aid).update(
     @classmethod
     def set_status(cls, aid, status):
         Audiobook.objects.filter(pk=aid).update(

-            **{'%s_status' % cls.ext: status})
+            **{'%s_status' % cls.prefix: status})

 
     @staticmethod
     def encode(in_path, out_path):
 
     @staticmethod
     def encode(in_path, out_path):


@@ -39,7 +40,7 @@ class AudioFormatTask(Task):
 
     @classmethod
     def set_tags(cls, audiobook, file_name):
 
     @classmethod
     def set_tags(cls, audiobook, file_name):

-        tags = getattr(audiobook, "get_%s_tags" % cls.ext)()['tags']
+        tags = getattr(audiobook, "get_%s_tags" % cls.prefix)()['tags']

         if not tags.get('flac_sha1'):
             tags['flac_sha1'] = audiobook.get_source_sha1()
         audio = File(file_name)
         if not tags.get('flac_sha1'):
             tags['flac_sha1'] = audiobook.get_source_sha1()
         audio = File(file_name)


@@ -49,7 +50,7 @@ class AudioFormatTask(Task):
 
     @classmethod
     def save(cls, audiobook, file_name):
 
     @classmethod
     def save(cls, audiobook, file_name):

-        field = "%s_file" % cls.ext
+        field = "%s_file" % cls.prefix

         getattr(audiobook, field).save(
             "%d.%s" % (audiobook.pk, cls.ext),
             ExistingFile(file_name),
         getattr(audiobook, field).save(
             "%d.%s" % (audiobook.pk, cls.ext),
             ExistingFile(file_name),


@@ -62,16 +63,16 @@ class AudioFormatTask(Task):
     @classmethod
     def published(cls, aid):
         kwargs = {
     @classmethod
     def published(cls, aid):
         kwargs = {

-            "%s_published_tags" % cls.ext: F("%s_tags" % cls.ext),
-            "%s_tags" % cls.ext: None,
-            "%s_published" % cls.ext: datetime.now(),
-            '%s_status' % cls.ext: None,
+            "%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,

         }
         Audiobook.objects.filter(pk=aid).update(**kwargs)
 
     @classmethod
     def put(cls, user, audiobook, path):
         }
         Audiobook.objects.filter(pk=aid).update(**kwargs)
 
     @classmethod
     def put(cls, user, audiobook, path):

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

         data = {
             'book': tags['url'],
             'type': cls.ext,
         data = {
             'book': tags['url'],
             'type': cls.ext,


@@ -80,6 +81,9 @@ class AudioFormatTask(Task):
             'part_index': audiobook.index,
             'parts_count': audiobook.parts_count,
             'source_sha1': audiobook.source_sha1,
             '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,21 +93,20 @@ 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)
 
         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,
+            dir=settings.FILE_UPLOAD_TEMP_DIR
+        )

         out_file.close()
         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)
         self.set_status(aid, status.TAGGING)
         self.set_tags(audiobook, out_file.name)
         self.set_status(aid, status.SENDING)


@@ -116,13 +119,16 @@ class AudioFormatTask(Task):
 
         self.save(audiobook, out_file.name)
 
 
         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)
 
 
 class Mp3Task(AudioFormatTask):
     def on_failure(self, exc, task_id, args, kwargs, einfo):
         aid = (args[0], kwargs.get('aid'))[0]
         self.set_status(aid, None)
 
 
 class Mp3Task(AudioFormatTask):

-    ext = 'mp3'
+    prefix = ext = 'mp3'

 
     # these shouldn't be staticmethods
     def id3_text(tag, text):
 
     # these shouldn't be staticmethods
     def id3_text(tag, text):


@@ -154,7 +160,9 @@ class Mp3Task(AudioFormatTask):
     }
 
     @staticmethod
     }
 
     @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'),
         # 44.1kHz 64kbps mono MP3
         subprocess.check_call(['ffmpeg', 
             '-i', in_path.encode('utf-8'),


@@ -186,10 +194,12 @@ class Mp3Task(AudioFormatTask):
 
 
 class OggTask(AudioFormatTask):
 
 
 class OggTask(AudioFormatTask):

-    ext = 'ogg'
+    prefix = ext = 'ogg'

 
     @staticmethod
 
     @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'),
         # 44.1kHz 64kbps mono Ogg Vorbis
         subprocess.check_call(['ffmpeg', 
             '-i', in_path.encode('utf-8'),