+
+import { forkJoin } from 'rxjs'
+import { SelectOptionsItem } from 'src/types/select-options-item.model'
import { Component, OnInit } from '@angular/core'
+import { ActivatedRoute, Router } from '@angular/router'
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 { CustomConfigValidatorsService, FormReactive, UserValidatorsService } from '@app/shared'
-import { NotificationsService } from 'angular2-notifications'
-import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { BuildFormDefaultValues, FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
+import {
+ ADMIN_EMAIL_VALIDATOR,
+ CACHE_CAPTIONS_SIZE_VALIDATOR,
+ CACHE_PREVIEWS_SIZE_VALIDATOR,
+ CONCURRENCY_VALIDATOR,
+ INDEX_URL_VALIDATOR,
+ INSTANCE_NAME_VALIDATOR,
+ INSTANCE_SHORT_DESCRIPTION_VALIDATOR,
+ MAX_INSTANCE_LIVES_VALIDATOR,
+ MAX_LIVE_DURATION_VALIDATOR,
+ MAX_USER_LIVES_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 } from '@app/shared/shared-forms'
+import { CustomConfig, ServerConfig } from '@shared/models'
+import { EditConfigurationService } from './edit-configuration.service'
@Component({
selector: 'my-edit-custom-config',
styleUrls: [ './edit-custom-config.component.scss' ]
})
export class EditCustomConfigComponent extends FormReactive implements OnInit {
- static 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' }
- ]
- static videoQuotaDailyOptions = [
- { value: -1, label: 'Unlimited' },
- { value: 0, label: '0' },
- { value: 10 * 1024 * 1024, label: '10MB' },
- { value: 50 * 1024 * 1024, label: '50MB' },
- { value: 100 * 1024 * 1024, label: '100MB' },
- { value: 500 * 1024 * 1024, label: '500MB' },
- { value: 2 * 1024 * 1024 * 1024, label: '2GB' },
- { value: 5 * 1024 * 1024 * 1024, label: '5GB' }
- ]
+ activeNav: string
customConfig: CustomConfig
- resolutions = [ '240p', '360p', '480p', '720p', '1080p' ]
-
- transcodingThreadOptions = [
- { value: 0, label: 'Auto (via ffmpeg)' },
- { value: 1, label: '1' },
- { value: 2, label: '2' },
- { value: 4, label: '4' },
- { value: 8, label: '8' }
- ]
+ serverConfig: ServerConfig
- private oldCustomJavascript: string
- private oldCustomCSS: string
+ languageItems: SelectOptionsItem[] = []
+ categoryItems: SelectOptionsItem[] = []
constructor (
+ private router: Router,
+ private route: ActivatedRoute,
protected formValidatorService: FormValidatorService,
- private customConfigValidatorsService: CustomConfigValidatorsService,
- private userValidatorsService: UserValidatorsService,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private configService: ConfigService,
private serverService: ServerService,
- private confirmService: ConfirmService,
- private i18n: I18n
+ private editConfigurationService: EditConfigurationService
) {
super()
}
- get videoQuotaOptions () {
- return EditCustomConfigComponent.videoQuotaOptions
- }
-
- get videoQuotaDailyOptions () {
- return EditCustomConfigComponent.videoQuotaDailyOptions
- }
-
- getResolutionKey (resolution: string) {
- return 'transcodingResolution' + resolution
- }
-
ngOnInit () {
- const formGroupData = {
- instanceName: this.customConfigValidatorsService.INSTANCE_NAME,
- instanceShortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION,
- instanceDescription: null,
- instanceTerms: null,
- instanceDefaultClientRoute: null,
- instanceDefaultNSFWPolicy: null,
- servicesTwitterUsername: this.customConfigValidatorsService.SERVICES_TWITTER_USERNAME,
- servicesTwitterWhitelisted: null,
- cachePreviewsSize: this.customConfigValidatorsService.CACHE_PREVIEWS_SIZE,
- cacheCaptionsSize: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE,
- signupEnabled: null,
- signupLimit: this.customConfigValidatorsService.SIGNUP_LIMIT,
- signupRequiresEmailVerification: null,
- importVideosHttpEnabled: null,
- importVideosTorrentEnabled: null,
- adminEmail: this.customConfigValidatorsService.ADMIN_EMAIL,
- userVideoQuota: this.userValidatorsService.USER_VIDEO_QUOTA,
- userVideoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY,
- transcodingThreads: this.customConfigValidatorsService.TRANSCODING_THREADS,
- transcodingEnabled: null,
- customizationJavascript: null,
- customizationCSS: null
- }
-
- const defaultValues: BuildFormDefaultValues = {}
- for (const resolution of this.resolutions) {
- const key = this.getResolutionKey(resolution)
- defaultValues[key] = 'false'
- formGroupData[key] = null
- }
-
- this.buildForm(formGroupData)
-
- this.configService.getCustomConfig()
- .subscribe(
- res => {
- this.customConfig = res
-
- this.oldCustomCSS = this.customConfig.instance.customizations.css
- this.oldCustomJavascript = this.customConfig.instance.customizations.javascript
-
- this.updateForm()
- // Force form validation
- this.forceCheck()
- },
-
- err => this.notificationsService.error(this.i18n('Error'), err.message)
- )
- }
+ this.serverConfig = this.serverService.getTmpConfig()
+ this.serverService.getConfig()
+ .subscribe(config => {
+ this.serverConfig = config
+ })
- isTranscodingEnabled () {
- return this.form.value['transcodingEnabled'] === true
- }
-
- isSignupEnabled () {
- return this.form.value['signupEnabled'] === true
- }
+ const formGroupData: { [key in keyof CustomConfig ]: any } = {
+ instance: {
+ name: INSTANCE_NAME_VALIDATOR,
+ shortDescription: INSTANCE_SHORT_DESCRIPTION_VALIDATOR,
+ description: null,
- async formValidated () {
- const newCustomizationJavascript = this.form.value['customizationJavascript']
- const newCustomizationCSS = this.form.value['customizationCSS']
+ isNSFW: false,
+ defaultNSFWPolicy: null,
- const customizations = []
- if (newCustomizationJavascript && newCustomizationJavascript !== this.oldCustomJavascript) customizations.push('JavaScript')
- if (newCustomizationCSS && newCustomizationCSS !== this.oldCustomCSS) customizations.push('CSS')
+ terms: null,
+ codeOfConduct: null,
- if (customizations.length !== 0) {
- const customizationsText = customizations.join('/')
+ creationReason: null,
+ moderationInformation: null,
+ administrator: null,
+ maintenanceLifetime: null,
+ businessModel: null,
- // FIXME: i18n service does not support string concatenation
- const message = this.i18n('You set custom {{customizationsText}}. ', { customizationsText }) +
- this.i18n('This could lead to security issues or bugs if you do not understand it. ') +
- this.i18n('Are you sure you want to update the configuration?')
+ hardwareInformation: null,
- const label = this.i18n('Please type') + ` "I understand the ${customizationsText} I set" ` + this.i18n('to confirm.')
- const expectedInputValue = `I understand the ${customizationsText} I set`
+ categories: null,
+ languages: null,
- const confirmRes = await this.confirmService.confirmWithInput(message, label, expectedInputValue)
- if (confirmRes === false) return
- }
+ 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'],
- defaultNSFWPolicy: this.form.value['instanceDefaultNSFWPolicy'],
customizations: {
- javascript: this.form.value['customizationJavascript'],
- css: this.form.value['customizationCSS']
+ javascript: null,
+ css: null
}
},
+ theme: {
+ default: null
+ },
services: {
twitter: {
- username: this.form.value['servicesTwitterUsername'],
- whitelisted: this.form.value['servicesTwitterWhitelisted']
+ username: SERVICES_TWITTER_USERNAME_VALIDATOR,
+ whitelisted: null
}
},
cache: {
previews: {
- size: this.form.value['cachePreviewsSize']
+ size: CACHE_PREVIEWS_SIZE_VALIDATOR
},
captions: {
- size: this.form.value['cacheCaptionsSize']
+ size: CACHE_CAPTIONS_SIZE_VALIDATOR
}
},
signup: {
- enabled: this.form.value['signupEnabled'],
- limit: this.form.value['signupLimit'],
- requiresEmailVerification: this.form.value['signupRequiresEmailVerification']
+ enabled: null,
+ limit: SIGNUP_LIMIT_VALIDATOR,
+ requiresEmailVerification: null
+ },
+ import: {
+ videos: {
+ concurrency: CONCURRENCY_VALIDATOR,
+ http: {
+ enabled: null
+ },
+ torrent: {
+ enabled: null
+ }
+ }
+ },
+ trending: {
+ videos: {
+ algorithms: {
+ enabled: null,
+ default: null
+ }
+ }
},
admin: {
- email: this.form.value['adminEmail']
+ email: ADMIN_EMAIL_VALIDATOR
+ },
+ contactForm: {
+ enabled: null
},
user: {
- videoQuota: this.form.value['userVideoQuota'],
- videoQuotaDaily: this.form.value['userVideoQuotaDaily']
+ videoQuota: USER_VIDEO_QUOTA_VALIDATOR,
+ videoQuotaDaily: USER_VIDEO_QUOTA_DAILY_VALIDATOR
},
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')]
+ enabled: null,
+ threads: TRANSCODING_THREADS_VALIDATOR,
+ allowAdditionalExtensions: null,
+ allowAudioFiles: null,
+ profile: null,
+ concurrency: CONCURRENCY_VALIDATOR,
+ resolutions: {},
+ hls: {
+ enabled: null
+ },
+ webtorrent: {
+ enabled: null
}
},
- import: {
+ live: {
+ enabled: null,
+
+ maxDuration: MAX_LIVE_DURATION_VALIDATOR,
+ maxInstanceLives: MAX_INSTANCE_LIVES_VALIDATOR,
+ maxUserLives: MAX_USER_LIVES_VALIDATOR,
+ allowReplay: null,
+
+ transcoding: {
+ enabled: null,
+ threads: TRANSCODING_THREADS_VALIDATOR,
+ profile: null,
+ resolutions: {}
+ }
+ },
+ autoBlacklist: {
videos: {
- http: {
- enabled: this.form.value['importVideosHttpEnabled']
+ ofUsers: {
+ enabled: null
+ }
+ }
+ },
+ followers: {
+ instance: {
+ enabled: null,
+ manualApproval: null
+ }
+ },
+ followings: {
+ instance: {
+ autoFollowBack: {
+ enabled: null
},
- torrent: {
- enabled: this.form.value['importVideosTorrentEnabled']
+ 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
+ }
}
}
- this.configService.updateCustomConfig(data)
+ const defaultValues = {
+ transcoding: {
+ resolutions: {}
+ },
+ live: {
+ transcoding: {
+ resolutions: {}
+ }
+ }
+ }
+
+ for (const resolution of this.editConfigurationService.getVODResolutions()) {
+ defaultValues.transcoding.resolutions[resolution.id] = 'false'
+ formGroupData.transcoding.resolutions[resolution.id] = null
+ }
+
+ for (const resolution of this.editConfigurationService.getLiveResolutions()) {
+ defaultValues.live.transcoding.resolutions[resolution.id] = 'false'
+ formGroupData.live.transcoding.resolutions[resolution.id] = null
+ }
+
+ this.buildForm(formGroupData)
+
+ if (this.route.snapshot.fragment) {
+ this.onNavChange(this.route.snapshot.fragment)
+ }
+
+ this.loadConfigAndUpdateForm()
+ this.loadCategoriesAndLanguages()
+ }
+
+ 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(this.i18n('Success'), this.i18n('Configuration updated.'))
+ this.notifier.success($localize`Configuration updated.`)
},
- err => this.notificationsService.error(this.i18n('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,
- instanceDefaultNSFWPolicy: this.customConfig.instance.defaultNSFWPolicy,
- servicesTwitterUsername: this.customConfig.services.twitter.username,
- servicesTwitterWhitelisted: this.customConfig.services.twitter.whitelisted,
- cachePreviewsSize: this.customConfig.cache.previews.size,
- cacheCaptionsSize: this.customConfig.cache.captions.size,
- signupEnabled: this.customConfig.signup.enabled,
- signupLimit: this.customConfig.signup.limit,
- signupRequiresEmailVerification: this.customConfig.signup.requiresEmailVerification,
- adminEmail: this.customConfig.admin.email,
- userVideoQuota: this.customConfig.user.videoQuota,
- userVideoQuotaDaily: this.customConfig.user.videoQuotaDaily,
- transcodingThreads: this.customConfig.transcoding.threads,
- transcodingEnabled: this.customConfig.transcoding.enabled,
- customizationJavascript: this.customConfig.instance.customizations.javascript,
- customizationCSS: this.customConfig.instance.customizations.css,
- importVideosHttpEnabled: this.customConfig.import.videos.http.enabled,
- importVideosTorrentEnabled: this.customConfig.import.videos.torrent.enabled
- }
+ hasConsistentOptions () {
+ if (this.hasLiveAllowReplayConsistentOptions()) return true
+
+ return false
+ }
- for (const resolution of this.resolutions) {
- const key = this.getResolutionKey(resolution)
- data[key] = this.customConfig.transcoding.resolutions[resolution]
+ hasLiveAllowReplayConsistentOptions () {
+ if (
+ this.editConfigurationService.isTranscodingEnabled(this.form) === false &&
+ this.editConfigurationService.isLiveEnabled(this.form) &&
+ this.form.value['live']['allowReplay'] === true
+ ) {
+ return false
}
- this.form.patchValue(data)
+ return true
+ }
+
+ onNavChange (newActiveNav: string) {
+ this.activeNav = newActiveNav
+
+ this.router.navigate([], { fragment: this.activeNav })
}
+ private updateForm () {
+ this.form.patchValue(this.customConfig)
+ }
+
+ private loadConfigAndUpdateForm () {
+ this.configService.getCustomConfig()
+ .subscribe(config => {
+ this.customConfig = config
+
+ this.updateForm()
+ // Force form validation
+ this.forceCheck()
+ },
+
+ err => this.notifier.error(err.message)
+ )
+ }
+
+ private loadCategoriesAndLanguages () {
+ forkJoin([
+ this.serverService.getVideoLanguages(),
+ this.serverService.getVideoCategories()
+ ]).subscribe(
+ ([ languages, categories ]) => {
+ this.languageItems = languages.map(l => ({ label: l.label, id: l.id }))
+ this.categoryItems = categories.map(l => ({ label: l.label, id: l.id + '' }))
+ },
+
+ err => this.notifier.error(err.message)
+ )
+ }
}
projects / github / Chocobozzz / PeerTube.git / blobdiff