X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideos%2F%2Bvideo-edit%2Fvideo-update.component.ts;h=ad71162b856a873b36637ce156cdbeb85d8e6981;hb=52798aa5f277492d4dd2482bca9396d2e982fa19;hp=30c82343bc4d1285ad931d4346a8711fa5f743f7;hpb=bb4ba6d94c5051fdd665ebe63fffcc105778b8be;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 30c82343b..ad71162b8 100644
--- a/client/src/app/+videos/+video-edit/video-update.component.ts
+++ b/client/src/app/+videos/+video-edit/video-update.component.ts
@@ -1,13 +1,17 @@
 import { of } from 'rxjs'
-import { map, switchMap } from 'rxjs/operators'
+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, SelectChannelItem } from '@app/shared/shared-forms'
-import { VideoCaptionEdit, VideoCaptionService, VideoDetails, VideoEdit, VideoService } from '@app/shared/shared-main'
+import { FormReactive, FormReactiveService } from '@app/shared/shared-forms'
+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 { logger } from '@root-helpers/logger'
+import { pick, simpleObjectsDeepEqual } from '@shared/core-utils'
 import { LiveVideo, LiveVideoUpdate, VideoPrivacy } from '@shared/models'
+import { VideoSource } from '@shared/models/videos/video-source'
 import { hydrateFormFromVideo } from './shared/video-edit-utils'
 
 @Component({
@@ -16,19 +20,20 @@ import { hydrateFormFromVideo } from './shared/video-edit-utils'
   templateUrl: './video-update.component.html'
 })
 export class VideoUpdateComponent extends FormReactive implements OnInit {
-  video: VideoEdit
+  videoEdit: VideoEdit
+  videoDetails: VideoDetails
+  videoSource: VideoSource
   userVideoChannels: SelectChannelItem[] = []
   videoCaptions: VideoCaptionEdit[] = []
   liveVideo: LiveVideo
 
   isUpdatingVideo = false
-  schedulePublicationPossible = false
-  waitTranscodingEnabled = true
+  forbidScheduledPublication = false
 
   private updateDone = false
 
   constructor (
-    protected formValidatorService: FormValidatorService,
+    protected formReactiveService: FormReactiveService,
     private route: ActivatedRoute,
     private router: Router,
     private notifier: Notifier,
@@ -36,46 +41,38 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
     private loadingBar: LoadingBarService,
     private videoCaptionService: VideoCaptionService,
     private liveVideoService: LiveVideoService
-    ) {
+  ) {
     super()
   }
 
   ngOnInit () {
     this.buildForm({})
 
-    this.route.data
-        .pipe(map(data => data.videoData))
-        .subscribe(({ video, videoChannels, videoCaptions, liveVideo }) => {
-          this.video = new VideoEdit(video)
-          this.userVideoChannels = videoChannels
-          this.videoCaptions = videoCaptions
-          this.liveVideo = liveVideo
+    const { videoData } = this.route.snapshot.data
+    const { video, videoChannels, videoCaptions, videoSource, liveVideo } = videoData
 
-          this.schedulePublicationPossible = this.video.privacy === VideoPrivacy.PRIVATE
+    this.videoDetails = video
+    this.videoEdit = new VideoEdit(this.videoDetails)
 
-          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(() => {
-            hydrateFormFromVideo(this.form, this.video, true)
+    this.forbidScheduledPublication = this.videoEdit.privacy !== VideoPrivacy.PRIVATE
+  }
 
-            if (this.liveVideo) {
-              this.form.patchValue({
-                saveReplay: this.liveVideo.saveReplay,
-                permanentLive: this.liveVideo.permanentLive
-              })
-            }
-          })
-        },
+  onFormBuilt () {
+    hydrateFormFromVideo(this.form, this.videoEdit, true)
 
-        err => {
-          console.error(err)
-          this.notifier.error(err.message)
-        }
-      )
+    if (this.liveVideo) {
+      this.form.patchValue({
+        saveReplay: this.liveVideo.saveReplay,
+        replayPrivacy: this.liveVideo.replaySettings ? this.liveVideo.replaySettings.privacy : VideoPrivacy.PRIVATE,
+        latencyMode: this.liveVideo.latencyMode,
+        permanentLive: this.liveVideo.permanentLive
+      })
+    }
   }
 
   @HostListener('window:beforeunload', [ '$event' ])
@@ -100,63 +97,83 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
     return { canDeactivate: this.formChanged === false, text }
   }
 
-  checkForm () {
-    this.forceCheck()
+  isWaitTranscodingHidden () {
+    if (this.videoDetails.getFiles().length > 1) { // Already transcoded
+      return true
+    }
 
-    return this.form.valid
+    return false
   }
 
-  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)
-
-    const liveVideoUpdate: LiveVideoUpdate = {
-      saveReplay: this.form.value.saveReplay,
-      permanentLive: this.form.value.permanentLive
-    }
+    this.videoEdit.patch(this.form.value)
 
     this.loadingBar.useRef().start()
     this.isUpdatingVideo = true
 
     // Update the video
-    this.videoService.updateVideo(this.video)
+    this.videoService.updateVideo(this.videoEdit)
         .pipe(
           // Then update captions
-          switchMap(() => this.videoCaptionService.updateCaptions(this.video.id, this.videoCaptions)),
+          switchMap(() => this.videoCaptionService.updateCaptions(this.videoEdit.id, this.videoCaptions)),
 
           switchMap(() => {
             if (!this.liveVideo) return of(undefined)
 
-            return this.liveVideoService.updateLive(this.video.id, liveVideoUpdate)
+            const saveReplay = !!this.form.value.saveReplay
+            const replaySettings = saveReplay
+              ? { privacy: this.form.value.replayPrivacy }
+              : undefined
+
+            const liveVideoUpdate: LiveVideoUpdate = {
+              saveReplay,
+              replaySettings,
+              permanentLive: !!this.form.value.permanentLive,
+              latencyMode: this.form.value.latencyMode
+            }
+
+            // Don't update live attributes if they did not change
+            const baseVideo = pick(this.liveVideo, Object.keys(liveVideoUpdate) as (keyof LiveVideoUpdate)[])
+            const liveChanged = !simpleObjectsDeepEqual(baseVideo, liveVideoUpdate)
+            if (!liveChanged) return of(undefined)
+
+            return this.liveVideoService.updateLive(this.videoEdit.id, liveVideoUpdate)
           })
         )
-        .subscribe(
-          () => {
+        .subscribe({
+          next: () => {
             this.updateDone = true
             this.isUpdatingVideo = false
             this.loadingBar.useRef().complete()
             this.notifier.success($localize`Video updated.`)
-            this.router.navigate([ '/videos/watch', this.video.uuid ])
+            this.router.navigateByUrl(Video.buildWatchUrl(this.videoEdit))
           },
 
-          err => {
+          error: err => {
             this.loadingBar.useRef().complete()
             this.isUpdatingVideo = false
             this.notifier.error(err.message)
-            console.error(err)
+            logger.error(err)
           }
-        )
+        })
   }
 
   hydratePluginFieldsFromVideo () {
-    if (!this.video.pluginData) return
+    if (!this.videoEdit.pluginData) return
 
     this.form.patchValue({
-      pluginData: this.video.pluginData
+      pluginData: this.videoEdit.pluginData
     })
   }
+
+  getVideoUrl () {
+    return Video.buildWatchUrl(this.videoDetails)
+  }
 }