From 262f8ff63109c8a95d9d149c1951cffd4c8301ef Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 25 Jun 2021 17:02:39 +0200 Subject: [PATCH] Fix subtitle download --- .../abstract-video-list.ts | 1 - .../video-download.component.html | 132 ++++++++++-------- .../video-download.component.scss | 16 +-- .../video-download.component.ts | 110 +++++++++++---- 4 files changed, 161 insertions(+), 98 deletions(-) diff --git a/client/src/app/shared/shared-video-miniature/abstract-video-list.ts b/client/src/app/shared/shared-video-miniature/abstract-video-list.ts index bf433aabd..52e72d35b 100644 --- a/client/src/app/shared/shared-video-miniature/abstract-video-list.ts +++ b/client/src/app/shared/shared-video-miniature/abstract-video-list.ts @@ -196,7 +196,6 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, AfterConte // No more results if (this.lastQueryLength !== undefined && this.lastQueryLength < this.pagination.itemsPerPage) return - console.log('near of bottom') this.pagination.currentPage += 1 this.setScrollRouteParams() diff --git a/client/src/app/shared/shared-video-miniature/video-download.component.html b/client/src/app/shared/shared-video-miniature/video-download.component.html index 4ac74c106..b50544057 100644 --- a/client/src/app/shared/shared-video-miniature/video-download.component.html +++ b/client/src/app/shared/shared-video-miniature/video-download.component.html @@ -3,16 +3,14 @@

Download -
- - {{ type }} - -
- - -
+
+

+ @@ -21,20 +19,35 @@ The following link contains a private token and should not be shared with anyone. + -
- -
- -
+
+ + + {{ caption.language.label }} + + +
+
+ + +
+ +
+
+
+ +
+ +
+
- {{ file.resolution.label }} @@ -52,64 +65,69 @@
+
- -
- - Format +
+ + Format + +
+
+ {{ item.value.label }} + {{ item.value.value }} +
+
+ + + + Video stream
-
+
{{ item.value.label }} {{ item.value.value }}
+ - - Video stream - -
-
- {{ item.value.label }} - {{ item.value.value }} -
-
- - - - - Audio stream - -
-
- {{ item.value.label }} - {{ item.value.value }} -
+ + Audio stream + +
+
+ {{ item.value.label }} + {{ item.value.value }}
- - - +
+ + + +
+ +
+ +
+
+ +
-
-
-
- - -
-
- - -
+ +
+ +
- +
-
+
diff --git a/client/src/app/shared/shared-video-miniature/video-download.component.scss b/client/src/app/shared/shared-video-miniature/video-download.component.scss index b0d80e530..f03034571 100644 --- a/client/src/app/shared/shared-video-miniature/video-download.component.scss +++ b/client/src/app/shared/shared-video-miniature/video-download.component.scss @@ -23,18 +23,12 @@ } } -.peertube-select-container { - @include peertube-select-container(85px); +.peertube-select-container.title-select { + @include peertube-select-container(auto); - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-right: 0; - - select { - height: inherit; - border-top-left-radius: .2rem; - border-bottom-left-radius: .2rem; - } + display: inline-block; + margin-left: 10px; + vertical-align: top; } #dropdown-download-type { 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 1e3745d94..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' @@ -19,24 +18,26 @@ export class VideoDownloadComponent { @ViewChild('modal', { static: true }) modal: ElementRef 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, @@ -61,15 +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.onResolutionIdChange(this.getVideoFiles()[0].resolution.id) + 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') @@ -83,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 (resolutionId: number) { this.resolutionId = resolutionId - this.videoFile = this.getVideoFile() - if (!this.videoFile.metadata) { - if (!this.videoFile.metadataUrl) return + const videoFile = this.getVideoFile() + + if (!videoFile.metadata) { + if (!videoFile.metadataUrl) return - await this.hydrateMetadataFromMetadataUrl(this.videoFile) + await this.hydrateMetadataFromMetadataUrl(videoFile) } - this.videoFileMetadataFormat = this.videoFile - ? this.getMetadataFormat(this.videoFile.metadata.format) + 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 () { - 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() @@ -139,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 + } + + 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 } - getSubtitlesLink () { - return window.location.origin + this.videoCaptions.find(caption => caption.language.id === this.subtitleLanguageId).captionPath + 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 () { @@ -155,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 }), @@ -176,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 -- 2.41.0