X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideos%2F%2Bvideo-edit%2Fvideo-update.component.ts;h=574669a23731b54616ed80a911deb77597568e95;hb=a1eda903a497857017495f37a1fd3593ba7ab23c;hp=c0f46acd2f65dcff781de6e556abfda106743e46;hpb=c6c0fa6cd8fe8f752463d8982c3dbcd448739c4e;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 c0f46acd2..574669a23 100644
--- a/client/src/app/+videos/+video-edit/video-update.component.ts
+++ b/client/src/app/+videos/+video-edit/video-update.component.ts
@@ -1,11 +1,14 @@
+import { of } from 'rxjs'
 import { map, 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 { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
 import { 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 { VideoPrivacy, VideoLive } from '@shared/models'
+import { LiveVideo, LiveVideoUpdate, VideoPrivacy } from '@shared/models'
 import { hydrateFormFromVideo } from './shared/video-edit-utils'
 
 @Component({
@@ -15,9 +18,10 @@ import { hydrateFormFromVideo } from './shared/video-edit-utils'
 })
 export class VideoUpdateComponent extends FormReactive implements OnInit {
   video: VideoEdit
+  videoDetails: VideoDetails
   userVideoChannels: SelectChannelItem[] = []
   videoCaptions: VideoCaptionEdit[] = []
-  videoLive: VideoLive
+  liveVideo: LiveVideo
 
   isUpdatingVideo = false
   schedulePublicationPossible = false
@@ -32,7 +36,8 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
     private notifier: Notifier,
     private videoService: VideoService,
     private loadingBar: LoadingBarService,
-    private videoCaptionService: VideoCaptionService
+    private videoCaptionService: VideoCaptionService,
+    private liveVideoService: LiveVideoService
     ) {
     super()
   }
@@ -42,21 +47,27 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
 
     this.route.data
         .pipe(map(data => data.videoData))
-        .subscribe(({ video, videoChannels, videoCaptions, videoLive }) => {
+        .subscribe(({ video, videoChannels, videoCaptions, liveVideo }) => {
           this.video = new VideoEdit(video)
+          this.videoDetails = video
+
           this.userVideoChannels = videoChannels
           this.videoCaptions = videoCaptions
-          this.videoLive = videoLive
+          this.liveVideo = liveVideo
 
           this.schedulePublicationPossible = this.video.privacy === VideoPrivacy.PRIVATE
 
-          const videoFiles = (video as VideoDetails).getFiles()
-          if (videoFiles.length > 1) { // Already transcoded
-            this.waitTranscodingEnabled = false
-          }
-
           // FIXME: Angular does not detect the change inside this subscription, so use the patched setTimeout
-          setTimeout(() => hydrateFormFromVideo(this.form, this.video, true))
+          setTimeout(() => {
+            hydrateFormFromVideo(this.form, this.video, true)
+
+            if (this.liveVideo) {
+              this.form.patchValue({
+                saveReplay: this.liveVideo.saveReplay,
+                permanentLive: this.liveVideo.permanentLive
+              })
+            }
+          })
         },
 
         err => {
@@ -94,6 +105,18 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
     return this.form.valid
   }
 
+  isWaitTranscodingEnabled () {
+    if (this.videoDetails.getFiles().length > 1) { // Already transcoded
+      return false
+    }
+
+    if (this.liveVideo && this.form.value['saveReplay'] !== true) {
+      return false
+    }
+
+    return true
+  }
+
   update () {
     if (this.checkForm() === false
       || this.isUpdatingVideo === true) {
@@ -109,7 +132,23 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
     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
+            }
+
+            // 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(
           () => {
@@ -117,7 +156,7 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
             this.isUpdatingVideo = false
             this.loadingBar.useRef().complete()
             this.notifier.success($localize`Video updated.`)
-            this.router.navigate([ '/videos/watch', this.video.uuid ])
+            this.router.navigate([ '/w', this.video.uuid ])
           },
 
           err => {