From bdd0032ed57ecffbb1b2f2244c0f79a6c8f7606f Mon Sep 17 00:00:00 2001
From: nmaillat <maillat@alchemy.fr>
Date: Fri, 29 May 2020 01:35:30 +0200
Subject: [PATCH] PHRAS-3009 #comment add audio preview in dublincore model

---
 docker-compose.override.yml              | 30 ++++++++++++--
 docker-compose.yml                       | 52 +++++++-----------------
 lib/conf.d/configuration.yml             |  2 +-
 lib/conf.d/data_templates/DublinCore.xml | 26 +++++++++++-
 4 files changed, 65 insertions(+), 45 deletions(-)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 9bd7f3dc9e..8433fb7a4e 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -18,6 +18,29 @@ services:
     - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
     - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
 
+  builder:
+    build:
+      context: .
+      target: builder
+      args:
+        - SSH_PRIVATE_KEY=${PHRASEANET_SSH_PRIVATE_KEY}
+        - PHRASEANET_PLUGINS=${PHRASEANET_PLUGINS}
+    stdin_open: true
+    tty: true
+    volumes:
+      - ../:/var/alchemy
+      - .:/var/alchemy/Phraseanet
+      - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
+      - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
+      - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
+      - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
+      - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
+      - ${PHRASEANET_CACHE_DIR}:/var/alchemy/Phraseanet/cache:rw
+      - ${SSH_AUTH_SOCK}:/ssh-auth-sock
+      - ${HOME}/.ssh:/home/app/.ssh
+      - dev_vol:/home/app
+    environment:
+      - PHRASEANET_PROJECT_NAME
 
   phraseanet:
     environment:
@@ -32,7 +55,8 @@ services:
     - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
     - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
     - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
-    - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw    
+    - ${PHRASEANET_CACHE_DIR}:/var/alchemy/Phraseanet/cache:rw
+    - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
 
   worker:
     volumes:
@@ -44,7 +68,7 @@ services:
     - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
     - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
     - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
-    
+
   rabbitmq:
     ports:
     - ${RABBITMQ_MANAGEMENT_PORT}:15672
@@ -53,7 +77,6 @@ services:
     volumes:
     - ${PHRASEANET_DB_DIR}:/var/lib/mysql:rw
 
-
   elasticsearch:
     ports:
     - 9200:9200
@@ -94,4 +117,3 @@ networks:
     ipam:
       config:
         - subnet: $PHRASEANET_SUBNET_IPS
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 758d62e95b..d8d716cb4e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,13 +64,13 @@ services:
     - PHRASEANET_SMTP_USER
     - PHRASEANET_SMTP_PASSWORD
     volumes:
-    - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
-    - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
-    - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
-    - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
-    - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
-    - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
-    - ${PHRASEANET_CACHE_DIR}:/var/alchemy/Phraseanet/cache:rw
+    - config_vol:/var/alchemy/Phraseanet/config:rw
+    - data_vol:/var/alchemy/Phraseanet/datas:rw
+    - tmp_vol:/var/alchemy/Phraseanet/tmp:rw
+    - logs_vol:/var/alchemy/Phraseanet/logs:rw
+    - thumbnails_vol:/var/alchemy/Phraseanet/www/thumbnails:rw
+    - custom_vol:/var/alchemy/Phraseanet/www/custom:rw
+    - cache_vol:/var/alchemy/Phraseanet/cache:rw
 
   worker:
     build:
@@ -94,13 +94,13 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     volumes:
-    - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
-    - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
-    - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
-    - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
-    - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
-    - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
-    - ${PHRASEANET_CACHE_DIR}:/var/alchemy/Phraseanet/cache:rw
+    - config_vol:/var/alchemy/Phraseanet/config:rw
+    - data_vol:/var/alchemy/Phraseanet/datas:rw
+    - tmp_vol:/var/alchemy/Phraseanet/tmp:rw
+    - logs_vol:/var/alchemy/Phraseanet/logs:rw
+    - thumbnails_vol:/var/alchemy/Phraseanet/www/thumbnails:rw
+    - custom_vol:/var/alchemy/Phraseanet/www/custom:rw
+    - cache_vol:/var/alchemy/Phraseanet/cache:rw
 
   db:
     image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-db:$PHRASEANET_DOCKER_TAG
@@ -130,30 +130,6 @@ services:
     volumes:
     - ${PHRASEANET_ELASTICSEARCH_DIR}:/usr/share/elasticsearch/data
 
-  builder:
-    build:
-      context: .
-      target: builder
-      args:
-        - SSH_PRIVATE_KEY=${PHRASEANET_SSH_PRIVATE_KEY}
-        - PHRASEANET_PLUGINS=${PHRASEANET_PLUGINS}
-    stdin_open: true
-    tty: true
-    volumes:
-      - ../:/var/alchemy
-      - .:/var/alchemy/Phraseanet
-      - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
-      - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
-      - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
-      - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
-      - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
-      - ${PHRASEANET_CACHE_DIR}:/var/alchemy/Phraseanet/cache:rw
-      - ${SSH_AUTH_SOCK}:/ssh-auth-sock
-      - ${HOME}/.ssh:/home/app/.ssh
-      - dev_vol:/home/app
-    environment:
-      - PHRASEANET_PROJECT_NAME
-
   mailhog:
     image: mailhog/mailhog
     ports:
diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml
index c28999a566..4013f8a44e 100644
--- a/lib/conf.d/configuration.yml
+++ b/lib/conf.d/configuration.yml
@@ -159,7 +159,7 @@ border-manager:
             type: Checker\MediaType
             enabled: false
             options:
-                mediatypes: [Audio, Document, Flash, Image, Video]
+                mediatypes: [Audio, Document, Image, Video]
 user_account:
     deleting_policies:
         email_confirmation: true
diff --git a/lib/conf.d/data_templates/DublinCore.xml b/lib/conf.d/data_templates/DublinCore.xml
index 0802d67af9..ffd40733f8 100644
--- a/lib/conf.d/data_templates/DublinCore.xml
+++ b/lib/conf.d/data_templates/DublinCore.xml
@@ -117,8 +117,30 @@
                 <fps>25</fps>
                 <GOPsize>25</GOPsize>
                 <vcodec>libvpx</vcodec>
-                <label lang="fr">Prévisualisation WebM</label>
-                <label lang="en">WebM Preview</label>
+            </subdef>
+            <subdef class="preview" name="audiovideowav" downloadable="true" orderable="true" presets="Wave Mono 8 kHz">
+                <path>{{datapathnoweb}}{{basename}}/subview</path>
+                <meta>no</meta>
+                <mediatype>audio</mediatype>
+                <audiobitrate>128</audiobitrate>
+                <audiosamplerate>8000</audiosamplerate>
+                <acodec>pcm_s16le</acodec>
+                <audiochannel>mono</audiochannel>
+                <devices>all</devices>
+                <label lang="fr">Audio WAVE 8 kHz</label>
+                <label lang="en">Audio WAVE 8 kHz</label>
+            </subdef>
+            <subdef class="preview" name="audiovideomp3" downloadable="true" orderable="true" presets="Normal MP3 128 kbit/s">
+                <path>{{datapathnoweb}}{{basename}}/subview</path>
+                <meta>no</meta>
+                <mediatype>audio</mediatype>
+                <audiobitrate>180</audiobitrate>
+                <audiosamplerate>44100</audiosamplerate>
+                <acodec>libmp3lame</acodec>
+                <audiochannel/>
+                <devices>all</devices>
+                <label lang="fr">Audio MP3 128 kbit/s</label>
+                <label lang="en">Audio MP3 128 kbit/s</label>
             </subdef>
         </subdefgroup>
         <subdefgroup name="audio">