X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fshared-video-miniature%2Fvideo-download.component.ts;h=355ce8be3bd04bdd81082cd2aede0e028c9dfeb7;hb=262f8ff63109c8a95d9d149c1951cffd4c8301ef;hp=a57e4ce6d9dc6f670de5aaefbd0b702ed15c180a;hpb=4bc45da342597fb49593fc14c40f8dc5a97bb64e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/shared/shared-video-miniature/video-download.component.ts b/client/src/app/shared/shared-video-miniature/video-download.component.ts
index a57e4ce6d..355ce8be3 100644
--- a/client/src/app/shared/shared-video-miniature/video-download.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-download.component.ts
@@ -1,5 +1,4 @@
 import { mapValues, pick } from 'lodash-es'
-import { pipe } from 'rxjs'
 import { tap } from 'rxjs/operators'
 import { Component, ElementRef, Inject, LOCALE_ID, ViewChild } from '@angular/core'
 import { AuthService, HooksService, Notifier } from '@app/core'
@@ -18,23 +17,27 @@ type FileMetadata = { [key: string]: { label: string, value: string }}
 export class VideoDownloadComponent {
   @ViewChild('modal', { static: true }) modal: ElementRef
 
-  downloadType: 'direct' | 'torrent' = 'torrent'
+  downloadType: 'direct' | 'torrent' = 'direct'
+
   resolutionId: number | string = -1
   subtitleLanguageId: string
 
-  video: VideoDetails
-  videoFile: VideoFile
   videoFileMetadataFormat: FileMetadata
   videoFileMetadataVideoStream: FileMetadata | undefined
   videoFileMetadataAudioStream: FileMetadata | undefined
-  videoCaptions: VideoCaption[]
-  activeModal: NgbModalRef
+
+  isAdvancedCustomizationCollapsed = true
 
   type: DownloadType = 'video'
 
+  private activeModal: NgbModalRef
+
   private bytesPipe: BytesPipe
   private numbersPipe: NumberFormatterPipe
 
+  private video: VideoDetails
+  private videoCaptions: VideoCaption[]
+
   constructor (
     @Inject(LOCALE_ID) private localeId: string,
     private notifier: Notifier,
@@ -59,16 +62,25 @@ export class VideoDownloadComponent {
     return this.video.getFiles()
   }
 
+  getCaptions () {
+    if (!this.videoCaptions) return []
+
+    return this.videoCaptions
+  }
+
   show (video: VideoDetails, videoCaptions?: VideoCaption[]) {
     this.video = video
-    this.videoCaptions = videoCaptions && videoCaptions.length ? videoCaptions : undefined
+    this.videoCaptions = videoCaptions
 
     this.activeModal = this.modalService.open(this.modal, { centered: true })
 
-    this.resolutionId = this.getVideoFiles()[0].resolution.id
-    this.onResolutionIdChange()
+    if (this.hasFiles()) {
+      this.onResolutionIdChange(this.getVideoFiles()[0].resolution.id)
+    }
 
-    if (this.videoCaptions) this.subtitleLanguageId = this.videoCaptions[0].language.id
+    if (this.hasCaptions()) {
+      this.subtitleLanguageId = this.videoCaptions[0].language.id
+    }
 
     this.activeModal.shown.subscribe(() => {
       this.hooks.runAction('action:modal.video-download.shown', 'common')
@@ -82,48 +94,63 @@ export class VideoDownloadComponent {
 
   download () {
     window.location.assign(this.getLink())
+
     this.activeModal.close()
   }
 
   getLink () {
     return this.type === 'subtitles' && this.videoCaptions
-      ? this.getSubtitlesLink()
+      ? this.getCaptionLink()
       : this.getVideoFileLink()
   }
 
-  async onResolutionIdChange () {
-    this.videoFile = this.getVideoFile()
-    if (this.videoFile.metadata || !this.videoFile.metadataUrl) return
+  async onResolutionIdChange (resolutionId: number) {
+    this.resolutionId = resolutionId
+
+    const videoFile = this.getVideoFile()
+
+    if (!videoFile.metadata) {
+      if (!videoFile.metadataUrl) return
+
+      await this.hydrateMetadataFromMetadataUrl(videoFile)
+    }
 
-    await this.hydrateMetadataFromMetadataUrl(this.videoFile)
-    if (!this.videoFile.metadata) return
+    if (!videoFile.metadata) return
 
-    this.videoFileMetadataFormat = this.videoFile
-      ? this.getMetadataFormat(this.videoFile.metadata.format)
+    this.videoFileMetadataFormat = videoFile
+      ? this.getMetadataFormat(videoFile.metadata.format)
       : undefined
-    this.videoFileMetadataVideoStream = this.videoFile
-      ? this.getMetadataStream(this.videoFile.metadata.streams, 'video')
+    this.videoFileMetadataVideoStream = videoFile
+      ? this.getMetadataStream(videoFile.metadata.streams, 'video')
       : undefined
-    this.videoFileMetadataAudioStream = this.videoFile
-      ? this.getMetadataStream(this.videoFile.metadata.streams, 'audio')
+    this.videoFileMetadataAudioStream = videoFile
+      ? this.getMetadataStream(videoFile.metadata.streams, 'audio')
       : undefined
   }
 
+  onSubtitleIdChange (subtitleId: string) {
+    this.subtitleLanguageId = subtitleId
+  }
+
+  hasFiles () {
+    return this.getVideoFiles().length !== 0
+  }
+
   getVideoFile () {
-    // HTML select send us a string, so convert it to a number
-    this.resolutionId = parseInt(this.resolutionId.toString(), 10)
+    const file = this.getVideoFiles()
+                     .find(f => f.resolution.id === this.resolutionId)
 
-    const file = this.getVideoFiles().find(f => f.resolution.id === this.resolutionId)
     if (!file) {
       console.error('Could not find file with resolution %d.', this.resolutionId)
-      return
+      return undefined
     }
+
     return file
   }
 
   getVideoFileLink () {
-    const file = this.videoFile
-    if (!file) return
+    const file = this.getVideoFile()
+    if (!file) return ''
 
     const suffix = this.isConfidentialVideo()
       ? '?access_token=' + this.auth.getAccessToken()
@@ -138,12 +165,31 @@ export class VideoDownloadComponent {
     }
   }
 
-  isConfidentialVideo () {
-    return this.video.privacy.id === VideoPrivacy.PRIVATE || this.video.privacy.id === VideoPrivacy.INTERNAL
+  hasCaptions () {
+    return this.getCaptions().length !== 0
   }
 
-  getSubtitlesLink () {
-    return window.location.origin + this.videoCaptions.find(caption => caption.language.id === this.subtitleLanguageId).captionPath
+  getCaption () {
+    const caption = this.getCaptions()
+                        .find(c => c.language.id === this.subtitleLanguageId)
+
+    if (!caption) {
+      console.error('Cannot find caption %s.', this.subtitleLanguageId)
+      return undefined
+    }
+
+    return caption
+  }
+
+  getCaptionLink () {
+    const caption = this.getCaption()
+    if (!caption) return ''
+
+    return window.location.origin + caption.captionPath
+  }
+
+  isConfidentialVideo () {
+    return this.video.privacy.id === VideoPrivacy.PRIVATE || this.video.privacy.id === VideoPrivacy.INTERNAL
   }
 
   activateCopiedMessage () {
@@ -154,7 +200,14 @@ export class VideoDownloadComponent {
     this.type = type
   }
 
-  getMetadataFormat (format: any) {
+  getFileMetadata () {
+    const file = this.getVideoFile()
+    if (!file) return undefined
+
+    return file.metadata
+  }
+
+  private getMetadataFormat (format: any) {
     const keyToTranslateFunction = {
       'encoder': (value: string) => ({ label: $localize`Encoder`, value }),
       'format_long_name': (value: string) => ({ label: $localize`Format name`, value }),
@@ -175,7 +228,7 @@ export class VideoDownloadComponent {
     )
   }
 
-  getMetadataStream (streams: any[], type: 'video' | 'audio') {
+  private getMetadataStream (streams: any[], type: 'video' | 'audio') {
     const stream = streams.find(s => s.codec_type === type)
     if (!stream) return undefined