X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fconfig%2Fedit-custom-config%2Fedit-custom-config.component.ts;h=330ab075a91bc1c59d35de5e339f0687e7a02ab9;hb=b7085c713220c9c5a96c9bb77330c2ba6ae9274e;hp=9ab8b08d0fdc2f5ab9787da17129e235630ecd8a;hpb=2e3a0215d051dca1f7c8ef423564c8d37a255f77;p=github%2FChocobozzz%2FPeerTube.git 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 9ab8b08d0..330ab075a 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 @@ -1,244 +1,487 @@ -import { Component, OnInit } from '@angular/core' -import { FormBuilder, FormGroup } from '@angular/forms' -import { Router } from '@angular/router' +import { forkJoin } from 'rxjs' +import { ViewportScroller } from '@angular/common' +import { AfterViewChecked, Component, OnInit, ViewChild } from '@angular/core' import { ConfigService } from '@app/+admin/config/shared/config.service' -import { ConfirmService } from '@app/core' +import { Notifier } from '@app/core' import { ServerService } from '@app/core/server/server.service' -import { FormReactive, USER_VIDEO_QUOTA } from '@app/shared' import { - ADMIN_EMAIL, - CACHE_PREVIEWS_SIZE, - INSTANCE_NAME, INSTANCE_SHORT_DESCRIPTION, - SIGNUP_LIMIT, - TRANSCODING_THREADS -} from '@app/shared/forms/form-validators/custom-config' -import { NotificationsService } from 'angular2-notifications' -import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model' + ADMIN_EMAIL_VALIDATOR, + CACHE_CAPTIONS_SIZE_VALIDATOR, + CACHE_PREVIEWS_SIZE_VALIDATOR, + INDEX_URL_VALIDATOR, + INSTANCE_NAME_VALIDATOR, + INSTANCE_SHORT_DESCRIPTION_VALIDATOR, + SEARCH_INDEX_URL_VALIDATOR, + SERVICES_TWITTER_USERNAME_VALIDATOR, + SIGNUP_LIMIT_VALIDATOR, + TRANSCODING_THREADS_VALIDATOR +} from '@app/shared/form-validators/custom-config-validators' +import { USER_VIDEO_QUOTA_DAILY_VALIDATOR, USER_VIDEO_QUOTA_VALIDATOR } from '@app/shared/form-validators/user-validators' +import { FormReactive, FormValidatorService, SelectOptionsItem } from '@app/shared/shared-forms' +import { NgbNav } from '@ng-bootstrap/ng-bootstrap' +import { CustomConfig, ServerConfig } from '@shared/models' +import { pairwise } from 'rxjs/operators' @Component({ selector: 'my-edit-custom-config', templateUrl: './edit-custom-config.component.html', styleUrls: [ './edit-custom-config.component.scss' ] }) -export class EditCustomConfigComponent extends FormReactive implements OnInit { +export class EditCustomConfigComponent extends FormReactive implements OnInit, AfterViewChecked { + // FIXME: use built-in router + @ViewChild('nav') nav: NgbNav + + initDone = false customConfig: CustomConfig - resolutions = [ '240p', '360p', '480p', '720p', '1080p' ] - - videoQuotaOptions = [ - { value: -1, label: 'Unlimited' }, - { value: 0, label: '0' }, - { value: 100 * 1024 * 1024, label: '100MB' }, - { value: 500 * 1024 * 1024, label: '500MB' }, - { value: 1024 * 1024 * 1024, label: '1GB' }, - { value: 5 * 1024 * 1024 * 1024, label: '5GB' }, - { value: 20 * 1024 * 1024 * 1024, label: '20GB' }, - { value: 50 * 1024 * 1024 * 1024, label: '50GB' } - ] - transcodingThreadOptions = [ - { value: 1, label: '1' }, - { value: 2, label: '2' }, - { value: 4, label: '4' }, - { value: 8, label: '8' } - ] - - form: FormGroup - formErrors = { - instanceName: '', - instanceShortDescription: '', - instanceDescription: '', - instanceTerms: '', - instanceDefaultClientRoute: '', - cachePreviewsSize: '', - signupLimit: '', - adminEmail: '', - userVideoQuota: '', - transcodingThreads: '', - customizationJavascript: '', - customizationCSS: '' - } - validationMessages = { - instanceShortDescription: INSTANCE_SHORT_DESCRIPTION.MESSAGES, - instanceName: INSTANCE_NAME.MESSAGES, - cachePreviewsSize: CACHE_PREVIEWS_SIZE.MESSAGES, - signupLimit: SIGNUP_LIMIT.MESSAGES, - adminEmail: ADMIN_EMAIL.MESSAGES, - userVideoQuota: USER_VIDEO_QUOTA.MESSAGES - } - - private oldCustomJavascript: string - private oldCustomCSS: string + + resolutions: { id: string, label: string, description?: string }[] = [] + liveResolutions: { id: string, label: string, description?: string }[] = [] + transcodingThreadOptions: { label: string, value: number }[] = [] + liveMaxDurationOptions: { label: string, value: number }[] = [] + + languageItems: SelectOptionsItem[] = [] + categoryItems: SelectOptionsItem[] = [] + + signupAlertMessage: string + + private serverConfig: ServerConfig constructor ( - private formBuilder: FormBuilder, - private router: Router, - private notificationsService: NotificationsService, + private viewportScroller: ViewportScroller, + protected formValidatorService: FormValidatorService, + private notifier: Notifier, private configService: ConfigService, - private serverService: ServerService, - private confirmService: ConfirmService + private serverService: ServerService ) { super() - } - getResolutionKey (resolution: string) { - return 'transcodingResolution' + resolution - } - - buildForm () { - const formGroupData = { - instanceName: [ '', INSTANCE_NAME.VALIDATORS ], - instanceShortDescription: [ '', INSTANCE_SHORT_DESCRIPTION.VALIDATORS ], - instanceDescription: [ '' ], - instanceTerms: [ '' ], - instanceDefaultClientRoute: [ '' ], - cachePreviewsSize: [ '', CACHE_PREVIEWS_SIZE.VALIDATORS ], - signupEnabled: [ ], - signupLimit: [ '', SIGNUP_LIMIT.VALIDATORS ], - adminEmail: [ '', ADMIN_EMAIL.VALIDATORS ], - userVideoQuota: [ '', USER_VIDEO_QUOTA.VALIDATORS ], - transcodingThreads: [ '', TRANSCODING_THREADS.VALIDATORS ], - transcodingEnabled: [ ], - customizationJavascript: [ '' ], - customizationCSS: [ '' ] - } - - for (const resolution of this.resolutions) { - const key = this.getResolutionKey(resolution) - formGroupData[key] = [ false ] - } - - this.form = this.formBuilder.group(formGroupData) - - this.form.valueChanges.subscribe(data => this.onValueChanged(data)) + this.resolutions = [ + { + id: '0p', + label: $localize`Audio-only`, + description: $localize`A .mp4 that keeps the original audio track, with no video` + }, + { + id: '240p', + label: $localize`240p` + }, + { + id: '360p', + label: $localize`360p` + }, + { + id: '480p', + label: $localize`480p` + }, + { + id: '720p', + label: $localize`720p` + }, + { + id: '1080p', + label: $localize`1080p` + }, + { + id: '1440p', + label: $localize`1440p` + }, + { + id: '2160p', + label: $localize`2160p` + } + ] + + this.liveResolutions = this.resolutions.filter(r => r.id !== '0p') + + this.transcodingThreadOptions = [ + { value: 0, label: $localize`Auto (via ffmpeg)` }, + { value: 1, label: '1' }, + { value: 2, label: '2' }, + { value: 4, label: '4' }, + { value: 8, label: '8' } + ] + + this.liveMaxDurationOptions = [ + { 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` }, + { value: 1000 * 3600 * 10, label: $localize`10 hours` } + ] } - ngOnInit () { - this.buildForm() - - this.configService.getCustomConfig() - .subscribe( - res => { - this.customConfig = res + get videoQuotaOptions () { + return this.configService.videoQuotaOptions + } - this.oldCustomCSS = this.customConfig.instance.customizations.css - this.oldCustomJavascript = this.customConfig.instance.customizations.javascript + get videoQuotaDailyOptions () { + return this.configService.videoQuotaDailyOptions + } - this.updateForm() - }, + get availableThemes () { + return this.serverConfig.theme.registered + .map(t => t.name) + } - err => this.notificationsService.error('Error', err.message) - ) + get liveRTMPPort () { + return this.serverConfig.live.rtmp.port } - isTranscodingEnabled () { - return this.form.value['transcodingEnabled'] === true + getTotalTranscodingThreads () { + const transcodingEnabled = this.form.value['transcoding']['enabled'] + const transcodingThreads = this.form.value['transcoding']['threads'] + const liveTranscodingEnabled = this.form.value['live']['transcoding']['enabled'] + const liveTranscodingThreads = this.form.value['live']['transcoding']['threads'] + + // checks whether all enabled method are on fixed values and not on auto (= 0) + let noneOnAuto = !transcodingEnabled || +transcodingThreads > 0 + noneOnAuto &&= !liveTranscodingEnabled || +liveTranscodingThreads > 0 + + // count total of fixed value, repalcing auto by a single thread (knowing it will display "at least") + let value = 0 + if (transcodingEnabled) value += +transcodingThreads || 1 + if (liveTranscodingEnabled) value += +liveTranscodingThreads || 1 + + return { + value, + atMost: noneOnAuto, // auto switches everything to a least estimation since ffmpeg will take as many threads as possible + unit: value > 1 + ? $localize`threads` + : $localize`thread` + } } - isSignupEnabled () { - return this.form.value['signupEnabled'] === true + getResolutionKey (resolution: string) { + return 'transcoding.resolutions.' + resolution } - async formValidated () { - const newCustomizationJavascript = this.form.value['customizationJavascript'] - const newCustomizationCSS = this.form.value['customizationCSS'] + ngOnInit () { + this.serverConfig = this.serverService.getTmpConfig() + this.serverService.getConfig() + .subscribe(config => { + this.serverConfig = config + }) - const customizations = [] - if (newCustomizationJavascript && newCustomizationJavascript !== this.oldCustomJavascript) customizations.push('JavaScript') - if (newCustomizationCSS && newCustomizationCSS !== this.oldCustomCSS) customizations.push('CSS') + const formGroupData: { [key in keyof CustomConfig ]: any } = { + instance: { + name: INSTANCE_NAME_VALIDATOR, + shortDescription: INSTANCE_SHORT_DESCRIPTION_VALIDATOR, + description: null, - if (customizations.length !== 0) { - const customizationsText = customizations.join('/') + isNSFW: false, + defaultNSFWPolicy: null, - const message = `You set custom ${customizationsText}. ` + - 'This could lead to security issues or bugs if you do not understand it. ' + - 'Are you sure you want to update the configuration?' - const label = `Please type "I understand the ${customizationsText} I set" to confirm.` - const expectedInputValue = `I understand the ${customizationsText} I set` + terms: null, + codeOfConduct: null, - const confirmRes = await this.confirmService.confirmWithInput(message, label, expectedInputValue) - if (confirmRes === false) return - } + creationReason: null, + moderationInformation: null, + administrator: null, + maintenanceLifetime: null, + businessModel: null, + + hardwareInformation: null, + + categories: null, + languages: null, + + defaultClientRoute: null, - const data: CustomConfig = { - instance: { - name: this.form.value['instanceName'], - shortDescription: this.form.value['instanceShortDescription'], - description: this.form.value['instanceDescription'], - terms: this.form.value['instanceTerms'], - defaultClientRoute: this.form.value['instanceDefaultClientRoute'], customizations: { - javascript: this.form.value['customizationJavascript'], - css: this.form.value['customizationCSS'] + javascript: null, + css: null + } + }, + theme: { + default: null + }, + services: { + twitter: { + username: SERVICES_TWITTER_USERNAME_VALIDATOR, + whitelisted: null } }, cache: { previews: { - size: this.form.value['cachePreviewsSize'] + size: CACHE_PREVIEWS_SIZE_VALIDATOR + }, + captions: { + size: CACHE_CAPTIONS_SIZE_VALIDATOR } }, signup: { - enabled: this.form.value['signupEnabled'], - limit: this.form.value['signupLimit'] + enabled: null, + limit: SIGNUP_LIMIT_VALIDATOR, + requiresEmailVerification: null + }, + import: { + videos: { + http: { + enabled: null + }, + torrent: { + enabled: null + } + } }, admin: { - email: this.form.value['adminEmail'] + email: ADMIN_EMAIL_VALIDATOR + }, + contactForm: { + enabled: null }, user: { - videoQuota: this.form.value['userVideoQuota'] + videoQuota: USER_VIDEO_QUOTA_VALIDATOR, + videoQuotaDaily: USER_VIDEO_QUOTA_DAILY_VALIDATOR + }, + transcoding: { + enabled: null, + threads: TRANSCODING_THREADS_VALIDATOR, + allowAdditionalExtensions: null, + allowAudioFiles: null, + resolutions: {}, + hls: { + enabled: null + }, + webtorrent: { + enabled: null + } + }, + live: { + enabled: null, + + maxDuration: null, + maxInstanceLives: null, + maxUserLives: null, + allowReplay: null, + + transcoding: { + enabled: null, + threads: TRANSCODING_THREADS_VALIDATOR, + resolutions: {} + } + }, + autoBlacklist: { + videos: { + ofUsers: { + enabled: null + } + } + }, + followers: { + instance: { + enabled: null, + manualApproval: null + } + }, + followings: { + instance: { + autoFollowBack: { + enabled: null + }, + autoFollowIndex: { + enabled: null, + indexUrl: INDEX_URL_VALIDATOR + } + } + }, + broadcastMessage: { + enabled: null, + level: null, + dismissable: null, + message: null }, + search: { + remoteUri: { + users: null, + anonymous: null + }, + searchIndex: { + enabled: null, + url: SEARCH_INDEX_URL_VALIDATOR, + disableLocalSearch: null, + isDefaultSearch: null + } + } + } + + const defaultValues = { transcoding: { - enabled: this.form.value['transcodingEnabled'], - threads: this.form.value['transcodingThreads'], - resolutions: { - '240p': this.form.value[this.getResolutionKey('240p')], - '360p': this.form.value[this.getResolutionKey('360p')], - '480p': this.form.value[this.getResolutionKey('480p')], - '720p': this.form.value[this.getResolutionKey('720p')], - '1080p': this.form.value[this.getResolutionKey('1080p')] + resolutions: {} + }, + live: { + transcoding: { + resolutions: {} } } } - this.configService.updateCustomConfig(data) + for (const resolution of this.resolutions) { + defaultValues.transcoding.resolutions[resolution.id] = 'false' + formGroupData.transcoding.resolutions[resolution.id] = null + } + + for (const resolution of this.liveResolutions) { + defaultValues.live.transcoding.resolutions[resolution.id] = 'false' + formGroupData.live.transcoding.resolutions[resolution.id] = null + } + + this.buildForm(formGroupData) + this.loadForm() + + this.checkTranscodingFields() + this.checkSignupField() + } + + ngAfterViewChecked () { + if (!this.initDone) { + this.initDone = true + this.gotoAnchor() + } + } + + isTranscodingEnabled () { + return this.form.value['transcoding']['enabled'] === true + } + + isLiveEnabled () { + return this.form.value['live']['enabled'] === true + } + + isLiveTranscodingEnabled () { + return this.form.value['live']['transcoding']['enabled'] === true + } + + isSignupEnabled () { + return this.form.value['signup']['enabled'] === true + } + + isSearchIndexEnabled () { + return this.form.value['search']['searchIndex']['enabled'] === true + } + + isAutoFollowIndexEnabled () { + return this.form.value['followings']['instance']['autoFollowIndex']['enabled'] === true + } + + async formValidated () { + const value: CustomConfig = this.form.getRawValue() + + this.configService.updateCustomConfig(value) .subscribe( res => { this.customConfig = res // Reload general configuration - this.serverService.loadConfig() + this.serverService.resetConfig() this.updateForm() - this.notificationsService.success('Success', 'Configuration updated.') + this.notifier.success($localize`Configuration updated.`) }, - err => this.notificationsService.error('Error', err.message) + err => this.notifier.error(err.message) ) } - private updateForm () { - const data = { - instanceName: this.customConfig.instance.name, - instanceShortDescription: this.customConfig.instance.shortDescription, - instanceDescription: this.customConfig.instance.description, - instanceTerms: this.customConfig.instance.terms, - instanceDefaultClientRoute: this.customConfig.instance.defaultClientRoute, - cachePreviewsSize: this.customConfig.cache.previews.size, - signupEnabled: this.customConfig.signup.enabled, - signupLimit: this.customConfig.signup.limit, - adminEmail: this.customConfig.admin.email, - userVideoQuota: this.customConfig.user.videoQuota, - transcodingThreads: this.customConfig.transcoding.threads, - transcodingEnabled: this.customConfig.transcoding.enabled, - customizationJavascript: this.customConfig.instance.customizations.javascript, - customizationCSS: this.customConfig.instance.customizations.css + gotoAnchor () { + const hashToNav = { + 'customizations': 'advanced-configuration' } + const hash = window.location.hash.replace('#', '') - for (const resolution of this.resolutions) { - const key = this.getResolutionKey(resolution) - data[key] = this.customConfig.transcoding.resolutions[resolution] + if (hash && Object.keys(hashToNav).includes(hash)) { + this.nav.select(hashToNav[hash]) + setTimeout(() => this.viewportScroller.scrollToAnchor(hash), 100) } + } + + hasConsistentOptions () { + if (this.hasLiveAllowReplayConsistentOptions()) return true - this.form.patchValue(data) + return false } + hasLiveAllowReplayConsistentOptions () { + if (this.isTranscodingEnabled() === false && this.isLiveEnabled() && this.form.value['live']['allowReplay'] === true) { + return false + } + + return true + } + + private updateForm () { + this.form.patchValue(this.customConfig) + } + + private loadForm () { + forkJoin([ + this.configService.getCustomConfig(), + this.serverService.getVideoLanguages(), + this.serverService.getVideoCategories() + ]).subscribe( + ([ config, languages, categories ]) => { + this.customConfig = config + + this.languageItems = languages.map(l => ({ label: l.label, id: l.id })) + this.categoryItems = categories.map(l => ({ label: l.label, id: l.id + '' })) + + this.updateForm() + // Force form validation + this.forceCheck() + }, + + err => this.notifier.error(err.message) + ) + } + + private checkTranscodingFields () { + const hlsControl = this.form.get('transcoding.hls.enabled') + const webtorrentControl = this.form.get('transcoding.webtorrent.enabled') + + webtorrentControl.valueChanges + .subscribe(newValue => { + if (newValue === false && !hlsControl.disabled) { + hlsControl.disable() + } + + if (newValue === true && !hlsControl.enabled) { + hlsControl.enable() + } + }) + + hlsControl.valueChanges + .subscribe(newValue => { + if (newValue === false && !webtorrentControl.disabled) { + webtorrentControl.disable() + } + + if (newValue === true && !webtorrentControl.enabled) { + webtorrentControl.enable() + } + }) + } + + private checkSignupField () { + const signupControl = this.form.get('signup.enabled') + + signupControl.valueChanges + .pipe(pairwise()) + .subscribe(([ oldValue, newValue ]) => { + if (oldValue !== true && newValue === true) { + // tslint:disable:max-line-length + this.signupAlertMessage = $localize`You enabled signup: we automatically enabled the "Block new videos automatically" checkbox of the "Videos" section just below.` + + this.form.patchValue({ + autoBlacklist: { + videos: { + ofUsers: { + enabled: true + } + } + } + }) + } + }) + } }