X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fapp%2Fshared%2Fshared-video-miniature%2Fvideo-download.component.ts;h=5328f5170d650d4465f6be35c8461bd53d9375ff;hb=02b286f89088e07cac7e7068e884d3be0fd0098b;hp=e3d6a1969ee62a82f7287f49fe8bec82944c97d6;hpb=94676e631c5045144da598fefbefaa3cfcaaeb0d;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 e3d6a1969..5328f5170 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,8 +1,9 @@ import { mapValues, pick } from 'lodash-es' -import { Component, ElementRef, ViewChild } from '@angular/core' -import { AuthService, Notifier } from '@app/core' -import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap' -import { I18n } from '@ngx-translate/i18n-polyfill' +import { firstValueFrom } from 'rxjs' +import { tap } from 'rxjs/operators' +import { Component, ElementRef, Inject, LOCALE_ID, ViewChild } from '@angular/core' +import { AuthService, HooksService, Notifier } from '@app/core' +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' import { VideoCaption, VideoFile, VideoPrivacy } from '@shared/models' import { BytesPipe, NumberFormatterPipe, VideoDetails, VideoService } from '../shared-main' @@ -17,38 +18,43 @@ 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: NgbActiveModal + + 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, private modalService: NgbModal, private videoService: VideoService, private auth: AuthService, - private i18n: I18n + private hooks: HooksService ) { this.bytesPipe = new BytesPipe() - this.numbersPipe = new NumberFormatterPipe() + this.numbersPipe = new NumberFormatterPipe(this.localeId) } get typeText () { return this.type === 'video' - ? this.i18n('video') - : this.i18n('subtitles') + ? $localize`video` + : $localize`subtitles` } getVideoFiles () { @@ -57,15 +63,29 @@ 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.videoCaptions) this.subtitleLanguageId = this.videoCaptions[0].language.id + if (this.hasFiles()) { + this.onResolutionIdChange(this.getVideoFiles()[0].resolution.id) + } + + if (this.hasCaptions()) { + this.subtitleLanguageId = this.videoCaptions[0].language.id + } + + this.activeModal.shown.subscribe(() => { + this.hooks.runAction('action:modal.video-download.shown', 'common') + }) } onClose () { @@ -75,49 +95,65 @@ 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() - await this.hydrateMetadataFromMetadataUrl(this.videoFile) + if (!videoFile.metadata) { + if (!videoFile.metadataUrl) return - this.videoFileMetadataFormat = this.videoFile - ? this.getMetadataFormat(this.videoFile.metadata.format) + await this.hydrateMetadataFromMetadataUrl(videoFile) + } + + if (!videoFile.metadata) return + + 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.video.privacy.id === VideoPrivacy.PRIVATE || this.video.privacy.id === VideoPrivacy.INTERNAL + const suffix = this.isConfidentialVideo() ? '?access_token=' + this.auth.getAccessToken() : '' @@ -130,25 +166,55 @@ export class VideoDownloadComponent { } } - getSubtitlesLink () { - return window.location.origin + this.videoCaptions.find(caption => caption.language.id === this.subtitleLanguageId).captionPath + hasCaptions () { + return this.getCaptions().length !== 0 + } + + 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 () { - this.notifier.success(this.i18n('Copied')) + this.notifier.success($localize`Copied`) } switchToType (type: DownloadType) { 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: this.i18n('Encoder'), value }), - 'format_long_name': (value: string) => ({ label: this.i18n('Format name'), value }), - 'size': (value: number) => ({ label: this.i18n('Size'), value: this.bytesPipe.transform(value, 2) }), - 'bit_rate': (value: number) => ({ - label: this.i18n('Bitrate'), + encoder: (value: string) => ({ label: $localize`Encoder`, value }), + format_long_name: (value: string) => ({ label: $localize`Format name`, value }), + size: (value: number) => ({ label: $localize`Size`, value: this.bytesPipe.transform(value, 2) }), + bit_rate: (value: number) => ({ + label: $localize`Bitrate`, value: `${this.numbersPipe.transform(value)}bps` }) } @@ -163,30 +229,30 @@ 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 let keyToTranslateFunction = { - 'codec_long_name': (value: string) => ({ label: this.i18n('Codec'), value }), - 'profile': (value: string) => ({ label: this.i18n('Profile'), value }), - 'bit_rate': (value: number) => ({ - label: this.i18n('Bitrate'), + codec_long_name: (value: string) => ({ label: $localize`Codec`, value }), + profile: (value: string) => ({ label: $localize`Profile`, value }), + bit_rate: (value: number) => ({ + label: $localize`Bitrate`, value: `${this.numbersPipe.transform(value)}bps` }) } if (type === 'video') { keyToTranslateFunction = Object.assign(keyToTranslateFunction, { - 'width': (value: number) => ({ label: this.i18n('Resolution'), value: `${value}x${stream.height}` }), - 'display_aspect_ratio': (value: string) => ({ label: this.i18n('Aspect ratio'), value }), - 'avg_frame_rate': (value: string) => ({ label: this.i18n('Average frame rate'), value }), - 'pix_fmt': (value: string) => ({ label: this.i18n('Pixel format'), value }) + width: (value: number) => ({ label: $localize`Resolution`, value: `${value}x${stream.height}` }), + display_aspect_ratio: (value: string) => ({ label: $localize`Aspect ratio`, value }), + avg_frame_rate: (value: string) => ({ label: $localize`Average frame rate`, value }), + pix_fmt: (value: string) => ({ label: $localize`Pixel format`, value }) }) } else { keyToTranslateFunction = Object.assign(keyToTranslateFunction, { - 'sample_rate': (value: number) => ({ label: this.i18n('Sample rate'), value }), - 'channel_layout': (value: number) => ({ label: this.i18n('Channel Layout'), value }) + sample_rate: (value: number) => ({ label: $localize`Sample rate`, value }), + channel_layout: (value: number) => ({ label: $localize`Channel Layout`, value }) }) } @@ -198,8 +264,8 @@ export class VideoDownloadComponent { private hydrateMetadataFromMetadataUrl (file: VideoFile) { const observable = this.videoService.getVideoFileMetadata(file.metadataUrl) - observable.subscribe(res => file.metadata = res) + .pipe(tap(res => file.metadata = res)) - return observable.toPromise() + return firstValueFrom(observable) } }