forks
/
peertube
1
0
Fork 0
Code Releases Activity

Use -1 for max live duration unlimited

This commit is contained in:
Chocobozzz 2020-12-15 09:23:28 +01:00
parent d1742ede65
commit c9bc850e93
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
14 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
View File

@ -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>

3
client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
View File

@ -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;
}

6
client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
View File

@ -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 => {

3
client/src/sass/include/_mixins.scss
View File

@ -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) {

4
config/default.yaml
View File

@ -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

2
config/production.yaml.example
View File

@ -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

2
server/lib/live-manager.ts
View File

@ -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

4
server/middlewares/validators/config.ts
View File

@ -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'),

2
server/tests/api/check-params/config.ts
View File

@ -105,7 +105,7 @@ describe('Test config API validators', function () {
enabled: true,
allowReplay: false,
maxDuration: null,
maxDuration: 30,
maxInstanceLives: -1,
maxUserLives: 50,

4
server/tests/api/live/live-permanent.ts
View File

@ -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: {

2
server/tests/api/live/live-save-replay.ts
View File

@ -90,7 +90,7 @@ describe('Save replay setting', function () {
live: {
enabled: true,
allowReplay: true,
maxDuration: null,
maxDuration: -1,
transcoding: {
enabled: false,
resolutions: {

2
server/tests/api/live/live.ts
View File

@ -348,7 +348,7 @@ describe('Test live', function () {
live: {
enabled: true,
allowReplay: true,
maxDuration: null,
maxDuration: -1,
transcoding: {
enabled: true,
resolutions: {

2
server/tests/api/server/config.ts
View File

@ -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

2
shared/extra-utils/server/config.ts
View File

@ -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: {