2 files changed, 55 insertions, 6 deletions

diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 691d29283..c26c3a88c 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -23,7 +23,7 @@ import { CONFIG, registerConfigChangedHandler } from './config'
 
 // ---------------------------------------------------------------------------
 
-const LAST_MIGRATION_VERSION = 525
+const LAST_MIGRATION_VERSION = 530
 
 // ---------------------------------------------------------------------------
 
@@ -417,7 +417,9 @@ const MIMETYPES = {
       'audio/x-ms-wma': '.wma',
       'audio/wav': '.wav',
       'audio/x-flac': '.flac',
-      'audio/flac': '.flac'
+      'audio/flac': '.flac',
+      '‎audio/aac': '.aac',
+      'audio/ac3': '.ac3'
     },
     EXT_MIMETYPE: null as { [ id: string ]: string }
   },
@@ -841,7 +843,7 @@ function buildVideoMimetypeExt () {
         'video/x-matroska': '.mkv',
 
         // Developed by Apple
-        'video/quicktime': '.mov', // often used as output format by editing software
+        'video/quicktime': [ '.mov', '.qt', '.mqv' ], // often used as output format by editing software
         'video/x-m4v': '.m4v',
         'video/m4v': '.m4v',
 
@@ -856,8 +858,8 @@ function buildVideoMimetypeExt () {
 
         // Developed by 3GPP
         // common video formats for cell phones
-        'video/3gpp': '.3gp',
-        'video/3gpp2': '.3g2',
+        'video/3gpp': [ '.3gp', '.3gpp' ],
+        'video/3gpp2': [ '.3g2', '.3gpp2' ],
 
         // Developed by FFmpeg/Mplayer
         'application/x-nut': '.nut',
@@ -870,7 +872,8 @@ function buildVideoMimetypeExt () {
         // Old formats reliant on MPEG-1/MPEG-2
         'video/mpv': '.mpv',
         'video/mpeg2': '.m2v',
-        'video/mpeg': '.mpeg',
+        'video/mpeg': [ '.m1v', '.mpg', '.mpe', '.mpeg', '.vob' ],
+        'video/dvd': '.vob',
 
         // Could be anything
         'application/octet-stream': null,
diff --git a/server/initializers/migrations/0530-playlist-multiple-video.ts b/server/initializers/migrations/0530-playlist-multiple-video.ts
new file mode 100644
index 000000000..51a8c06b0
--- /dev/null
+++ b/server/initializers/migrations/0530-playlist-multiple-video.ts
@@ -0,0 +1,46 @@
+import * as Sequelize from 'sequelize'
+import { WEBSERVER } from '../constants'
+
+async function up (utils: {
+  transaction: Sequelize.Transaction
+  queryInterface: Sequelize.QueryInterface
+  sequelize: Sequelize.Sequelize
+}): Promise<void> {
+  {
+    const field = {
+      type: Sequelize.STRING,
+      allowNull: true
+    }
+    await utils.queryInterface.changeColumn('videoPlaylistElement', 'url', field)
+  }
+
+  {
+    await utils.sequelize.query('DROP INDEX IF EXISTS video_playlist_element_video_playlist_id_video_id;')
+  }
+
+  {
+    const selectPlaylistUUID = 'SELECT "uuid" FROM "videoPlaylist" WHERE "id" = "videoPlaylistElement"."videoPlaylistId"'
+    const url = `'${WEBSERVER.URL}' || '/video-playlists/' || (${selectPlaylistUUID}) || '/videos/' || "videoPlaylistElement"."id"`
+
+    const query = `
+      UPDATE "videoPlaylistElement" SET "url" = ${url} WHERE id IN (
+        SELECT "videoPlaylistElement"."id" FROM "videoPlaylistElement"
+        INNER JOIN "videoPlaylist" ON "videoPlaylist".id = "videoPlaylistElement"."videoPlaylistId"
+        INNER JOIN account ON account.id = "videoPlaylist"."ownerAccountId"
+        INNER JOIN actor ON actor.id = account."actorId"
+        WHERE actor."serverId" IS NULL
+      )`
+
+    await utils.sequelize.query(query)
+  }
+
+}
+
+function down (options) {
+  throw new Error('Not implemented.')
+}
+
+export {
+  up,
+  down
+}