Allow to specify transcoding and import jobs concurrency

3 files changed, 46 insertions, 0 deletions

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index 48678a194..5f0a5ff6c 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -436,8 +436,25 @@
           <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
             <ng-container formGroupName="import">
+
               <ng-container formGroupName="videos">
 
+                <div class="form-group mt-4">
+                  <label i18n for="importConcurrency">Import jobs concurrency</label>
+                  <span class="text-muted ml-1">
+                    <span i18n>allows to import multiple videos in parallel. ⚠️ Requires a PeerTube restart.</span>
+                  </span>
+
+                  <div class="peertube-select-container">
+                    <select id="importConcurrency" formControlName="concurrency" class="form-control">
+                      <option *ngFor="let option of concurrencyOptions" [value]="option">
+                        {{ option }}
+                      </option>
+                    </select>
+                  </div>
+                  <div *ngIf="formErrors.import.concurrency" class="form-error">{{ formErrors.import.concurrency }}</div>
+                </div>
+
                 <div class="form-group" formGroupName="http">
                   <my-peertube-checkbox
                     inputName="importVideosHttpEnabled" formControlName="enabled"
@@ -886,6 +903,22 @@
               </div>
 
               <div class="form-group mt-4" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                <label i18n for="transcodingConcurrency">Transcoding jobs concurrency</label>
+                <span class="text-muted ml-1">
+                  <span i18n>allows to transcode multiple files in parallel. ⚠️ Requires a PeerTube restart.</span>
+                </span>
+
+                <div class="peertube-select-container">
+                  <select id="transcodingConcurrency" formControlName="concurrency" class="form-control">
+                    <option *ngFor="let option of concurrencyOptions" [value]="option">
+                      {{ option }}
+                    </option>
+                  </select>
+                </div>
+                <div *ngIf="formErrors.transcoding.concurrency" class="form-error">{{ formErrors.transcoding.concurrency }}</div>
+              </div>
+
+              <div class="form-group mt-4" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
                 <label i18n for="transcodingProfile">Transcoding profile</label>
                 <span class="text-muted ml-1" i18n>new transcoding profiles can be added by PeerTube plugins</span>
 
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index ae6a9e844..48fb86968 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -9,6 +9,7 @@ import {
   ADMIN_EMAIL_VALIDATOR,
   CACHE_CAPTIONS_SIZE_VALIDATOR,
   CACHE_PREVIEWS_SIZE_VALIDATOR,
+  CONCURRENCY_VALIDATOR,
   INDEX_URL_VALIDATOR,
   INSTANCE_NAME_VALIDATOR,
   INSTANCE_SHORT_DESCRIPTION_VALIDATOR,
@@ -36,6 +37,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
 
   resolutions: { id: string, label: string, description?: string }[] = []
   liveResolutions: { id: string, label: string, description?: string }[] = []
+  concurrencyOptions: number[] = []
   transcodingThreadOptions: { label: string, value: number }[] = []
   liveMaxDurationOptions: { label: string, value: number }[] = []
 
@@ -103,6 +105,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
       { value: 4, label: '4' },
       { value: 8, label: '8' }
     ]
+    this.concurrencyOptions = [ 1, 2, 3, 4, 5, 6 ]
 
     this.vodTranscodingProfileOptions = [ 'default' ]
     this.liveTranscodingProfileOptions = [ 'default' ]
@@ -230,6 +233,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
       },
       import: {
         videos: {
+          concurrency: CONCURRENCY_VALIDATOR,
           http: {
             enabled: null
           },
@@ -262,6 +266,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
         allowAdditionalExtensions: null,
         allowAudioFiles: null,
         profile: null,
+        concurrency: CONCURRENCY_VALIDATOR,
         resolutions: {},
         hls: {
           enabled: null
diff --git a/client/src/app/shared/form-validators/custom-config-validators.ts b/client/src/app/shared/form-validators/custom-config-validators.ts
index 41b3cbba9..23f2156c2 100644
--- a/client/src/app/shared/form-validators/custom-config-validators.ts
+++ b/client/src/app/shared/form-validators/custom-config-validators.ts
@@ -65,6 +65,14 @@ export const TRANSCODING_THREADS_VALIDATOR: BuildFormValidator = {
   }
 }
 
+export const CONCURRENCY_VALIDATOR: BuildFormValidator = {
+  VALIDATORS: [Validators.required, Validators.min(1)],
+  MESSAGES: {
+    'required': $localize`Concurrency is required.`,
+    'min': $localize`Concurrency should be greater or equal to 1.`
+  }
+}
+
 export const INDEX_URL_VALIDATOR: BuildFormValidator = {
   VALIDATORS: [Validators.pattern(/^https:\/\//)],
   MESSAGES: {