Level up all audio content volume dynamically bunjlabs#18

client/src/feud/View.jsx

@@ -8,11 +8,11 @@ import {useHistory} from "react-router-dom";
 import {generateClientUrl} from "../common/View";
 
 const Music = {
-    intro: HowlWrapper('/sounds/feud/intro.mp3', false, 0.5),
-    round: HowlWrapper('/sounds/feud/round.mp3', false, 0.5),
-    beat: HowlWrapper('/sounds/feud/beat.mp3', false, 0.5),
-    timer: HowlWrapper('/sounds/feud/timer.mp3', false, 0.5),
-    end: HowlWrapper('/sounds/feud/end.mp3', false, 0.5),
+    intro: HowlWrapper('/sounds/feud/intro.mp3'),
+    round: HowlWrapper('/sounds/feud/round.mp3'),
+    beat: HowlWrapper('/sounds/feud/beat.mp3'),
+    timer: HowlWrapper('/sounds/feud/timer.mp3'),
+    end: HowlWrapper('/sounds/feud/end.mp3'),
 }
 
 const Sounds = {

client/src/weakest/View.jsx

@@ -8,15 +8,15 @@ import {generateClientUrl} from "../common/View";
 
 const Music = {
     intro: HowlWrapper('/sounds/weakest/intro.mp3'),
-    background: HowlWrapper('/sounds/weakest/background.ogg', true, 0.5),
-    questions: HowlWrapper('/sounds/weakest/questions.ogg', true, 0.5),
+    background: HowlWrapper('/sounds/weakest/background.mp3'),
+    questions: HowlWrapper('/sounds/weakest/questions.mp3'),
 }
 
 const Sounds = {
-    gong: HowlWrapper('/sounds/weakest/gong.ogg'),
-    question_start: HowlWrapper('/sounds/weakest/question_start.ogg'),
-    question_end: HowlWrapper('/sounds/weakest/question_end.ogg'),
-    weakest_reveal: HowlWrapper('/sounds/weakest/weakest_reveal.mp3', false, 0.5),
+    gong: HowlWrapper('/sounds/weakest/gong.mp3'),
+    question_start: HowlWrapper('/sounds/weakest/question_start.mp3'),
+    question_end: HowlWrapper('/sounds/weakest/question_end.mp3'),
+    weakest_reveal: HowlWrapper('/sounds/weakest/weakest_reveal.mp3'),
 }
 
 const loadSounds = () => {

client/src/whirligig/View.jsx

@@ -29,10 +29,10 @@ const Music = {
 }
 
 const Sounds = {
-    sig1: HowlWrapper('/sounds/whirligig/sig1.ogg'),
-    sig2: HowlWrapper('/sounds/whirligig/sig2.ogg'),
-    sig3: HowlWrapper('/sounds/whirligig/sig3.ogg'),
-    gong: HowlWrapper('/sounds/whirligig/gong.ogg'),
+    sig1: HowlWrapper('/sounds/whirligig/sig1.mp3'),
+    sig2: HowlWrapper('/sounds/whirligig/sig2.mp3'),
+    sig3: HowlWrapper('/sounds/whirligig/sig3.mp3'),
+    gong: HowlWrapper('/sounds/whirligig/gong.mp3'),
 }
 
 const loadSounds = () => {

client/webpack.common.js

@@ -52,7 +52,7 @@ module.exports = {
   },
   plugins:[
     new webpack.DefinePlugin({
-      MEDIA_ENDPOINT: JSON.stringify(process.env.REACT_APP_API_ENDPOINT || "/media/"),
+      MEDIA_ENDPOINT: JSON.stringify(process.env.REACT_APP_MEDIA_ENDPOINT || "/media/"),
       API_ENDPOINT: JSON.stringify(process.env.REACT_APP_API_ENDPOINT || "/api/"),
       WS_ENDPOINT: JSON.stringify(process.env.REACT_APP_WS_ENDPOINT || "/ws/"),
     }),

server/Dockerfile

@@ -1,7 +1,8 @@
 FROM python:3.10-slim
 
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends libpq-dev cron build-essential libffi-dev
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends libpq-dev build-essential libffi-dev && \
+    apt-get install -y ffmpeg libavcodec-extra
 
 WORKDIR /app
 
@@ -13,10 +14,6 @@ RUN apt-get autoremove -y
 RUN apt-get clean
 RUN apt-get autoclean
 
-COPY cron.conf /etc/cron.d/cron.conf
-RUN chmod 0644 /etc/cron.d/cron.conf
-RUN crontab /etc/cron.d/cron.conf
-
 COPY . /app
 
 CMD ["daphne", "-b", "0.0.0.0", "-p", "80", "server.asgi:application"]

server/common/management/commands/level_up_volume.py

@@ -0,0 +1,37 @@
+import os
+import traceback
+
+from django.core.management.base import BaseCommand
+from pathlib import Path
+
+from pydub import AudioSegment
+
+
+class Command(BaseCommand):
+
+    def add_arguments(self, parser):
+        parser.add_argument('input', type=str)
+        parser.add_argument('output', type=str)
+
+    def handle(self, *args, **kwargs):
+        input = kwargs['input']
+        input_list = Path(input).rglob("*.*")
+        output = kwargs['output']
+
+        for path in filter(lambda p: str(p).endswith((".mp3", ".wav", ".flac", ".ogg", ".opus")), input_list):
+            path_str = str(path)
+            try:
+                audio = AudioSegment.from_file(path_str)
+                audio = audio.remove_dc_offset()
+
+                gain = audio.dBFS - (-14)
+                audio = audio.apply_gain(-gain)
+
+                rel = os.path.relpath(path_str, input)
+                filename = os.path.join(output, rel)
+                os.makedirs(os.path.dirname(filename), exist_ok=True)
+                audio.export(filename, format="mp3")
+
+                path.unlink()
+            except Exception:
+                traceback.print_exc()

server/common/utils.py

@@ -1,8 +1,13 @@
+import hashlib
 import os
 import shutil
 import string
+import traceback
+import typing
 import zipfile
+from pathlib import Path
 from urllib.parse import unquote
+from pydub import AudioSegment
 
 from rest_framework.exceptions import APIException
 from django.conf import settings
@@ -42,3 +47,35 @@ def unzip(filename, extract_dir):
 
 def generate_token(id):
     return hashids.encode(id)
+
+
+def game_assets_post_process(parent: str) -> typing.Dict[str, str]:
+    if not settings.GAME_ASSETS_POST_PROCESS:
+        return {}
+
+    path_list = Path(parent).rglob('*.*')
+    transform_dict = {}
+
+    for path in filter(lambda p: str(p).endswith((".mp3", ".wav", ".flac", ".ogg", ".opus")), path_list):
+        path_str = str(path)
+        m = hashlib.sha256()
+        m.update(path_str.encode())
+        target_filename = m.hexdigest() + ".mp3"
+        target_path = os.path.join(parent, target_filename)
+
+        try:
+            audio = AudioSegment.from_file(path_str)
+
+            gain = audio.dBFS - (-14)
+            audio = audio.remove_dc_offset()
+            audio = audio.apply_gain(-gain)
+            audio = audio.compress_dynamic_range()
+            audio.export(target_path, format="mp3")
+
+            path.unlink()
+        except Exception:
+            traceback.print_exc()
+        finally:
+            transform_dict[os.path.relpath(path_str, parent)] = target_filename
+
+    return transform_dict

server/jeopardy/api.py

@@ -12,7 +12,7 @@
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from common.utils import unzip, BadStateException, BadFormatException
+from common.utils import unzip, BadStateException, BadFormatException, game_assets_post_process
 from jeopardy.models import Game, Player
 from jeopardy.serializers import GameSerializer
 
@@ -31,12 +31,14 @@ def post(self, request):
         path = default_storage.save(os.path.join('jeopardy', game.token, 'game'), ContentFile(data.read()))
         file = os.path.join(settings.MEDIA_ROOT, path)
         try:
-            unzip(file, os.path.join(settings.MEDIA_ROOT_JEOPARDY, game.token))
+            game_path = os.path.join(settings.MEDIA_ROOT_JEOPARDY, game.token)
+            unzip(file, game_path)
+            transform_dict = game_assets_post_process(game_path)
         finally:
             os.remove(file)
 
         try:
-            game.parse(os.path.join(settings.MEDIA_ROOT_JEOPARDY, game.token, 'content.xml'))
+            game.parse(os.path.join(settings.MEDIA_ROOT_JEOPARDY, game.token, 'content.xml'), transform_dict)
             os.remove(os.path.join(settings.MEDIA_ROOT_JEOPARDY, game.token, 'content.xml'))
         except Exception as e:
             shutil.rmtree(os.path.join(settings.MEDIA_ROOT_JEOPARDY, game.token), ignore_errors=True)

server/jeopardy/models.py

@@ -113,7 +113,10 @@ def new():
         return game
 
     @transaction.atomic(savepoint=False)
-    def parse(self, filename):
+    def parse(self, filename, transform_dict=None):
+        if transform_dict is None:
+            transform_dict = {}
+
         tree = ElementTree.parse(filename)
         root = tree.getroot()
 
@@ -128,7 +131,10 @@ def format_image_url(url: str):
 
         def format_audio_url(url: str):
             if url and url.startswith('@'):
-                return '/Audio' + url.replace('@', '/', 1)
+                old_url = 'Audio' + url.replace('@', '/', 1)
+                if old_url in transform_dict:
+                    return '/' + transform_dict[old_url]
+                return '/' + old_url
             return url
 
         def format_video_url(url: str):

server/requirements.txt

@@ -7,6 +7,6 @@ daphne==3.0.2
 psycopg2-binary==2.9.1
 celery==5.1.2
 redis==3.5.3
-
+pydub==0.25.1
 requests==2.26.0
 hashids==1.3.1

server/server/settings.py

@@ -138,3 +138,4 @@
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 
 JEOPARDY_IS_POST_EVENT_REQUIRED = False
+GAME_ASSETS_POST_PROCESS = os.environ.get('GAME_ASSETS_POST_PROCESS', 'true').lower() == 'true',

server/whirligig/api.py

@@ -9,7 +9,7 @@
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from common.utils import unzip, BadFormatException, BadStateException
+from common.utils import unzip, BadFormatException, BadStateException, game_assets_post_process
 from whirligig.models import Game
 from whirligig.serializers import GameSerializer
 
@@ -28,12 +28,14 @@ def post(self, request):
         path = default_storage.save(os.path.join('whirligig', game.token, 'game'), ContentFile(data.read()))
         file = os.path.join(settings.MEDIA_ROOT, path)
         try:
-            unzip(file, os.path.join(settings.MEDIA_ROOT_WHIRLIGIG, game.token))
+            game_path = os.path.join(settings.MEDIA_ROOT_WHIRLIGIG, game.token)
+            unzip(file, game_path)
+            transform_dict = game_assets_post_process(game_path)
         finally:
             os.remove(file)
 
         try:
-            game.parse(os.path.join(settings.MEDIA_ROOT_WHIRLIGIG, game.token, 'content.xml'))
+            game.parse(os.path.join(settings.MEDIA_ROOT_WHIRLIGIG, game.token, 'content.xml'), transform_dict)
             os.remove(os.path.join(settings.MEDIA_ROOT_WHIRLIGIG, game.token, 'content.xml'))
         except Exception as e:
             shutil.rmtree(os.path.join(settings.MEDIA_ROOT_WHIRLIGIG, game.token), ignore_errors=True)

server/whirligig/models.py

@@ -137,12 +137,18 @@ def extra_time(self):
         self.save()
 
     @transaction.atomic(savepoint=False)
-    def parse(self, filename):
+    def parse(self, filename, transform_dict=None):
+        if transform_dict is None:
+            transform_dict = {}
+
         tree = ElementTree.parse(filename)
 
         game_xml = tree.getroot()
         items_xml = game_xml.find('items')
 
+        def format_audio_url(url: str):
+            return '/' + transform_dict[url[1:]] if url and url.startswith('/') and url[1:] in transform_dict else url
+
         for item_number, item_xml in enumerate(items_xml.findall('item')):
             if item_number >= 13:
                 raise BadFormatException('Too many items')
@@ -163,13 +169,13 @@ def parse(self, filename):
                     description=question_xml.find('description').text,
                     text=question_xml.find('text').text,
                     image=question_xml.find('image').text,
-                    audio=question_xml.find('audio').text,
+                    audio=format_audio_url(question_xml.find('audio').text),
                     video=question_xml.find('video').text,
 
                     answer_description=answer_xml.find('description').text,
                     answer_text=answer_xml.find('text').text,
                     answer_image=answer_xml.find('image').text,
-                    answer_audio=answer_xml.find('audio').text,
+                    answer_audio=format_audio_url(answer_xml.find('audio').text),
                     answer_video=answer_xml.find('video').text,
                 )