import { Component, OnInit } from '@angular/core'
-import { FormBuilder, FormGroup } from '@angular/forms'
-import { Router } from '@angular/router'
import { ConfigService } from '@app/+admin/config/shared/config.service'
-import { ConfirmService } 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,
- SERVICES_TWITTER_USERNAME,
- SIGNUP_LIMIT,
- TRANSCODING_THREADS
-} from '@app/shared/forms/form-validators/custom-config'
-import { NotificationsService } from 'angular2-notifications'
+import { CustomConfigValidatorsService, FormReactive, UserValidatorsService } from '@app/shared'
+import { Notifier } from '@app/core'
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'
})
export class EditCustomConfigComponent extends FormReactive implements OnInit {
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' }
- ]
+
+ resolutions: string[] = []
+ transcodingThreadOptions: { label: string, value: number }[] = []
private oldCustomJavascript: string
private oldCustomCSS: string
constructor (
protected formValidatorService: FormValidatorService,
- private router: Router,
- private notificationsService: NotificationsService,
+ private customConfigValidatorsService: CustomConfigValidatorsService,
+ private userValidatorsService: UserValidatorsService,
+ private notifier: Notifier,
private configService: ConfigService,
private serverService: ServerService,
- private confirmService: ConfirmService,
private i18n: I18n
) {
super()
+
+ this.resolutions = [
+ this.i18n('240p'),
+ this.i18n('360p'),
+ this.i18n('480p'),
+ this.i18n('720p'),
+ this.i18n('1080p')
+ ]
+
+ this.transcodingThreadOptions = [
+ { value: 0, label: this.i18n('Auto (via ffmpeg)') },
+ { value: 1, label: '1' },
+ { value: 2, label: '2' },
+ { value: 4, label: '4' },
+ { value: 8, label: '8' }
+ ]
+ }
+
+ get videoQuotaOptions () {
+ return this.configService.videoQuotaOptions
+ }
+
+ get videoQuotaDailyOptions () {
+ return this.configService.videoQuotaDailyOptions
}
getResolutionKey (resolution: string) {
}
ngOnInit () {
- const formGroupData = {
- instanceName: INSTANCE_NAME,
- instanceShortDescription: INSTANCE_SHORT_DESCRIPTION,
+ const formGroupData: { [key: string]: any } = {
+ instanceName: this.customConfigValidatorsService.INSTANCE_NAME,
+ instanceShortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION,
instanceDescription: null,
instanceTerms: null,
instanceDefaultClientRoute: null,
instanceDefaultNSFWPolicy: null,
- servicesTwitterUsername: SERVICES_TWITTER_USERNAME,
+ servicesTwitterUsername: this.customConfigValidatorsService.SERVICES_TWITTER_USERNAME,
servicesTwitterWhitelisted: null,
- cachePreviewsSize: CACHE_PREVIEWS_SIZE,
+ cachePreviewsSize: this.customConfigValidatorsService.CACHE_PREVIEWS_SIZE,
+ cacheCaptionsSize: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE,
signupEnabled: null,
- signupLimit: SIGNUP_LIMIT,
- adminEmail: ADMIN_EMAIL,
- userVideoQuota: USER_VIDEO_QUOTA,
- transcodingThreads: TRANSCODING_THREADS,
+ 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,
+ transcodingAllowAdditionalExtensions: null,
transcodingEnabled: null,
customizationJavascript: null,
customizationCSS: null
this.forceCheck()
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
}
async formValidated () {
- const newCustomizationJavascript = this.form.value['customizationJavascript']
- const newCustomizationCSS = this.form.value['customizationCSS']
-
- const customizations = []
- if (newCustomizationJavascript && newCustomizationJavascript !== this.oldCustomJavascript) customizations.push('JavaScript')
- if (newCustomizationCSS && newCustomizationCSS !== this.oldCustomCSS) customizations.push('CSS')
-
- if (customizations.length !== 0) {
- const customizationsText = customizations.join('/')
-
- // 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?')
- const label = this.i18n(
- 'Please type "I understand the {{customizationsText}} I set" to confirm.',
- { customizationsText }
- )
- const expectedInputValue = this.i18n('I understand the {{customizationsText}} I set', { customizationsText })
-
- const confirmRes = await this.confirmService.confirmWithInput(message, label, expectedInputValue)
- if (confirmRes === false) return
- }
-
const data: CustomConfig = {
instance: {
name: this.form.value['instanceName'],
cache: {
previews: {
size: this.form.value['cachePreviewsSize']
+ },
+ captions: {
+ size: this.form.value['cacheCaptionsSize']
}
},
signup: {
enabled: this.form.value['signupEnabled'],
- limit: this.form.value['signupLimit']
+ limit: this.form.value['signupLimit'],
+ requiresEmailVerification: this.form.value['signupRequiresEmailVerification']
},
admin: {
email: this.form.value['adminEmail']
},
user: {
- videoQuota: this.form.value['userVideoQuota']
+ videoQuota: this.form.value['userVideoQuota'],
+ videoQuotaDaily: this.form.value['userVideoQuotaDaily']
},
transcoding: {
enabled: this.form.value['transcodingEnabled'],
+ allowAdditionalExtensions: this.form.value['transcodingAllowAdditionalExtensions'],
threads: this.form.value['transcodingThreads'],
resolutions: {
'240p': this.form.value[this.getResolutionKey('240p')],
'720p': this.form.value[this.getResolutionKey('720p')],
'1080p': this.form.value[this.getResolutionKey('1080p')]
}
+ },
+ import: {
+ videos: {
+ http: {
+ enabled: this.form.value['importVideosHttpEnabled']
+ },
+ torrent: {
+ enabled: this.form.value['importVideosTorrentEnabled']
+ }
+ }
}
}
this.updateForm()
- this.notificationsService.success(this.i18n('Success'), this.i18n('Configuration updated.'))
+ this.notifier.success(this.i18n('Configuration updated.'))
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
private updateForm () {
- const data = {
+ const data: { [key: string]: any } = {
instanceName: this.customConfig.instance.name,
instanceShortDescription: this.customConfig.instance.shortDescription,
instanceDescription: this.customConfig.instance.description,
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,
+ transcodingAllowAdditionalExtensions: this.customConfig.transcoding.allowAdditionalExtensions,
customizationJavascript: this.customConfig.instance.customizations.javascript,
- customizationCSS: this.customConfig.instance.customizations.css
+ customizationCSS: this.customConfig.instance.customizations.css,
+ importVideosHttpEnabled: this.customConfig.import.videos.http.enabled,
+ importVideosTorrentEnabled: this.customConfig.import.videos.torrent.enabled
}
for (const resolution of this.resolutions) {
projects / github / Chocobozzz / PeerTube.git / blobdiff