Use -1 for max live duration unlimited

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 bba7365f67b179c12d43d4ab479939958d6cd13a..af8a4e18dd73cd1c36518cf60af5ecdab9f24362 100644 (file)
--- 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
@@ -697,7 +697,7 @@
     </ng-container>
 
     <ng-container ngbNavItem="transcoding">
-      <a ngbNavLink i18n>Transcoding</a>
+      <a ngbNavLink i18n>VOD Transcoding</a>
 
       <ng-template ngbNavContent>
 
@@ -924,14 +924,11 @@
 
                     <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() }">
                       <label i18n for="liveMaxDuration">Max live duration</label>
-                      <div>
-                        <ng-select
-                          labelForId="liveMaxDuration" [items]="liveMaxDurationOptions" formControlName="maxDuration"
-                          bindLabel="label" bindValue="value"
-                          [clearable]="false"
-                          [searchable]="false"
-                        ></ng-select>
-                      </div>
+
+                      <ng-select
+                        labelForId="liveMaxDuration" [items]="liveMaxDurationOptions" formControlName="maxDuration"
+                        bindLabel="label" bindValue="value" [clearable]="false" [searchable]="false"
+                      ></ng-select>
                     </div>
 
                   </ng-container>

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
index 3d570f571c281108adb8b10e77b231d5414f3d83..4c64bd2e0a29df8ea88e40478da6be7747a909e8 100644 (file)
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
@@ -18,7 +18,8 @@ input[type=text] {
 }
 
 input[type=number] {
-  @include peertube-input-text(315px);
+  @include peertube-input-text($form-base-input-width);
+
   display: block;
 }
 

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 7920600fc1b4e70119e9d2dcbaae204fad9faa69..c3a833843b83933d45dea101161e84673379d27f 100644 (file)
--- 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
@@ -98,7 +98,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
     ]
 
     this.liveMaxDurationOptions = [
-      { value: null, label: $localize`No limit` },
+      { value: -1, label: $localize`No limit` },
       { value: 1000 * 3600, label: $localize`1 hour` },
       { value: 1000 * 3600 * 3, label: $localize`3 hours` },
       { value: 1000 * 3600 * 5, label: $localize`5 hours` },
@@ -359,10 +359,6 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
   async formValidated () {
     const value: CustomConfig = this.form.getRawValue()
 
-    // Transform "null" to null
-    const maxDuration = value.live.maxDuration as any
-    if (maxDuration === 'null') value.live.maxDuration = null
-
     this.configService.updateCustomConfig(value)
       .subscribe(
         res => {

diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index fecae9fbca55fdec6a06c0a2abf1adcedb71f882..19b4e204f5f4a67874f82edaa9828afb70a09e86 100644 (file)
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -307,7 +307,8 @@
 
 
 @mixin ng-select ($width) {
-  ::ng-deep ng-select {
+  ::ng-deep &.ng-select,
+  ::ng-deep .ng-select {
     width: $width;
 
     @media screen and (max-width: $width) {

diff --git a/config/default.yaml b/config/default.yaml
index 88821fe3c925e43d23f51cf49b44930b3851bd1a..9d428f764fde075c2eedbd7c2b0a0bac06c7e8c8 100644 (file)
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -247,8 +247,8 @@ live:
   enabled: false
 
   # Limit lives duration
-  # Set null to disable duration limit
-  max_duration: null # For example: '5 hours'
+  # -1 == unlimited
+  max_duration: -1 # For example: '5 hours'
 
   # Limit max number of live videos created on your instance
   # -1 == unlimited

diff --git a/config/production.yaml.example b/config/production.yaml.example
index b71a494f9b39089dae92967b025c8ec5bde7c5f0..bcf727d82541ee03489d4ba282956b6a8dea345a 100644 (file)
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -262,7 +262,7 @@ live:
 
   # Limit lives duration
   # Set null to disable duration limit
-  max_duration: null # For example: '5 hours'
+  max_duration: -1 # For example: '5 hours'
 
   # Limit max number of live videos created on your instance
   # -1 == unlimited

diff --git a/server/lib/live-manager.ts b/server/lib/live-manager.ts
index 2fb4b774c1234868ebdb5fb51d47316e9781cb84..379f61bdf332de10b9491f2346b4631cb011bdf3 100644 (file)
--- a/server/lib/live-manager.ts
+++ b/server/lib/live-manager.ts
@@ -505,7 +505,7 @@ class LiveManager {
   private isDurationConstraintValid (streamingStartTime: number) {
     const maxDuration = CONFIG.LIVE.MAX_DURATION
     // No limit
-    if (maxDuration === null) return true
+    if (maxDuration < 0) return true
 
     const now = new Date().getTime()
     const max = streamingStartTime + maxDuration

diff --git a/server/middlewares/validators/config.ts b/server/middlewares/validators/config.ts
index 93de453a722caeee6fd2274de994fbb9381309ec..9c1cfa7e733288faaa925c00b4a2fd5a2d22e110 100644 (file)
--- a/server/middlewares/validators/config.ts
+++ b/server/middlewares/validators/config.ts
@@ -2,13 +2,13 @@ import * as express from 'express'
 import { body } from 'express-validator'
 import { isIntOrNull } from '@server/helpers/custom-validators/misc'
 import { isEmailEnabled } from '@server/initializers/config'
+import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 import { CustomConfig } from '../../../shared/models/server/custom-config.model'
 import { isThemeNameValid } from '../../helpers/custom-validators/plugins'
 import { isUserNSFWPolicyValid, isUserVideoQuotaDailyValid, isUserVideoQuotaValid } from '../../helpers/custom-validators/users'
 import { logger } from '../../helpers/logger'
 import { isThemeRegistered } from '../../lib/plugins/theme-utils'
 import { areValidationErrors } from './utils'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 
 const customConfigUpdateValidator = [
   body('instance.name').exists().withMessage('Should have a valid instance name'),
@@ -65,7 +65,7 @@ const customConfigUpdateValidator = [
 
   body('live.enabled').isBoolean().withMessage('Should have a valid live enabled boolean'),
   body('live.allowReplay').isBoolean().withMessage('Should have a valid live allow replay boolean'),
-  body('live.maxDuration').custom(isIntOrNull).withMessage('Should have a valid live max duration'),
+  body('live.maxDuration').isInt().withMessage('Should have a valid live max duration'),
   body('live.maxInstanceLives').custom(isIntOrNull).withMessage('Should have a valid max instance lives'),
   body('live.maxUserLives').custom(isIntOrNull).withMessage('Should have a valid max user lives'),
   body('live.transcoding.enabled').isBoolean().withMessage('Should have a valid live transcoding enabled boolean'),

diff --git a/server/tests/api/check-params/config.ts b/server/tests/api/check-params/config.ts
index 08576c3ae664c167a71513cf24782548181863c0..fab440fc529e28c2238f62700628f69ceb32adf5 100644 (file)
--- a/server/tests/api/check-params/config.ts
+++ b/server/tests/api/check-params/config.ts
@@ -105,7 +105,7 @@ describe('Test config API validators', function () {
       enabled: true,
 
       allowReplay: false,
-      maxDuration: null,
+      maxDuration: 30,
       maxInstanceLives: -1,
       maxUserLives: 50,
 

diff --git a/server/tests/api/live/live-permanent.ts b/server/tests/api/live/live-permanent.ts
index 9e6c6cf70fe0ff9baa49c1f17dc68001eca1cb71..1128e993cae2f1574e271a39873b77c09b0e0e74 100644 (file)
--- a/server/tests/api/live/live-permanent.ts
+++ b/server/tests/api/live/live-permanent.ts
@@ -66,7 +66,7 @@ describe('Permenant live', function () {
       live: {
         enabled: true,
         allowReplay: true,
-        maxDuration: null,
+        maxDuration: -1,
         transcoding: {
           enabled: true,
           resolutions: {
@@ -155,7 +155,7 @@ describe('Permenant live', function () {
       live: {
         enabled: true,
         allowReplay: true,
-        maxDuration: null,
+        maxDuration: -1,
         transcoding: {
           enabled: true,
           resolutions: {

diff --git a/server/tests/api/live/live-save-replay.ts b/server/tests/api/live/live-save-replay.ts
index 6cd8cc23f27b25b46ed133eff516dc2aed776a91..35fe4e7bdf51b54c804e611dbda1a1afb9f4df5d 100644 (file)
--- a/server/tests/api/live/live-save-replay.ts
+++ b/server/tests/api/live/live-save-replay.ts
@@ -90,7 +90,7 @@ describe('Save replay setting', function () {
       live: {
         enabled: true,
         allowReplay: true,
-        maxDuration: null,
+        maxDuration: -1,
         transcoding: {
           enabled: false,
           resolutions: {

diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts
index 91879208178b9914d01a4bab5b4796ed29bf58e2..939285ae85e5b0c7a2e45b95652ff0b17f92f613 100644 (file)
--- a/server/tests/api/live/live.ts
+++ b/server/tests/api/live/live.ts
@@ -348,7 +348,7 @@ describe('Test live', function () {
         live: {
           enabled: true,
           allowReplay: true,
-          maxDuration: null,
+          maxDuration: -1,
           transcoding: {
             enabled: true,
             resolutions: {

diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts
index a505b8eded6dff00a963d153f5962b4f47c81690..bfaad36884a537155590409bbdd7a29333a990f2 100644 (file)
--- a/server/tests/api/server/config.ts
+++ b/server/tests/api/server/config.ts
@@ -81,7 +81,7 @@ function checkInitialConfig (server: ServerInfo, data: CustomConfig) {
 
   expect(data.live.enabled).to.be.false
   expect(data.live.allowReplay).to.be.false
-  expect(data.live.maxDuration).to.be.null
+  expect(data.live.maxDuration).to.equal(-1)
   expect(data.live.maxInstanceLives).to.equal(20)
   expect(data.live.maxUserLives).to.equal(3)
   expect(data.live.transcoding.enabled).to.be.false

diff --git a/shared/extra-utils/server/config.ts b/shared/extra-utils/server/config.ts
index 3b6afe9ffcf8b49cc5cedd93d7d569f603fcf3fd..8702659c493d195b61109683e223dfeddf4e1162 100644 (file)
--- a/shared/extra-utils/server/config.ts
+++ b/shared/extra-utils/server/config.ts
@@ -129,7 +129,7 @@ function updateCustomSubConfig (url: string, token: string, newConfig: DeepParti
     live: {
       enabled: true,
       allowReplay: false,
-      maxDuration: null,
+      maxDuration: -1,
       maxInstanceLives: -1,
       maxUserLives: 50,
       transcoding: {