Adding intro and outro.

diff --git a/requirements.txt b/requirements.txt
index eac0b6f..c03d377 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,19 +1,19 @@
 -i https://py.mdrn.pl/simple
 
 -i https://py.mdrn.pl/simple
 

-Django==3.1.8
-django-cas-ng==4.1.1
-django-bootstrap4==2.2.0
+Django==3.1.14
+django-cas-ng==4.2.1
+django-bootstrap4==21.1

 django-pglocks==1.0.4
 fnp-django-pagination==2.2.4
 
 celery[redis]==4.4.2
 
 django-pglocks==1.0.4
 fnp-django-pagination==2.2.4
 
 celery[redis]==4.4.2
 

-psycopg2-binary==2.8.5
+psycopg2-binary==2.9.2

 mutagen==1.45.1
 mutagen==1.45.1

-requests==2.24.0
+requests==2.26.0

 requests-toolbelt==0.9.1
 requests-oauthlib==1.3.0
 requests-toolbelt==0.9.1
 requests-oauthlib==1.3.0

-PyYAML==5.4.1
-Pillow==8.2.0
-librarian==1.9
+PyYAML==6.0
+Pillow==8.4.0
+librarian==2.3.2

 py3-aeneas==1.1.0
 py3-aeneas==1.1.0

diff --git a/src/archive/admin.py b/src/archive/admin.py
index 10f1a33..94c3aaf 100644 (file)
--- a/src/archive/admin.py
+++ b/src/archive/admin.py
@@ -1,4 +1,4 @@
-from archive.models import Project, Audiobook, License
+from archive.models import Project, Audiobook, License, Config

 from django.contrib import admin
 
 admin.site.register(Project)
 from django.contrib import admin
 
 admin.site.register(Project)


@@ -14,3 +14,4 @@ class AudiobookAdmin(admin.ModelAdmin):
 
 admin.site.register(Audiobook, AudiobookAdmin)
 admin.site.register(License)
 
 admin.site.register(Audiobook, AudiobookAdmin)
 admin.site.register(License)

+admin.site.register(Config)

diff --git a/src/archive/migrations/0024_auto_20211222_1604.py b/src/archive/migrations/0024_auto_20211222_1604.py
new file mode 100644 (file)
index 0000000..f4c724c
--- /dev/null
+++ b/src/archive/migrations/0024_auto_20211222_1604.py
@@ -0,0 +1,34 @@
+# Generated by Django 3.1.14 on 2021-12-22 16:04
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archive', '0023_project_info_flac'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Config',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('intro_flac', models.FileField(blank=True, upload_to='config/intro_flac')),
+                ('intro_min_seconds', models.IntegerField()),
+                ('outro_flac', models.FileField(blank=True, upload_to='config/outro_flac')),
+                ('outro_min_seconds', models.IntegerField()),
+            ],
+            options={
+                'verbose_name': 'Configuration',
+                'verbose_name_plural': 'Configurations',
+            },
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='config',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='archive.config'),
+        ),
+    ]

diff --git a/src/archive/migrations/0025_create_config.py b/src/archive/migrations/0025_create_config.py
new file mode 100644 (file)
index 0000000..f297676
--- /dev/null
+++ b/src/archive/migrations/0025_create_config.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.1.14 on 2021-12-22 16:00
+
+from django.db import migrations
+
+
+def create_config(apps, schema_editor):
+    Config = apps.get_model('archive', 'Config')
+    Project = apps.get_model('archive', 'Project')
+    c = Config.objects.create(name='Wolne Lektury', intro_min_seconds=0, outro_min_seconds=0)
+    Project.objects.all().update(config=c)
+    
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archive', '0024_auto_20211222_1604'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            create_config,
+            migrations.RunPython.noop
+        )
+    ]

diff --git a/src/archive/migrations/0026_auto_20211222_1605.py b/src/archive/migrations/0026_auto_20211222_1605.py
new file mode 100644 (file)
index 0000000..5b09693
--- /dev/null
+++ b/src/archive/migrations/0026_auto_20211222_1605.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.1.14 on 2021-12-22 16:05
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archive', '0025_create_config'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='project',
+            name='config',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='archive.config'),
+        ),
+    ]

diff --git a/src/archive/models.py b/src/archive/models.py
index fe6cc5c..c8a1dc7 100644 (file)
--- a/src/archive/models.py
+++ b/src/archive/models.py
@@ -1,5 +1,6 @@
 import io
 import json
 import io
 import json

+from os import unlink

 import os.path
 from urllib.parse import urljoin
 
 import os.path
 from urllib.parse import urljoin
 


@@ -14,6 +15,7 @@ import requests
 from archive.constants import status
 from archive.settings import FILES_SAVE_PATH, ADVERT, ORGANIZATION, PROJECT
 from archive.utils import OverwriteStorage, sha1_file
 from archive.constants import status
 from archive.settings import FILES_SAVE_PATH, ADVERT, ORGANIZATION, PROJECT
 from archive.utils import OverwriteStorage, sha1_file

+from youtube.utils import concat_audio, standardize_audio

 
 
 class License(models.Model):
 
 
 class License(models.Model):


@@ -30,6 +32,7 @@ class Project(models.Model):
     name = models.CharField(max_length=128, unique=True, db_index=True, verbose_name="Nazwa")
     sponsors = models.TextField(blank=True, null=True, verbose_name="Sponsorzy")
     description = models.TextField(blank=True, verbose_name="Opis")
     name = models.CharField(max_length=128, unique=True, db_index=True, verbose_name="Nazwa")
     sponsors = models.TextField(blank=True, null=True, verbose_name="Sponsorzy")
     description = models.TextField(blank=True, verbose_name="Opis")

+    config = models.ForeignKey('Config', models.PROTECT)

     youtube = models.ForeignKey('youtube.YouTube', models.PROTECT)
     icon = models.FileField(upload_to='archive/project', blank=True, null=True)
     info_flac = models.FileField(upload_to='archive/info_flac', blank=True)
     youtube = models.ForeignKey('youtube.YouTube', models.PROTECT)
     icon = models.FileField(upload_to='archive/project', blank=True, null=True)
     info_flac = models.FileField(upload_to='archive/info_flac', blank=True)


@@ -59,6 +62,34 @@ class Project(models.Model):
         )
 
 
         )
 
 

+class Config(models.Model):
+    name = models.CharField(max_length=255)
+    intro_flac = models.FileField(upload_to='config/intro_flac', blank=True)
+    intro_min_seconds = models.IntegerField()
+    outro_flac = models.FileField(upload_to='config/outro_flac', blank=True)
+    outro_min_seconds = models.IntegerField()
+
+    class Meta:
+        verbose_name = _("Configuration")
+        verbose_name_plural = _("Configurations")
+
+    def __str__(self):
+        return self.name
+
+    def prepare_audio(self, audiobook):
+        total_duration = audiobook.total_duration
+        files = []
+        if self.intro_flac and total_duration > self.intro_min_seconds and audiobook.is_first:
+            files.append(standardize_audio(self.intro_flac.path))
+        files.append(standardize_audio(audiobook.source_file.path))
+        if self.outro_flac and total_duration > self.outro_min_seconds and audiobook.is_last:
+            files.append(standardize_audio(self.outro_flac.path))
+        output = concat_audio(files)
+        for d in files:
+            unlink(d)
+        return output
+
+

 def source_upload_to(intance, filename):
     return os.path.join(FILES_SAVE_PATH, filename) # FIXME: what about really long file names?
 
 def source_upload_to(intance, filename):
     return os.path.join(FILES_SAVE_PATH, filename) # FIXME: what about really long file names?
 


@@ -130,6 +161,18 @@ class Audiobook(models.Model):
     def parts_count(self):
         return type(self).objects.filter(slug=self.slug).count()
 
     def parts_count(self):
         return type(self).objects.filter(slug=self.slug).count()
 

+    @property
+    def total_duration(self):
+        return type(self).objects.filter(slug=self.slug).aggregate(s=models.Sum('duration'))['s']
+
+    @property
+    def is_first(self):
+        return not type(self).objects.filter(slug=self.slug, index__lte=self.index).exclude(pk=self.pk).exists()
+
+    @property
+    def is_last(self):
+        return not type(self).objects.filter(slug=self.slug, index__gte=self.index).exclude(pk=self.pk).exists()
+    

     @property
     def youtube_volume_count(self):
         total = 0
     @property
     def youtube_volume_count(self):
         total = 0


@@ -176,6 +219,24 @@ class Audiobook(models.Model):
     def published(self):
         return self.mp3_published and self.ogg_published
 
     def published(self):
         return self.mp3_published and self.ogg_published
 

+    def prepare_for_publish(self):
+        tags = {
+            'name': self.title,
+            'url': self.url,
+            'tags': self.new_publish_tags(),
+        }
+        self.set_mp3_tags(tags)
+        self.set_ogg_tags(tags)
+        self.mp3_status = self.ogg_status = status.WAITING
+        self.save()
+    
+    def publish(self, user):
+        from . import tasks
+        # isn't there a race here?
+        self.mp3_task = tasks.Mp3Task.delay(user.id, self.pk, publish).task_id
+        self.ogg_task = tasks.OggTask.delay(user.id, self.pk, publish).task_id
+        audiobook.save()
+

     def get_source_sha1(self):
         assert self.pk or self.source_sha1
         if not self.source_sha1:
     def get_source_sha1(self):
         assert self.pk or self.source_sha1
         if not self.source_sha1:


@@ -225,6 +286,9 @@ class Audiobook(models.Model):
             tags['flac_sha1'] = self.source_sha1
         return tags
 
             tags['flac_sha1'] = self.source_sha1
         return tags
 

+    def prepare_audio(self):
+        return self.project.config.prepare_audio(self)
+    

     @cached_property
     def book(self):
         if self.slug:
     @cached_property
     def book(self):
         if self.slug:

diff --git a/src/archive/tasks.py b/src/archive/tasks.py
index 3538a73..796b83c 100644 (file)
--- a/src/archive/tasks.py
+++ b/src/archive/tasks.py
@@ -120,7 +120,7 @@ class AudioFormatTask(Task):
         self.save(audiobook, out_file.name)
 
     def get_source_file_paths(self, audiobook):
         self.save(audiobook, out_file.name)
 
     def get_source_file_paths(self, audiobook):

-        return [audiobook.source_file.path]
+        return [audiobook.prepare_audio()]

 
     def on_failure(self, exc, task_id, args, kwargs, einfo):
         aid = (args[0], kwargs.get('aid'))[0]
 
     def on_failure(self, exc, task_id, args, kwargs, einfo):
         aid = (args[0], kwargs.get('aid'))[0]

diff --git a/src/archive/views.py b/src/archive/views.py
index 1d4341e..87eee5b 100644 (file)
--- a/src/archive/views.py
+++ b/src/archive/views.py
@@ -157,20 +157,9 @@ def move_to_new(request, filename):
 def publish(request, aid, publish=True):
     """ mark file for publishing """
     audiobook = get_object_or_404(models.Audiobook, id=aid)
 def publish(request, aid, publish=True):
     """ mark file for publishing """
     audiobook = get_object_or_404(models.Audiobook, id=aid)

-    tags = {
-        'name': audiobook.title,
-        'url': audiobook.url,
-        'tags': audiobook.new_publish_tags(),
-        }
-    audiobook.set_mp3_tags(tags)
-    audiobook.set_ogg_tags(tags)
-    audiobook.mp3_status = audiobook.ogg_status = status.WAITING
-    audiobook.save()
-    # isn't there a race here?
-    audiobook.mp3_task = tasks.Mp3Task.delay(request.user.id, aid, publish).task_id
-    audiobook.ogg_task = tasks.OggTask.delay(request.user.id, aid, publish).task_id
-    audiobook.save()
-
+    audiobook.prepare_for_publish()
+    if publish:
+        audiobook.publish(request.user)

     return redirect(file_managed, aid)
 
 
     return redirect(file_managed, aid)