X-Git-Url: https://git.mdrn.pl/audio.git/blobdiff_plain/eee35e00bf0d0eb3d2a9f08f72c7052962fecbf6..3d43625e3a4a34761b4aa628e7af9732a21447da:/src/archive/tasks.py diff --git a/src/archive/tasks.py b/src/archive/tasks.py index a46b79c..e50d9b2 100644 --- a/src/archive/tasks.py +++ b/src/archive/tasks.py @@ -9,25 +9,18 @@ import subprocess from tempfile import NamedTemporaryFile from time import sleep -#from celery.decorators import task from celery.task import Task from django.db.models import F -from fabric import api -from fabric.network import disconnect_all +from django.contrib.auth.models import User from mutagen import File from mutagen import id3 -import mutagen - +from apiclient import api_call from archive.constants import status from archive.models import Audiobook -from archive.settings import (BUILD_PATH, COVER_IMAGE, - UPLOAD_HOST, UPLOAD_USER, UPLOAD_PASSWORD, UPLOAD_PATH, UPLOAD_CMD, UPLOAD_SUDO) +from archive.settings import COVER_IMAGE, UPLOAD_URL from archive.utils import ExistingFile -api.env.host_string = UPLOAD_HOST -api.env.user = UPLOAD_USER -api.env.password = UPLOAD_PASSWORD class AudioFormatTask(Task): abstract = True @@ -38,7 +31,7 @@ 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): @@ -46,7 +39,7 @@ class AudioFormatTask(Task): @classmethod def set_tags(cls, audiobook, file_name): - tags = getattr(audiobook, "%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) @@ -56,7 +49,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), @@ -69,80 +62,74 @@ class AudioFormatTask(Task): @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, audiobook, path): - tags = getattr(audiobook, "%s_tags" % cls.ext) - prefix, slug = tags['url'].rstrip('/').rsplit('/', 1) - name = tags['name'] - command = UPLOAD_CMD + (u' %s %s %s %s %s %s > output.txt' % ( - pipes.quote(os.path.join(UPLOAD_PATH, os.path.basename(path))), - pipes.quote(slug), - pipes.quote(name), - pipes.quote(audiobook.part_name), - audiobook.index, - audiobook.parts_count, - )).encode('utf-8') - try: - api.put(path, UPLOAD_PATH) - if UPLOAD_SUDO: - api.sudo(command, user=UPLOAD_SUDO, shell=False) - else: - api.run(command) - disconnect_all() - except SystemExit, e: - raise cls.RemoteOperationError - - def run(self, aid, publish=True): + def put(cls, user, audiobook, path): + tags = getattr(audiobook, "get_%s_tags" % cls.prefix)() + data = { + 'book': tags['url'], + 'type': cls.ext, + 'name': tags['name'], + 'part_name': audiobook.part_name, + 'part_index': audiobook.index, + 'parts_count': audiobook.parts_count, + 'source_sha1': audiobook.source_sha1, + } + 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.set_status(aid, status.ENCODING) - 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) if publish: - self.put(audiobook, out_file.name) + self.put(user, audiobook, out_file.name) self.published(aid) else: self.set_status(aid, None) 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): - 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=u'pol'): - return tag(encoding=1, lang=lang, desc=u'', text=text) - def id3_priv(tag, text, what=u''): + def id3_comment(tag, text, lang='pol'): + 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')) TAG_MAP = { @@ -165,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'), @@ -179,7 +168,7 @@ class Mp3Task(AudioFormatTask): @classmethod def set_tags(cls, audiobook, file_name): - mp3_tags = audiobook.mp3_tags['tags'] + mp3_tags = audiobook.get_mp3_tags()['tags'] if not mp3_tags.get('flac_sha1'): mp3_tags['flac_sha1'] = audiobook.get_source_sha1() audio = id3.ID3(file_name) @@ -190,18 +179,19 @@ class Mp3Task(AudioFormatTask): if COVER_IMAGE: mime = mimetypes.guess_type(COVER_IMAGE) - f = open(COVER_IMAGE) - audio.add(id3.APIC(encoding=0, mime=mime, type=3, desc=u'', 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'),