Remove BUILD_PATH, that's what TMPDIR is for.

[audio.git] / src / youtube / models.py

diff --git a/src/youtube/models.py b/src/youtube/models.py
index 1a3fd01..eb669e0 100644 (file)
--- a/src/youtube/models.py
+++ b/src/youtube/models.py
@@ -1,11 +1,11 @@
 import io
 from os import unlink
 from tempfile import NamedTemporaryFile
 import io
 from os import unlink
 from tempfile import NamedTemporaryFile

-from django.conf import settings

 from django.db import models
 from django.utils.translation import gettext_lazy as _
 from django.template import Template, Context
 from apiclient import youtube_call
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 from django.template import Template, Context
 from apiclient import youtube_call

+from archive.settings import LICENSE, LICENSE_NAME

 from .utils import (
     concat_audio,
     concat_videos,
 from .utils import (
     concat_audio,
     concat_videos,


@@ -13,6 +13,7 @@ from .utils import (
     get_duration,
     get_framerate,
     mux,
     get_duration,
     get_framerate,
     mux,

+    standardize_audio,

     standardize_video,
     video_from_image,
 )
     standardize_video,
     video_from_image,
 )


@@ -45,8 +46,8 @@ class YouTube(models.Model):
     def get_context(self, audiobook):
         return Context(dict(
             audiobook=audiobook,
     def get_context(self, audiobook):
         return Context(dict(
             audiobook=audiobook,

-            LICENSE=settings.LICENSE,
-            LICENSE_NAME=settings.LICENSE_NAME,
+            LICENSE=LICENSE,
+            LICENSE_NAME=LICENSE_NAME,

         ))
 
     def get_description(self, audiobook):
         ))
 
     def get_description(self, audiobook):


@@ -119,11 +120,15 @@ class YouTube(models.Model):
     def prepare_audio(self, input_path):
         files = []
         if self.intro_flac:
     def prepare_audio(self, input_path):
         files = []
         if self.intro_flac:

-            files.append(self.intro_flac.path)
-        files.append(input_path)
+            files.append(standardize_audio(self.intro_flac.path))
+        files.append(standardize_audio(input_path, cache=False))

         if self.outro_flac:
         if self.outro_flac:

-            files.append(self.outro_flac.path)
-        return concat_audio(files)
+            files.append(standardize_audio(self.outro_flac.path))
+        output = concat_audio(files)
+        for d in files:
+            unlink(d)
+        return output
+

     
     def prepare_video(self, duration):
         concat = []
     
     def prepare_video(self, duration):
         concat = []