forks
/
peertube
1
0
Fork 0
Code Releases Activity

Add warning if admin disables webtorrent

This commit is contained in:
Chocobozzz 2020-01-06 16:43:15 +01:00
parent c10b638c4b
commit 04cda1d7a5
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
5 changed files with 58 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -502,6 +502,10 @@
<strong>Experimental, we suggest you to not disable webtorrent support for now</strong>
<p>If you also enabled HLS support, it will multiply videos storage by 2</p>
<br />
<strong>If disabled, breaks federation with PeerTube instances < 2.1</strong>
</ng-container>
</ng-template>
</my-peertube-checkbox>

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

@ -222,25 +222,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
}
this.buildForm(formGroupData)
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, value: l.id }))
this.categoryItems = categories.map(l => ({ label: l.label, value: l.id }))
this.updateForm()
// Force form validation
this.forceCheck()
},
err => this.notifier.error(err.message)
)
this.loadForm()
this.checkTranscodingFields()
}
isTranscodingEnabled () {
@ -252,9 +235,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
}
async formValidated () {
this.configService.updateCustomConfig(this.form.value)
.pipe(
)
this.configService.updateCustomConfig(this.form.getRawValue())
.subscribe(
res => {
this.customConfig = res
@ -290,4 +271,52 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
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, value: l.id }))
this.categoryItems = categories.map(l => ({ label: l.label, value: 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()
}
})
}
}

1
config/default.yaml
View File

@ -216,6 +216,7 @@ transcoding:
# Generate videos in a WebTorrent format (what we do since the first PeerTube release)
# If you also enabled the hls format, it will multiply videos storage by 2
# If disabled, breaks federation with PeerTube instances < 2.1
webtorrent:
enabled: true

1
config/production.yaml.example
View File

@ -230,6 +230,7 @@ transcoding:
# Generate videos in a WebTorrent format (what we do since the first PeerTube release)
# If you also enabled the hls format, it will multiply videos storage by 2
# If disabled, breaks federation with PeerTube instances < 2.1
webtorrent:
enabled: true

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

@ -45,7 +45,7 @@ const customConfigUpdateValidator = [
body('transcoding.resolutions.1080p').isBoolean().withMessage('Should have a valid transcoding 1080p resolution enabled boolean'),
body('transcoding.webtorrent.enabled').isBoolean().withMessage('Should have a valid webtorrent transcoding enabled boolean'),
body('transcoding.hls.enabled').isBoolean().withMessage('Should have a valid webtorrent transcoding enabled boolean'),
body('transcoding.hls.enabled').isBoolean().withMessage('Should have a valid hls transcoding enabled boolean'),
body('import.videos.http.enabled').isBoolean().withMessage('Should have a valid import video http enabled boolean'),
body('import.videos.torrent.enabled').isBoolean().withMessage('Should have a valid import video torrent enabled boolean'),