X-Git-Url: https://git.mdrn.pl/audio.git/blobdiff_plain/c7d2e4daae13c7c1100ec0d42ace0e8c34b5ae24..refs/heads/master:/src/archive/tasks.py?ds=sidebyside diff --git a/src/archive/tasks.py b/src/archive/tasks.py index 13bf5f2..d95baac 100644 --- 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 @@ -18,7 +19,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 @@ -31,17 +32,14 @@ class AudioFormatTask(Task): @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): raise NotImplemented @classmethod - def set_tags(cls, audiobook, file_name): - tags = getattr(audiobook, "get_%s_tags" % cls.ext)()['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 @@ -49,7 +47,7 @@ class AudioFormatTask(Task): @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), @@ -60,76 +58,81 @@ class AudioFormatTask(Task): **{field: getattr(audiobook, field)}) @classmethod - def published(cls, aid): + def published(cls, aid, tags): 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" % cls.prefix: datetime.now(), + '%s_status' % cls.prefix: None, } Audiobook.objects.filter(pk=aid).update(**kwargs) @classmethod def put(cls, user, audiobook, path): - tags = getattr(audiobook, "get_%s_tags" % cls.ext)() data = { - 'book': tags['url'], + 'book': audiobook.url, '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, + + 'project_description': audiobook.project.get_description(), + 'project_icon': audiobook.project.get_icon_url(), } - api_call(user, UPLOAD_URL, data=data, files={ - "file": open(path, 'rb'), - }) + with open(path, 'rb') as f: + api_call(user, UPLOAD_URL, data=data, files={ + "file": f, + }) 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) - 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() - 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) + + 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.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): + return [audiobook.prepare_audio()] + 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): - return tag(encoding=1, text=text) + return tag(encoding=3, text=text) def id3_url(tag, text): return tag(url=text) def id3_comment(tag, text, lang='pol'): - return tag(encoding=1, lang=lang, desc='', text=text) + return tag(encoding=3, lang=lang, desc='', text=text) def id3_priv(tag, text, what=''): return tag(owner='wolnelektury.pl?%s' % what, data=text.encode('utf-8')) @@ -153,7 +156,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'), @@ -166,30 +171,28 @@ class Mp3Task(AudioFormatTask): ]) @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) - 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:])) if COVER_IMAGE: mime = mimetypes.guess_type(COVER_IMAGE) - f = open(COVER_IMAGE) - audio.add(id3.APIC(encoding=0, mime=mime, type=3, desc='', data=f.read())) - f.close() + with open(COVER_IMAGE, 'rb') as f: + audio.add(id3.APIC(encoding=0, mime=mime, type=3, desc='', data=f.read())) audio.save() class OggTask(AudioFormatTask): - ext = 'ogg' + 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'),