X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-format-utils.ts;h=21f0e0a68b7767f8544a4c0351d5959c149dcd4b;hb=8319d6ae72d4da6de51bd3d4b5c68040fc8dc3b4;hp=284539deff6551125d3c15e9df5df6f027ee1f90;hpb=bfbd912886eba17b4aa9a40dcef2fddc685d85bf;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-format-utils.ts b/server/models/video/video-format-utils.ts index 284539def..21f0e0a68 100644 --- a/server/models/video/video-format-utils.ts +++ b/server/models/video/video-format-utils.ts @@ -1,12 +1,6 @@ -import { Video, VideoDetails, VideoFile } from '../../../shared/models/videos' +import { Video, VideoDetails } from '../../../shared/models/videos' import { VideoModel } from './video' -import { VideoFileModel } from './video-file' -import { - ActivityPlaylistInfohashesObject, - ActivityPlaylistSegmentHashesObject, - ActivityUrlObject, - VideoTorrentObject -} from '../../../shared/models/activitypub/objects' +import { ActivityTagObject, ActivityUrlObject, VideoTorrentObject } from '../../../shared/models/activitypub/objects' import { MIMETYPES, WEBSERVER } from '../../initializers/constants' import { VideoCaptionModel } from './video-caption' import { @@ -17,18 +11,31 @@ import { } from '../../lib/activitypub' import { isArray } from '../../helpers/custom-validators/misc' import { VideoStreamingPlaylist } from '../../../shared/models/videos/video-streaming-playlist.model' -import { VideoStreamingPlaylistModel } from './video-streaming-playlist' +import { + MStreamingPlaylistRedundanciesOpt, + MStreamingPlaylistVideo, + MVideo, + MVideoAP, + MVideoFile, + MVideoFormattable, + MVideoFormattableDetails +} from '../../typings/models' +import { MVideoFileRedundanciesOpt } from '../../typings/models/video/video-file' +import { VideoFile } from '@shared/models/videos/video-file.model' +import { generateMagnetUri } from '@server/helpers/webtorrent' +import { extractVideo } from '@server/lib/videos' export type VideoFormattingJSONOptions = { completeDescription?: boolean additionalAttributes: { - state?: boolean, - waitTranscoding?: boolean, - scheduledUpdate?: boolean, + state?: boolean + waitTranscoding?: boolean + scheduledUpdate?: boolean blacklistInfo?: boolean } } -function videoModelToFormattedJSON (video: VideoModel, options?: VideoFormattingJSONOptions): Video { + +function videoModelToFormattedJSON (video: MVideoFormattable, options?: VideoFormattingJSONOptions): Video { const userHistory = isArray(video.UserVideoHistories) ? video.UserVideoHistories[0] : undefined const videoObject: Video = { @@ -102,7 +109,7 @@ function videoModelToFormattedJSON (video: VideoModel, options?: VideoFormatting return videoObject } -function videoModelToFormattedDetailsJSON (video: VideoModel): VideoDetails { +function videoModelToFormattedDetailsJSON (video: MVideoFormattableDetails): VideoDetails { const formattedJson = video.toFormattedJSON({ additionalAttributes: { scheduledUpdate: true, @@ -137,49 +144,58 @@ function videoModelToFormattedDetailsJSON (video: VideoModel): VideoDetails { } // Format and sort video files - detailsJson.files = videoFilesModelToFormattedJSON(video, video.VideoFiles) + detailsJson.files = videoFilesModelToFormattedJSON(video, baseUrlHttp, baseUrlWs, video.VideoFiles) return Object.assign(formattedJson, detailsJson) } -function streamingPlaylistsModelToFormattedJSON (video: VideoModel, playlists: VideoStreamingPlaylistModel[]): VideoStreamingPlaylist[] { +function streamingPlaylistsModelToFormattedJSON (video: MVideo, playlists: MStreamingPlaylistRedundanciesOpt[]): VideoStreamingPlaylist[] { if (isArray(playlists) === false) return [] + const { baseUrlHttp, baseUrlWs } = video.getBaseUrls() + return playlists .map(playlist => { + const playlistWithVideo = Object.assign(playlist, { Video: video }) + const redundancies = isArray(playlist.RedundancyVideos) ? playlist.RedundancyVideos.map(r => ({ baseUrl: r.fileUrl })) : [] + const files = videoFilesModelToFormattedJSON(playlistWithVideo, baseUrlHttp, baseUrlWs, playlist.VideoFiles) + return { id: playlist.id, type: playlist.type, playlistUrl: playlist.playlistUrl, segmentsSha256Url: playlist.segmentsSha256Url, - redundancies - } as VideoStreamingPlaylist + redundancies, + files + } }) } -function videoFilesModelToFormattedJSON (video: VideoModel, videoFiles: VideoFileModel[]): VideoFile[] { - const { baseUrlHttp, baseUrlWs } = video.getBaseUrls() - +function videoFilesModelToFormattedJSON ( + model: MVideo | MStreamingPlaylistVideo, + baseUrlHttp: string, + baseUrlWs: string, + videoFiles: MVideoFileRedundanciesOpt[] +): VideoFile[] { return videoFiles .map(videoFile => { - let resolutionLabel = videoFile.resolution + 'p' - return { resolution: { id: videoFile.resolution, - label: resolutionLabel + label: videoFile.resolution + 'p' }, - magnetUri: video.generateMagnetUri(videoFile, baseUrlHttp, baseUrlWs), + magnetUri: generateMagnetUri(model, videoFile, baseUrlHttp, baseUrlWs), size: videoFile.size, fps: videoFile.fps, - torrentUrl: video.getTorrentUrl(videoFile, baseUrlHttp), - torrentDownloadUrl: video.getTorrentDownloadUrl(videoFile, baseUrlHttp), - fileUrl: video.getVideoFileUrl(videoFile, baseUrlHttp), - fileDownloadUrl: video.getVideoFileDownloadUrl(videoFile, baseUrlHttp) + torrentUrl: model.getTorrentUrl(videoFile, baseUrlHttp), + torrentDownloadUrl: model.getTorrentDownloadUrl(videoFile, baseUrlHttp), + fileUrl: model.getVideoFileUrl(videoFile, baseUrlHttp), + fileDownloadUrl: model.getVideoFileDownloadUrl(videoFile, baseUrlHttp), + metadataUrl: videoFile.metadataUrl // only send the metadataUrl and not the metadata over the wire } as VideoFile }) .sort((a, b) => { @@ -189,7 +205,49 @@ function videoFilesModelToFormattedJSON (video: VideoModel, videoFiles: VideoFil }) } -function videoModelToActivityPubObject (video: VideoModel): VideoTorrentObject { +function addVideoFilesInAPAcc ( + acc: ActivityUrlObject[] | ActivityTagObject[], + model: MVideoAP | MStreamingPlaylistVideo, + baseUrlHttp: string, + baseUrlWs: string, + files: MVideoFile[] +) { + for (const file of files) { + acc.push({ + type: 'Link', + mediaType: MIMETYPES.VIDEO.EXT_MIMETYPE[file.extname] as any, + href: model.getVideoFileUrl(file, baseUrlHttp), + height: file.resolution, + size: file.size, + fps: file.fps + }) + + acc.push({ + type: 'Link', + rel: [ 'metadata', MIMETYPES.VIDEO.EXT_MIMETYPE[file.extname] ], + mediaType: 'application/json' as 'application/json', + href: extractVideo(model).getVideoFileMetadataUrl(file, baseUrlHttp), + height: file.resolution, + fps: file.fps + }) + + acc.push({ + type: 'Link', + mediaType: 'application/x-bittorrent' as 'application/x-bittorrent', + href: model.getTorrentUrl(file, baseUrlHttp), + height: file.resolution + }) + + acc.push({ + type: 'Link', + mediaType: 'application/x-bittorrent;x-scheme-handler/magnet' as 'application/x-bittorrent;x-scheme-handler/magnet', + href: generateMagnetUri(model, file, baseUrlHttp, baseUrlWs), + height: file.resolution + }) + } +} + +function videoModelToActivityPubObject (video: MVideoAP): VideoTorrentObject { const { baseUrlHttp, baseUrlWs } = video.getBaseUrls() if (!video.Tags) video.Tags = [] @@ -222,74 +280,48 @@ function videoModelToActivityPubObject (video: VideoModel): VideoTorrentObject { } } - const url: ActivityUrlObject[] = [] - for (const file of video.VideoFiles) { - url.push({ + const url: ActivityUrlObject[] = [ + // HTML url should be the first element in the array so Mastodon correctly displays the embed + { type: 'Link', - mimeType: MIMETYPES.VIDEO.EXT_MIMETYPE[ file.extname ] as any, - mediaType: MIMETYPES.VIDEO.EXT_MIMETYPE[ file.extname ] as any, - href: video.getVideoFileUrl(file, baseUrlHttp), - height: file.resolution, - size: file.size, - fps: file.fps - }) - - url.push({ - type: 'Link', - mimeType: 'application/x-bittorrent' as 'application/x-bittorrent', - mediaType: 'application/x-bittorrent' as 'application/x-bittorrent', - href: video.getTorrentUrl(file, baseUrlHttp), - height: file.resolution - }) + mediaType: 'text/html', + href: WEBSERVER.URL + '/videos/watch/' + video.uuid + } + ] - url.push({ - type: 'Link', - mimeType: 'application/x-bittorrent;x-scheme-handler/magnet' as 'application/x-bittorrent;x-scheme-handler/magnet', - mediaType: 'application/x-bittorrent;x-scheme-handler/magnet' as 'application/x-bittorrent;x-scheme-handler/magnet', - href: video.generateMagnetUri(file, baseUrlHttp, baseUrlWs), - height: file.resolution - }) - } + addVideoFilesInAPAcc(url, video, baseUrlHttp, baseUrlWs, video.VideoFiles || []) for (const playlist of (video.VideoStreamingPlaylists || [])) { - let tag: (ActivityPlaylistSegmentHashesObject | ActivityPlaylistInfohashesObject)[] - - tag = playlist.p2pMediaLoaderInfohashes - .map(i => ({ type: 'Infohash' as 'Infohash', name: i })) + const tag = playlist.p2pMediaLoaderInfohashes + .map(i => ({ type: 'Infohash' as 'Infohash', name: i })) as ActivityTagObject[] tag.push({ type: 'Link', name: 'sha256', - mimeType: 'application/json' as 'application/json', mediaType: 'application/json' as 'application/json', href: playlist.segmentsSha256Url }) + const playlistWithVideo = Object.assign(playlist, { Video: video }) + addVideoFilesInAPAcc(tag, playlistWithVideo, baseUrlHttp, baseUrlWs, playlist.VideoFiles || []) + url.push({ type: 'Link', - mimeType: 'application/x-mpegURL' as 'application/x-mpegURL', mediaType: 'application/x-mpegURL' as 'application/x-mpegURL', href: playlist.playlistUrl, tag }) } - // Add video url too - url.push({ - type: 'Link', - mimeType: 'text/html', - mediaType: 'text/html', - href: WEBSERVER.URL + '/videos/watch/' + video.uuid - }) - const subtitleLanguage = [] for (const caption of video.VideoCaptions) { subtitleLanguage.push({ identifier: caption.language, - name: VideoCaptionModel.getLanguageLabel(caption.language) + name: VideoCaptionModel.getLanguageLabel(caption.language), + url: caption.getFileUrl(video) }) } - const miniature = video.getMiniature() + const icons = [ video.getMiniature(), video.getPreview() ] return { type: 'Video' as 'Video', @@ -314,13 +346,13 @@ function videoModelToActivityPubObject (video: VideoModel): VideoTorrentObject { content: video.getTruncatedDescription(), support: video.support, subtitleLanguage, - icon: { + icon: icons.map(i => ({ type: 'Image', - url: miniature.getFileUrl(), + url: i.getFileUrl(video), mediaType: 'image/jpeg', - width: miniature.width, - height: miniature.height - }, + width: i.width, + height: i.height + })), url, likes: getVideoLikesActivityPubUrl(video), dislikes: getVideoDislikesActivityPubUrl(video),