3 files changed, 47 insertions, 7 deletions

diff --git a/shared/server-commands/server/config-command.ts b/shared/server-commands/server/config-command.ts
index 797231b1d..c0042060b 100644
--- a/shared/server-commands/server/config-command.ts
+++ b/shared/server-commands/server/config-command.ts
@@ -59,6 +59,9 @@ export class ConfigCommand extends AbstractCommand {
       newConfig: {
         transcoding: {
           enabled: false
+        },
+        videoEditor: {
+          enabled: false
         }
       }
     })
@@ -69,6 +72,10 @@ export class ConfigCommand extends AbstractCommand {
       newConfig: {
         transcoding: {
           enabled: true,
+
+          allowAudioFiles: true,
+          allowAdditionalExtensions: true,
+
           resolutions: ConfigCommand.getCustomConfigResolutions(true),
 
           webtorrent: {
@@ -82,6 +89,28 @@ export class ConfigCommand extends AbstractCommand {
     })
   }
 
+  enableMinimumTranscoding (webtorrent = true, hls = true) {
+    return this.updateExistingSubConfig({
+      newConfig: {
+        transcoding: {
+          enabled: true,
+          resolutions: {
+            ...ConfigCommand.getCustomConfigResolutions(false),
+
+            '240p': true
+          },
+
+          webtorrent: {
+            enabled: webtorrent
+          },
+          hls: {
+            enabled: hls
+          }
+        }
+      }
+    })
+  }
+
   getConfig (options: OverrideCommandOptions = {}) {
     const path = '/api/v1/config'
 
@@ -148,7 +177,7 @@ export class ConfigCommand extends AbstractCommand {
   async updateExistingSubConfig (options: OverrideCommandOptions & {
     newConfig: DeepPartial<CustomConfig>
   }) {
-    const existing = await this.getCustomConfig(options)
+    const existing = await this.getCustomConfig({ ...options, expectedStatus: HttpStatusCode.OK_200 })
 
     return this.updateCustomConfig({ ...options, newCustomConfig: merge({}, existing, options.newConfig) })
   }
@@ -282,6 +311,9 @@ export class ConfigCommand extends AbstractCommand {
           }
         }
       },
+      videoEditor: {
+        enabled: false
+      },
       import: {
         videos: {
           concurrency: 3,
diff --git a/shared/server-commands/server/server.ts b/shared/server-commands/server/server.ts
index da89fd876..af4423e8d 100644
--- a/shared/server-commands/server/server.ts
+++ b/shared/server-commands/server/server.ts
@@ -25,6 +25,7 @@ import {
   PlaylistsCommand,
   ServicesCommand,
   StreamingPlaylistsCommand,
+  VideoEditorCommand,
   VideosCommand
 } from '../videos'
 import { CommentsCommand } from '../videos/comments-command'
@@ -124,6 +125,7 @@ export class PeerTubeServer {
   login?: LoginCommand
   users?: UsersCommand
   objectStorage?: ObjectStorageCommand
+  videoEditor?: VideoEditorCommand
   videos?: VideosCommand
 
   constructor (options: { serverNumber: number } | { url: string }) {
@@ -394,5 +396,6 @@ export class PeerTubeServer {
     this.users = new UsersCommand(this)
     this.videos = new VideosCommand(this)
     this.objectStorage = new ObjectStorageCommand(this)
+    this.videoEditor = new VideoEditorCommand(this)
   }
 }
diff --git a/shared/server-commands/server/servers-command.ts b/shared/server-commands/server/servers-command.ts
index c5d8d18dc..19645cb93 100644
--- a/shared/server-commands/server/servers-command.ts
+++ b/shared/server-commands/server/servers-command.ts
@@ -30,10 +30,12 @@ export class ServersCommand extends AbstractCommand {
     })
   }
 
-  async cleanupTests () {
-    const p: Promise<any>[] = []
+  cleanupTests () {
+    const promises: Promise<any>[] = []
+
+    const saveGithubLogsIfNeeded = async () => {
+      if (!isGithubCI()) return
 
-    if (isGithubCI()) {
       await ensureDir('artifacts')
 
       const origin = this.buildDirectory('logs/peertube.log')
@@ -44,14 +46,17 @@ export class ServersCommand extends AbstractCommand {
     }
 
     if (this.server.parallel) {
-      p.push(ServersCommand.flushTests(this.server.internalServerNumber))
+      const promise = saveGithubLogsIfNeeded()
+                        .then(() => ServersCommand.flushTests(this.server.internalServerNumber))
+
+      promises.push(promise)
     }
 
     if (this.server.customConfigFile) {
-      p.push(remove(this.server.customConfigFile))
+      promises.push(remove(this.server.customConfigFile))
     }
 
-    return p
+    return promises
   }
 
   async waitUntilLog (str: string, count = 1, strictCount = true) {