Refractor video upload/import

1 files changed, 13 insertions, 45 deletions

diff --git a/client/src/app/videos/+video-edit/video-import.component.ts b/client/src/app/videos/+video-edit/video-import.component.ts
index 5f14efd54..5d355dc8b 100644
--- a/client/src/app/videos/+video-edit/video-import.component.ts
+++ b/client/src/app/videos/+video-edit/video-import.component.ts
@@ -2,19 +2,16 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core'
 import { Router } from '@angular/router'
 import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service'
 import { NotificationsService } from 'angular2-notifications'
-import { VideoConstant, VideoPrivacy, VideoUpdate } from '../../../../../shared/models/videos'
+import { VideoPrivacy, VideoUpdate } from '../../../../../shared/models/videos'
 import { AuthService, ServerService } from '../../core'
-import { FormReactive } from '../../shared'
-import { populateAsyncUserVideoChannels } from '../../shared/misc/utils'
 import { VideoService } from '../../shared/video/video.service'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
-import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model'
 import { VideoImportService } from '@app/shared/video-import'
 import { VideoEdit } from '@app/shared/video/video-edit.model'
-import { switchMap } from 'rxjs/operators'
 import { LoadingBarService } from '@ngx-loading-bar/core'
 import { VideoCaptionService } from '@app/shared/video-caption'
+import { VideoSend } from '@app/videos/+video-edit/shared/video-send'
 
 @Component({
   selector: 'my-video-import',
@@ -24,7 +21,7 @@ import { VideoCaptionService } from '@app/shared/video-caption'
     './video-import.component.scss'
   ]
 })
-export class VideoImportComponent extends FormReactive implements OnInit, CanComponentDeactivate {
+export class VideoImportComponent extends VideoSend implements OnInit, CanComponentDeactivate {
   @Output() firstStepDone = new EventEmitter<string>()
 
   targetUrl = ''
@@ -34,55 +31,33 @@ export class VideoImportComponent extends FormReactive implements OnInit, CanCom
   hasImportedVideo = false
   isUpdatingVideo = false
 
-  userVideoChannels: { id: number, label: string, support: string }[] = []
-  videoPrivacies: VideoConstant<string>[] = []
-  videoCaptions: VideoCaptionEdit[] = []
-
-  firstStepPrivacyId = 0
-  firstStepChannelId = 0
   video: VideoEdit
 
+  protected readonly DEFAULT_VIDEO_PRIVACY = VideoPrivacy.PRIVATE
+
   constructor (
     protected formValidatorService: FormValidatorService,
+    protected loadingBar: LoadingBarService,
+    protected notificationsService: NotificationsService,
+    protected authService: AuthService,
+    protected serverService: ServerService,
+    protected videoService: VideoService,
+    protected videoCaptionService: VideoCaptionService,
     private router: Router,
-    private loadingBar: LoadingBarService,
-    private notificationsService: NotificationsService,
-    private authService: AuthService,
-    private serverService: ServerService,
-    private videoService: VideoService,
     private videoImportService: VideoImportService,
-    private videoCaptionService: VideoCaptionService,
     private i18n: I18n
   ) {
     super()
   }
 
   ngOnInit () {
-    this.buildForm({})
-
-    populateAsyncUserVideoChannels(this.authService, this.userVideoChannels)
-      .then(() => this.firstStepChannelId = this.userVideoChannels[ 0 ].id)
-
-    this.serverService.videoPrivaciesLoaded
-        .subscribe(
-          () => {
-            this.videoPrivacies = this.serverService.getVideoPrivacies()
-
-            // Private by default
-            this.firstStepPrivacyId = VideoPrivacy.PRIVATE
-          })
+    super.ngOnInit()
   }
 
   canDeactivate () {
     return { canDeactivate: true }
   }
 
-  checkForm () {
-    this.forceCheck()
-
-    return this.form.valid
-  }
-
   isTargetUrlValid () {
     return this.targetUrl && this.targetUrl.match(/https?:\/\//)
   }
@@ -130,26 +105,19 @@ export class VideoImportComponent extends FormReactive implements OnInit, CanCom
 
     this.video.patch(this.form.value)
 
-    this.loadingBar.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))
-        )
+    this.updateVideoAndCaptions(this.video)
         .subscribe(
           () => {
             this.isUpdatingVideo = false
-            this.loadingBar.complete()
             this.notificationsService.success(this.i18n('Success'), this.i18n('Video to import updated.'))
 
             this.router.navigate([ '/my-account', 'video-imports' ])
           },
 
           err => {
-            this.loadingBar.complete()
             this.isUpdatingVideo = false
             this.notificationsService.error(this.i18n('Error'), err.message)
             console.error(err)