X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideos%2F%2Bvideo-edit%2Fvideo-update.component.ts;h=43e8ba3e566c41b38b4cb5ed674d95ae400746ad;hb=2e401e8575decb1d491d0db48ca1ab1eba5b2a66;hp=7bd6eb553fd4ff4eeed9ef403bed2d75a933b325;hpb=1942f11d5ee6926ad93dc1b79fae18325ba5de18;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+videos/+video-edit/video-update.component.ts b/client/src/app/+videos/+video-edit/video-update.component.ts index 7bd6eb553..43e8ba3e5 100644 --- a/client/src/app/+videos/+video-edit/video-update.component.ts +++ b/client/src/app/+videos/+video-edit/video-update.component.ts @@ -1,12 +1,16 @@ -import { map, switchMap } from 'rxjs/operators' +import { of } from 'rxjs' +import { switchMap } from 'rxjs/operators' +import { SelectChannelItem } from 'src/types/select-options-item.model' import { Component, HostListener, OnInit } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' import { Notifier } from '@app/core' import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' -import { VideoCaptionEdit, VideoCaptionService, VideoDetails, VideoEdit, VideoService } from '@app/shared/shared-main' +import { Video, VideoCaptionEdit, VideoCaptionService, VideoDetails, VideoEdit, VideoService } from '@app/shared/shared-main' +import { LiveVideoService } from '@app/shared/shared-video-live' import { LoadingBarService } from '@ngx-loading-bar/core' -import { I18n } from '@ngx-translate/i18n-polyfill' -import { VideoPrivacy } from '@shared/models' +import { LiveVideo, LiveVideoUpdate, VideoPrivacy } from '@shared/models' +import { hydrateFormFromVideo } from './shared/video-edit-utils' +import { VideoSource } from '@shared/models/videos/video-source' @Component({ selector: 'my-videos-update', @@ -15,11 +19,14 @@ import { VideoPrivacy } from '@shared/models' }) export class VideoUpdateComponent extends FormReactive implements OnInit { video: VideoEdit + videoDetails: VideoDetails + videoSource: VideoSource + userVideoChannels: SelectChannelItem[] = [] + videoCaptions: VideoCaptionEdit[] = [] + liveVideo: LiveVideo isUpdatingVideo = false - userVideoChannels: { id: number, label: string, support: string }[] = [] - schedulePublicationPossible = false - videoCaptions: VideoCaptionEdit[] = [] + forbidScheduledPublication = false waitTranscodingEnabled = true private updateDone = false @@ -32,7 +39,7 @@ export class VideoUpdateComponent extends FormReactive implements OnInit { private videoService: VideoService, private loadingBar: LoadingBarService, private videoCaptionService: VideoCaptionService, - private i18n: I18n + private liveVideoService: LiveVideoService ) { super() } @@ -40,29 +47,30 @@ export class VideoUpdateComponent extends FormReactive implements OnInit { ngOnInit () { this.buildForm({}) - this.route.data - .pipe(map(data => data.videoData)) - .subscribe(({ video, videoChannels, videoCaptions }) => { - this.video = new VideoEdit(video) - this.userVideoChannels = videoChannels - this.videoCaptions = videoCaptions + const { videoData } = this.route.snapshot.data + const { video, videoChannels, videoCaptions, videoSource, liveVideo } = videoData - this.schedulePublicationPossible = this.video.privacy === VideoPrivacy.PRIVATE + this.video = new VideoEdit(video) + this.videoDetails = video - const videoFiles = (video as VideoDetails).getFiles() - if (videoFiles.length > 1) { // Already transcoded - this.waitTranscodingEnabled = false - } + this.userVideoChannels = videoChannels + this.videoCaptions = videoCaptions + this.videoSource = videoSource + this.liveVideo = liveVideo - // FIXME: Angular does not detect the change inside this subscription, so use the patched setTimeout - setTimeout(() => this.hydrateFormFromVideo()) - }, + this.forbidScheduledPublication = this.video.privacy !== VideoPrivacy.PRIVATE + } - err => { - console.error(err) - this.notifier.error(err.message) - } - ) + onFormBuilt () { + hydrateFormFromVideo(this.form, this.video, true) + + if (this.liveVideo) { + this.form.patchValue({ + saveReplay: this.liveVideo.saveReplay, + latencyMode: this.liveVideo.latencyMode, + permanentLive: this.liveVideo.permanentLive + }) + } } @HostListener('window:beforeunload', [ '$event' ]) @@ -78,7 +86,7 @@ export class VideoUpdateComponent extends FormReactive implements OnInit { canDeactivate (): { canDeactivate: boolean, text?: string } { if (this.updateDone === true) return { canDeactivate: true } - const text = this.i18n('You have unsaved changes! If you leave, your changes will be lost.') + const text = $localize`You have unsaved changes! If you leave, your changes will be lost.` for (const caption of this.videoCaptions) { if (caption.action) return { canDeactivate: false, text } @@ -87,69 +95,81 @@ export class VideoUpdateComponent extends FormReactive implements OnInit { return { canDeactivate: this.formChanged === false, text } } - checkForm () { - this.forceCheck() + isWaitTranscodingEnabled () { + if (this.videoDetails.getFiles().length > 1) { // Already transcoded + return false + } + + if (this.liveVideo && this.form.value['saveReplay'] !== true) { + return false + } - return this.form.valid + return true } - update () { - if (this.checkForm() === false - || this.isUpdatingVideo === true) { + async update () { + await this.waitPendingCheck() + this.forceCheck() + + if (!this.form.valid || this.isUpdatingVideo === true) { return } this.video.patch(this.form.value) - this.loadingBar.start() + this.loadingBar.useRef().start() this.isUpdatingVideo = true // Update the video this.videoService.updateVideo(this.video) .pipe( // Then update captions - switchMap(() => this.videoCaptionService.updateCaptions(this.video.id, this.videoCaptions)) + switchMap(() => this.videoCaptionService.updateCaptions(this.video.id, this.videoCaptions)), + + switchMap(() => { + if (!this.liveVideo) return of(undefined) + + const liveVideoUpdate: LiveVideoUpdate = { + saveReplay: !!this.form.value.saveReplay, + permanentLive: !!this.form.value.permanentLive, + latencyMode: this.form.value.latencyMode + } + + // Don't update live attributes if they did not change + const liveChanged = Object.keys(liveVideoUpdate) + .some(key => this.liveVideo[key] !== liveVideoUpdate[key]) + if (!liveChanged) return of(undefined) + + return this.liveVideoService.updateLive(this.video.id, liveVideoUpdate) + }) ) - .subscribe( - () => { + .subscribe({ + next: () => { this.updateDone = true this.isUpdatingVideo = false - this.loadingBar.complete() - this.notifier.success(this.i18n('Video updated.')) - this.router.navigate([ '/videos/watch', this.video.uuid ]) + this.loadingBar.useRef().complete() + this.notifier.success($localize`Video updated.`) + this.router.navigateByUrl(Video.buildWatchUrl(this.video)) }, - err => { - this.loadingBar.complete() + error: err => { + this.loadingBar.useRef().complete() this.isUpdatingVideo = false this.notifier.error(err.message) console.error(err) } - ) + }) } - private hydrateFormFromVideo () { - this.form.patchValue(this.video.toFormPatch()) - - const objects = [ - { - url: 'thumbnailUrl', - name: 'thumbnailfile' - }, - { - url: 'previewUrl', - name: 'previewfile' - } - ] - - for (const obj of objects) { - fetch(this.video[obj.url]) - .then(response => response.blob()) - .then(data => { - this.form.patchValue({ - [ obj.name ]: data - }) - }) - } + hydratePluginFieldsFromVideo () { + if (!this.video.pluginData) return + + this.form.patchValue({ + pluginData: this.video.pluginData + }) + } + + getVideoUrl () { + return Video.buildWatchUrl(this.videoDetails) } }