X-Git-Url: https://git.mdrn.pl/audio.git/blobdiff_plain/c7d2e4daae13c7c1100ec0d42ace0e8c34b5ae24..4ed2ea5a00aa1293135923b513925c46b963be93:/src/archive/tasks.py

diff --git a/src/archive/tasks.py b/src/archive/tasks.py
index 13bf5f2..4b8f5fe 100644
--- a/src/archive/tasks.py
+++ b/src/archive/tasks.py
@@ -18,7 +18,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,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):
@@ -39,7 +39,7 @@ class AudioFormatTask(Task):
 
     @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)
@@ -49,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),
@@ -62,16 +62,16 @@ 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, 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,
@@ -81,9 +81,10 @@ class AudioFormatTask(Task):
             'parts_count': audiobook.parts_count,
             'source_sha1': audiobook.source_sha1,
         }
-        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)
@@ -92,15 +93,7 @@ class AudioFormatTask(Task):
 
         user = User.objects.get(id=uid)
 
-        try:
-            os.makedirs(BUILD_PATH)
-        except OSError as e:
-            if e.errno == errno.EEXIST:
-                pass
-            else:
-                raise
-
-        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.set_status(aid, status.TAGGING)
@@ -121,15 +114,15 @@ class AudioFormatTask(Task):
 
 
 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'))
 
@@ -178,15 +171,14 @@ 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='', 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):