X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo.ts;h=baa8c120a1ddee8eb7d9e7b50093a4376140b9f9;hb=26818a73ba0d7fd53ca69eba0c8e525f3670b5a8;hp=d2daf18ee573ecae7d3b0875ae83dc465c5b57b0;hpb=d00e9c54f341547f0874015953f203da90846fa7;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video.ts b/server/models/video/video.ts index d2daf18ee..baa8c120a 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -24,26 +24,38 @@ import { Table, UpdatedAt } from 'sequelize-typescript' -import { buildNSFWFilter } from '@server/helpers/express-utils' -import { uuidToShort } from '@server/helpers/uuid' import { getPrivaciesForFederation, isPrivacyForFederation, isStateForFederation } from '@server/helpers/video' import { LiveManager } from '@server/lib/live/live-manager' -import { removeHLSObjectStorage, removeWebTorrentObjectStorage } from '@server/lib/object-storage' -import { getHLSDirectory, getHLSRedundancyDirectory } from '@server/lib/paths' +import { removeHLSFileObjectStorageByFilename, removeHLSObjectStorage, removeWebTorrentObjectStorage } from '@server/lib/object-storage' +import { tracer } from '@server/lib/opentelemetry/tracing' +import { getHLSDirectory, getHLSRedundancyDirectory, getHlsResolutionPlaylistFilename } from '@server/lib/paths' +import { Hooks } from '@server/lib/plugins/hooks' import { VideoPathManager } from '@server/lib/video-path-manager' +import { isVideoInPrivateDirectory } from '@server/lib/video-privacy' import { getServerActor } from '@server/models/application/application' -import { ModelCache } from '@server/models/model-cache' -import { AttributesOnly, buildVideoEmbedPath, buildVideoWatchPath, pick } from '@shared/core-utils' -import { VideoFile } from '@shared/models/videos/video-file.model' -import { ResultList, UserRight, VideoPrivacy, VideoState } from '../../../shared' -import { VideoObject } from '../../../shared/models/activitypub/objects' -import { Video, VideoDetails, VideoRateType, VideoStorage } from '../../../shared/models/videos' -import { ThumbnailType } from '../../../shared/models/videos/thumbnail.type' -import { VideoFilter } from '../../../shared/models/videos/video-query.type' -import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type' +import { ModelCache } from '@server/models/shared/model-cache' +import { buildVideoEmbedPath, buildVideoWatchPath, pick } from '@shared/core-utils' +import { uuidToShort } from '@shared/extra-utils' +import { ffprobePromise, getAudioStream, getVideoStreamDimensionsInfo, getVideoStreamFPS, hasAudioStream } from '@shared/ffmpeg' +import { + ResultList, + ThumbnailType, + UserRight, + Video, + VideoDetails, + VideoFile, + VideoInclude, + VideoObject, + VideoPrivacy, + VideoRateType, + VideoState, + VideoStorage, + VideoStreamingPlaylistType +} from '@shared/models' +import { AttributesOnly } from '@shared/typescript-utils' import { peertubeTruncate } from '../../helpers/core-utils' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' -import { isBooleanValid } from '../../helpers/custom-validators/misc' +import { exists, isBooleanValid, isUUIDValid } from '../../helpers/custom-validators/misc' import { isVideoDescriptionValid, isVideoDurationValid, @@ -52,7 +64,6 @@ import { isVideoStateValid, isVideoSupportValid } from '../../helpers/custom-validators/videos' -import { getVideoFileResolution } from '../../helpers/ffprobe-utils' import { logger } from '../../helpers/logger' import { CONFIG } from '../../initializers/config' import { ACTIVITY_PUB, API_VERSION, CONSTRAINTS_FIELDS, LAZY_STATIC_PATHS, STATIC_PATHS, WEBSERVER } from '../../initializers/constants' @@ -93,10 +104,10 @@ import { VideoRedundancyModel } from '../redundancy/video-redundancy' import { ServerModel } from '../server/server' import { TrackerModel } from '../server/tracker' import { VideoTrackerModel } from '../server/video-tracker' -import { setAsUpdated } from '../shared' +import { buildTrigramSearchIndex, buildWhereIdOrUUID, getVideoSort, isOutdated, setAsUpdated, throwIfNotValid } from '../shared' import { UserModel } from '../user/user' import { UserVideoHistoryModel } from '../user/user-video-history' -import { buildTrigramSearchIndex, buildWhereIdOrUUID, getVideoSort, isOutdated, throwIfNotValid } from '../utils' +import { VideoViewModel } from '../view/video-view' import { videoFilesModelToFormattedJSON, VideoFormattingJSONOptions, @@ -105,9 +116,13 @@ import { videoModelToFormattedJSON } from './formatter/video-format-utils' import { ScheduleVideoUpdateModel } from './schedule-video-update' -import { VideosModelGetQueryBuilder } from './sql/video-model-get-query-builder' -import { BuildVideosListQueryOptions, VideosIdListQueryBuilder } from './sql/videos-id-list-query-builder' -import { VideosModelListQueryBuilder } from './sql/videos-model-list-query-builder' +import { + BuildVideosListQueryOptions, + DisplayOnlyForFollowerOptions, + VideoModelGetQueryBuilder, + VideosIdListQueryBuilder, + VideosModelListQueryBuilder +} from './sql/video' import { TagModel } from './tag' import { ThumbnailModel } from './thumbnail' import { VideoBlacklistModel } from './video-blacklist' @@ -120,9 +135,9 @@ import { VideoJobInfoModel } from './video-job-info' import { VideoLiveModel } from './video-live' import { VideoPlaylistElementModel } from './video-playlist-element' import { VideoShareModel } from './video-share' +import { VideoSourceModel } from './video-source' import { VideoStreamingPlaylistModel } from './video-streaming-playlist' import { VideoTagModel } from './video-tag' -import { VideoViewModel } from './video-view' export enum ScopeNames { FOR_API = 'FOR_API', @@ -145,35 +160,6 @@ export type ForAPIOptions = { withAccountBlockerIds?: number[] } -export type AvailableForListIDsOptions = { - serverAccountId: number - followerActorId: number - includeLocalVideos: boolean - - attributesType?: 'none' | 'id' | 'all' - - filter?: VideoFilter - categoryOneOf?: number[] - nsfw?: boolean - licenceOneOf?: number[] - languageOneOf?: string[] - tagsOneOf?: string[] - tagsAllOf?: string[] - - withFiles?: boolean - - accountId?: number - videoChannelId?: number - - videoPlaylistId?: number - - trendingDays?: number - user?: MUserAccountId - historyOfUser?: MUserId - - baseWhere?: WhereOptions[] -} - @Scopes(() => ({ [ScopeNames.WITH_IMMUTABLE_ATTRIBUTES]: { attributes: [ 'id', 'url', 'uuid', 'remote' ] @@ -249,8 +235,8 @@ export type AvailableForListIDsOptions = { required: false }, { - model: ActorImageModel.unscoped(), - as: 'Avatar', + model: ActorImageModel, + as: 'Avatars', required: false } ] @@ -272,8 +258,8 @@ export type AvailableForListIDsOptions = { required: false }, { - model: ActorImageModel.unscoped(), - as: 'Avatar', + model: ActorImageModel, + as: 'Avatars', required: false } ] @@ -613,6 +599,15 @@ export class VideoModel extends Model>> { }) VideoPlaylistElements: VideoPlaylistElementModel[] + @HasOne(() => VideoSourceModel, { + foreignKey: { + name: 'videoId', + allowNull: true + }, + onDelete: 'CASCADE' + }) + VideoSource: VideoSourceModel + @HasMany(() => VideoAbuseModel, { foreignKey: { name: 'videoId', @@ -711,6 +706,7 @@ export class VideoModel extends Model>> { name: 'videoId', allowNull: false }, + hooks: true, onDelete: 'cascade' }) VideoLive: VideoLiveModel @@ -775,7 +771,7 @@ export class VideoModel extends Model>> { // Remove physical files and torrents instance.VideoFiles.forEach(file => { - tasks.push(instance.removeFileAndTorrent(file)) + tasks.push(instance.removeWebTorrentFile(file)) }) // Remove playlists file @@ -790,9 +786,8 @@ export class VideoModel extends Model>> { // Do not wait video deletion because we could be in a transaction Promise.all(tasks) - .catch(err => { - logger.error('Some errors when removing files of video %s in before destroy hook.', instance.uuid, { err }) - }) + .then(() => logger.info('Removed files of video %s.', instance.url)) + .catch(err => logger.error('Some errors when removing files of video %s in before destroy hook.', instance.uuid, { err })) return undefined } @@ -803,7 +798,7 @@ export class VideoModel extends Model>> { logger.info('Stopping live of video %s after video deletion.', instance.uuid) - LiveManager.Instance.stopSessionOf(instance.id) + LiveManager.Instance.stopSessionOf(instance.uuid, null) } @BeforeDestroy @@ -834,14 +829,17 @@ export class VideoModel extends Model>> { await Promise.all(tasks) } - static listLocal (): Promise { + static listLocalIds (): Promise { const query = { + attributes: [ 'id' ], + raw: true, where: { remote: false } } return VideoModel.findAll(query) + .then(rows => rows.map(r => r.id)) } static listAllAndSharedByActorForOutbox (actorId: number, start: number, count: number) { @@ -864,7 +862,7 @@ export class VideoModel extends Model>> { distinct: true, offset: start, limit: count, - order: getVideoSort('-createdAt', [ 'Tags', 'name', 'ASC' ] as any), // FIXME: sequelize typings + order: getVideoSort('-createdAt', [ 'Tags', 'name', 'ASC' ]), where: { id: { [Op.in]: Sequelize.literal('(' + rawQuery + ')') @@ -953,7 +951,7 @@ export class VideoModel extends Model>> { const total = totalVideos + totalVideoShares return { data: rows, - total: total + total } }) } @@ -978,12 +976,14 @@ export class VideoModel extends Model>> { start: number count: number sort: string + + channelId?: number isLive?: boolean search?: string }) { - const { accountId, start, count, sort, search, isLive } = options + const { accountId, channelId, start, count, sort, search, isLive } = options - function buildBaseQuery (): FindOptions { + function buildBaseQuery (forCount: boolean): FindOptions { const where: WhereOptions = {} if (search) { @@ -992,10 +992,14 @@ export class VideoModel extends Model>> { } } - if (isLive) { + if (exists(isLive)) { where.isLive = isLive } + const channelWhere = channelId + ? { id: channelId } + : {} + const baseQuery = { offset: start, limit: count, @@ -1003,11 +1007,16 @@ export class VideoModel extends Model>> { order: getVideoSort(sort), include: [ { - model: VideoChannelModel, + model: forCount + ? VideoChannelModel.unscoped() + : VideoChannelModel, required: true, + where: channelWhere, include: [ { - model: AccountModel, + model: forCount + ? AccountModel.unscoped() + : AccountModel, where: { id: accountId }, @@ -1021,8 +1030,8 @@ export class VideoModel extends Model>> { return baseQuery } - const countQuery = buildBaseQuery() - const findQuery = buildBaseQuery() + const countQuery = buildBaseQuery(true) + const findQuery = buildBaseQuery(false) const findScopes: (string | ScopeOptions)[] = [ ScopeNames.WITH_SCHEDULED_UPDATE, @@ -1047,22 +1056,25 @@ export class VideoModel extends Model>> { sort: string nsfw: boolean - filter?: VideoFilter isLive?: boolean + isLocal?: boolean + include?: VideoInclude - includeLocalVideos: boolean - withFiles: boolean + hasFiles?: boolean // default false + hasWebtorrentFiles?: boolean + hasHLSFiles?: boolean categoryOneOf?: number[] licenceOneOf?: number[] languageOneOf?: string[] tagsOneOf?: string[] tagsAllOf?: string[] + privacyOneOf?: VideoPrivacy[] accountId?: number videoChannelId?: number - followerActorId?: number + displayOnlyForFollower: DisplayOnlyForFollowerOptions | null videoPlaylistId?: number @@ -1074,10 +1086,11 @@ export class VideoModel extends Model>> { countVideos?: boolean search?: string + + excludeAlreadyWatched?: boolean }) { - if ((options.filter === 'all-local' || options.filter === 'all') && !options.user.hasRight(UserRight.SEE_ALL_VIDEOS)) { - throw new Error('Try to filter all-local but no user has not the see all videos right') - } + VideoModel.throwIfPrivateIncludeWithoutUser(options.include, options.user) + VideoModel.throwIfPrivacyOneOfWithoutUser(options.privacyOneOf, options.user) const trendingDays = options.sort.endsWith('trending') ? CONFIG.TRENDING.VIDEOS.INTERVAL_DAYS @@ -1089,11 +1102,6 @@ export class VideoModel extends Model>> { const serverActor = await getServerActor() - // followerActorId === null has a meaning, so just check undefined - const followerActorId = options.followerActorId !== undefined - ? options.followerActorId - : serverActor.id - const queryOptions = { ...pick(options, [ 'start', @@ -1106,19 +1114,23 @@ export class VideoModel extends Model>> { 'languageOneOf', 'tagsOneOf', 'tagsAllOf', - 'filter', - 'withFiles', + 'privacyOneOf', + 'isLocal', + 'include', + 'displayOnlyForFollower', + 'hasFiles', 'accountId', 'videoChannelId', 'videoPlaylistId', - 'includeLocalVideos', 'user', 'historyOfUser', - 'search' + 'hasHLSFiles', + 'hasWebtorrentFiles', + 'search', + 'excludeAlreadyWatched' ]), - followerActorId, - serverAccountId: serverActor.Account.id, + serverAccountIdForBlock: serverActor.Account.id, trendingDays, trendingAlgorithm } @@ -1130,31 +1142,48 @@ export class VideoModel extends Model>> { start: number count: number sort: string - includeLocalVideos: boolean - search?: string - host?: string - startDate?: string // ISO 8601 - endDate?: string // ISO 8601 - originallyPublishedStartDate?: string - originallyPublishedEndDate?: string + nsfw?: boolean isLive?: boolean + isLocal?: boolean + include?: VideoInclude + categoryOneOf?: number[] licenceOneOf?: number[] languageOneOf?: string[] tagsOneOf?: string[] tagsAllOf?: string[] + privacyOneOf?: VideoPrivacy[] + + displayOnlyForFollower: DisplayOnlyForFollowerOptions | null + + user?: MUserAccountId + + hasWebtorrentFiles?: boolean + hasHLSFiles?: boolean + + search?: string + + host?: string + startDate?: string // ISO 8601 + endDate?: string // ISO 8601 + originallyPublishedStartDate?: string + originallyPublishedEndDate?: string + durationMin?: number // seconds durationMax?: number // seconds - user?: MUserAccountId - filter?: VideoFilter uuids?: string[] + + excludeAlreadyWatched?: boolean }) { + VideoModel.throwIfPrivateIncludeWithoutUser(options.include, options.user) + VideoModel.throwIfPrivacyOneOfWithoutUser(options.privacyOneOf, options.user) + const serverActor = await getServerActor() const queryOptions = { ...pick(options, [ - 'includeLocalVideos', + 'include', 'nsfw', 'isLive', 'categoryOneOf', @@ -1162,8 +1191,9 @@ export class VideoModel extends Model>> { 'languageOneOf', 'tagsOneOf', 'tagsAllOf', + 'privacyOneOf', 'user', - 'filter', + 'isLocal', 'host', 'start', 'count', @@ -1174,29 +1204,34 @@ export class VideoModel extends Model>> { 'originallyPublishedEndDate', 'durationMin', 'durationMax', + 'hasHLSFiles', + 'hasWebtorrentFiles', 'uuids', - 'search' + 'search', + 'displayOnlyForFollower', + 'excludeAlreadyWatched' ]), - - followerActorId: serverActor.id, - serverAccountId: serverActor.Account.id + serverAccountIdForBlock: serverActor.Account.id } return VideoModel.getAvailableForApi(queryOptions) } - static countLocalLives () { - const options = { + static countLives (options: { + remote: boolean + mode: 'published' | 'not-ended' + }) { + const query = { where: { - remote: false, + remote: options.remote, isLive: true, - state: { - [Op.ne]: VideoState.LIVE_ENDED - } + state: options.mode === 'not-ended' + ? { [Op.ne]: VideoState.LIVE_ENDED } + : { [Op.eq]: VideoState.PUBLISHED } } } - return VideoModel.count(options) + return VideoModel.count(query) } static countVideosUploadedByUserSince (userId: number, since: Date) { @@ -1256,13 +1291,13 @@ export class VideoModel extends Model>> { } static load (id: number | string, transaction?: Transaction): Promise { - const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) + const queryBuilder = new VideoModelGetQueryBuilder(VideoModel.sequelize) return queryBuilder.queryVideo({ id, transaction, type: 'thumbnails' }) } static loadWithBlacklist (id: number | string, transaction?: Transaction): Promise { - const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) + const queryBuilder = new VideoModelGetQueryBuilder(VideoModel.sequelize) return queryBuilder.queryVideo({ id, transaction, type: 'thumbnails-blacklist' }) } @@ -1306,33 +1341,33 @@ export class VideoModel extends Model>> { } static loadOnlyId (id: number | string, transaction?: Transaction): Promise { - const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) + const queryBuilder = new VideoModelGetQueryBuilder(VideoModel.sequelize) return queryBuilder.queryVideo({ id, transaction, type: 'id' }) } static loadWithFiles (id: number | string, transaction?: Transaction, logging?: boolean): Promise { - const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) + const queryBuilder = new VideoModelGetQueryBuilder(VideoModel.sequelize) return queryBuilder.queryVideo({ id, transaction, type: 'all-files', logging }) } static loadByUrl (url: string, transaction?: Transaction): Promise { - const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) + const queryBuilder = new VideoModelGetQueryBuilder(VideoModel.sequelize) return queryBuilder.queryVideo({ url, transaction, type: 'thumbnails' }) } static loadByUrlAndPopulateAccount (url: string, transaction?: Transaction): Promise { - const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) + const queryBuilder = new VideoModelGetQueryBuilder(VideoModel.sequelize) return queryBuilder.queryVideo({ url, transaction, type: 'account-blacklist-files' }) } - static loadAndPopulateAccountAndServerAndTags (id: number | string, t?: Transaction, userId?: number): Promise { - const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) + static loadFull (id: number | string, t?: Transaction, userId?: number): Promise { + const queryBuilder = new VideoModelGetQueryBuilder(VideoModel.sequelize) - return queryBuilder.queryVideo({ id, transaction: t, type: 'full-light', userId }) + return queryBuilder.queryVideo({ id, transaction: t, type: 'full', userId }) } static loadForGetAPI (parameters: { @@ -1341,17 +1376,13 @@ export class VideoModel extends Model>> { userId?: number }): Promise { const { id, transaction, userId } = parameters - const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) + const queryBuilder = new VideoModelGetQueryBuilder(VideoModel.sequelize) return queryBuilder.queryVideo({ id, transaction, type: 'api', userId }) } static async getStats () { - const totalLocalVideos = await VideoModel.count({ - where: { - remote: false - } - }) + const serverActor = await getServerActor() let totalLocalVideoViews = await VideoModel.sum('views', { where: { @@ -1362,15 +1393,25 @@ export class VideoModel extends Model>> { // Sequelize could return null... if (!totalLocalVideoViews) totalLocalVideoViews = 0 - const { total: totalVideos } = await VideoModel.listForApi({ + const baseOptions = { start: 0, count: 0, sort: '-publishedAt', - nsfw: buildNSFWFilter(), - includeLocalVideos: true, - withFiles: false + nsfw: null, + displayOnlyForFollower: { + actorId: serverActor.id, + orLocalVideos: true + } + } + + const { total: totalLocalVideos } = await VideoModel.listForApi({ + ...baseOptions, + + isLocal: true }) + const { total: totalVideos } = await VideoModel.listForApi(baseOptions) + return { totalLocalVideos, totalLocalVideoViews, @@ -1387,7 +1428,21 @@ export class VideoModel extends Model>> { }) } - static updateRatesOf (videoId: number, type: VideoRateType, t: Transaction) { + static updateRatesOf (videoId: number, type: VideoRateType, count: number, t: Transaction) { + const field = type === 'like' + ? 'likes' + : 'dislikes' + + const rawQuery = `UPDATE "video" SET "${field}" = :count WHERE "video"."id" = :videoId` + + return AccountVideoRateModel.sequelize.query(rawQuery, { + transaction: t, + replacements: { videoId, rateType: type, count }, + type: QueryTypes.UPDATE + }) + } + + static syncLocalRates (videoId: number, type: VideoRateType, t: Transaction) { const field = type === 'like' ? 'likes' : 'dislikes' @@ -1410,6 +1465,12 @@ export class VideoModel extends Model>> { const query = 'SELECT 1 FROM "videoShare" ' + 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' + 'WHERE "actorFollow"."actorId" = $followerActorId AND "actorFollow"."state" = \'accepted\' AND "videoShare"."videoId" = $videoId ' + + 'UNION ' + + 'SELECT 1 FROM "video" ' + + 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' + + 'INNER JOIN "account" ON "account"."id" = "videoChannel"."accountId" ' + + 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "account"."actorId" ' + + 'WHERE "actorFollow"."actorId" = $followerActorId AND "actorFollow"."state" = \'accepted\' AND "video"."id" = $videoId ' + 'LIMIT 1' const options = { @@ -1448,7 +1509,6 @@ export class VideoModel extends Model>> { // threshold corresponds to how many video the field should have to be returned static async getRandomFieldSamples (field: 'category' | 'channelId', threshold: number, count: number) { const serverActor = await getServerActor() - const followerActorId = serverActor.id const queryOptions: BuildVideosListQueryOptions = { attributes: [ `"${field}"` ], @@ -1457,9 +1517,11 @@ export class VideoModel extends Model>> { start: 0, sort: 'random', count, - serverAccountId: serverActor.Account.id, - followerActorId, - includeLocalVideos: true + serverAccountIdForBlock: serverActor.Account.id, + displayOnlyForFollower: { + actorId: serverActor.id, + orLocalVideos: true + } } const queryBuilder = new VideosIdListQueryBuilder(VideoModel.sequelize) @@ -1476,7 +1538,8 @@ export class VideoModel extends Model>> { required: false, where: { startDate: { - [Op.gte]: new Date(new Date().getTime() - (24 * 3600 * 1000) * trendingDays) + // FIXME: ts error + [Op.gte as any]: new Date(new Date().getTime() - (24 * 3600 * 1000) * trendingDays) } } } @@ -1486,6 +1549,8 @@ export class VideoModel extends Model>> { options: BuildVideosListQueryOptions, countVideos = true ): Promise> { + const span = tracer.startSpan('peertube.VideoModel.getAvailableForApi') + function getCount () { if (countVideos !== true) return Promise.resolve(undefined) @@ -1505,12 +1570,32 @@ export class VideoModel extends Model>> { const [ count, rows ] = await Promise.all([ getCount(), getModels() ]) + span.end() + return { data: rows, total: count } } + private static throwIfPrivateIncludeWithoutUser (include: VideoInclude, user: MUserAccountId) { + if (VideoModel.isPrivateInclude(include) && !user?.hasRight(UserRight.SEE_ALL_VIDEOS)) { + throw new Error('Try to filter all-local but user cannot see all videos') + } + } + + private static throwIfPrivacyOneOfWithoutUser (privacyOneOf: VideoPrivacy[], user: MUserAccountId) { + if (privacyOneOf && !user?.hasRight(UserRight.SEE_ALL_VIDEOS)) { + throw new Error('Try to choose video privacies but user cannot see all videos') + } + } + + private static isPrivateInclude (include: VideoInclude) { + return include & VideoInclude.BLACKLISTED || + include & VideoInclude.BLOCKED_OWNER || + include & VideoInclude.NOT_PUBLISHED_STATE + } + isBlacklisted () { return !!this.VideoBlacklist } @@ -1520,22 +1605,21 @@ export class VideoModel extends Model>> { } getQualityFileBy (this: T, fun: (files: MVideoFile[], it: (file: MVideoFile) => number) => MVideoFile) { - // We first transcode to WebTorrent format, so try this array first - if (Array.isArray(this.VideoFiles) && this.VideoFiles.length !== 0) { - const file = fun(this.VideoFiles, file => file.resolution) + const files = this.getAllFiles() + const file = fun(files, file => file.resolution) + if (!file) return undefined + if (file.videoId) { return Object.assign(file, { Video: this }) } - // No webtorrent files, try with streaming playlist files - if (Array.isArray(this.VideoStreamingPlaylists) && this.VideoStreamingPlaylists.length !== 0) { + if (file.videoStreamingPlaylistId) { const streamingPlaylistWithVideo = Object.assign(this.VideoStreamingPlaylists[0], { Video: this }) - const file = fun(streamingPlaylistWithVideo.VideoFiles, file => file.resolution) return Object.assign(file, { VideoStreamingPlaylist: streamingPlaylistWithVideo }) } - return undefined + throw new Error('File is not associated to a video of a playlist') } getMaxQualityFile (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo { @@ -1566,9 +1650,7 @@ export class VideoModel extends Model>> { if (Array.isArray(this.Thumbnails) === false) this.Thumbnails = [] - // Already have this thumbnail, skip - if (this.Thumbnails.find(t => t.id === savedThumbnail.id)) return - + this.Thumbnails = this.Thumbnails.filter(t => t.id !== savedThumbnail.id) this.Thumbnails.push(savedThumbnail) } @@ -1627,20 +1709,24 @@ export class VideoModel extends Model>> { let files: VideoFile[] = [] if (Array.isArray(this.VideoFiles)) { - const result = videoFilesModelToFormattedJSON(this, this.VideoFiles, includeMagnet) + const result = videoFilesModelToFormattedJSON(this, this.VideoFiles, { includeMagnet }) files = files.concat(result) } for (const p of (this.VideoStreamingPlaylists || [])) { - const result = videoFilesModelToFormattedJSON(this, p.VideoFiles, includeMagnet) + const result = videoFilesModelToFormattedJSON(this, p.VideoFiles, { includeMagnet }) files = files.concat(result) } return files } - toActivityPubObject (this: MVideoAP): VideoObject { - return videoModelToActivityPubObject(this) + toActivityPubObject (this: MVideoAP): Promise { + return Hooks.wrapObject( + videoModelToActivityPubObject(this), + 'filter:activity-pub.video.json-ld.build.result', + { video: this } + ) } getTruncatedDescription () { @@ -1650,12 +1736,42 @@ export class VideoModel extends Model>> { return peertubeTruncate(this.description, { length: maxLength }) } - getMaxQualityResolution () { + getAllFiles () { + let files: MVideoFile[] = [] + + if (Array.isArray(this.VideoFiles)) { + files = files.concat(this.VideoFiles) + } + + if (Array.isArray(this.VideoStreamingPlaylists)) { + for (const p of this.VideoStreamingPlaylists) { + if (Array.isArray(p.VideoFiles)) { + files = files.concat(p.VideoFiles) + } + } + } + + return files + } + + probeMaxQualityFile () { const file = this.getMaxQualityFile() const videoOrPlaylist = file.getVideoOrStreamingPlaylist() - return VideoPathManager.Instance.makeAvailableVideoFile(videoOrPlaylist, file, originalFilePath => { - return getVideoFileResolution(originalFilePath) + return VideoPathManager.Instance.makeAvailableVideoFile(file.withVideoOrPlaylist(videoOrPlaylist), async originalFilePath => { + const probe = await ffprobePromise(originalFilePath) + + const { audioStream } = await getAudioStream(originalFilePath, probe) + const hasAudio = await hasAudioStream(originalFilePath, probe) + const fps = await getVideoStreamFPS(originalFilePath, probe) + + return { + audioStream, + hasAudio, + fps, + + ...await getVideoStreamDimensionsInfo(originalFilePath, probe) + } }) } @@ -1667,9 +1783,9 @@ export class VideoModel extends Model>> { if (!this.VideoStreamingPlaylists) return undefined const playlist = this.VideoStreamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS) - playlist.Video = this + if (!playlist) return undefined - return playlist + return playlist.withVideo(this) } setHLSPlaylist (playlist: MStreamingPlaylist) { @@ -1685,7 +1801,7 @@ export class VideoModel extends Model>> { .concat(toAdd) } - removeFileAndTorrent (videoFile: MVideoFile, isRedundancy = false) { + removeWebTorrentFile (videoFile: MVideoFile, isRedundancy = false) { const filePath = isRedundancy ? VideoPathManager.Instance.getFSRedundancyVideoFilePath(this, videoFile) : VideoPathManager.Instance.getFSVideoFileOutputPath(this, videoFile) @@ -1721,11 +1837,34 @@ export class VideoModel extends Model>> { ) if (streamingPlaylist.storage === VideoStorage.OBJECT_STORAGE) { - await removeHLSObjectStorage(streamingPlaylist, this) + await removeHLSObjectStorage(streamingPlaylist.withVideo(this)) } } } + async removeStreamingPlaylistVideoFile (streamingPlaylist: MStreamingPlaylist, videoFile: MVideoFile) { + const filePath = VideoPathManager.Instance.getFSHLSOutputPath(this, videoFile.filename) + await videoFile.removeTorrent() + await remove(filePath) + + const resolutionFilename = getHlsResolutionPlaylistFilename(videoFile.filename) + await remove(VideoPathManager.Instance.getFSHLSOutputPath(this, resolutionFilename)) + + if (videoFile.storage === VideoStorage.OBJECT_STORAGE) { + await removeHLSFileObjectStorageByFilename(streamingPlaylist.withVideo(this), videoFile.filename) + await removeHLSFileObjectStorageByFilename(streamingPlaylist.withVideo(this), resolutionFilename) + } + } + + async removeStreamingPlaylistFile (streamingPlaylist: MStreamingPlaylist, filename: string) { + const filePath = VideoPathManager.Instance.getFSHLSOutputPath(this, filename) + await remove(filePath) + + if (streamingPlaylist.storage === VideoStorage.OBJECT_STORAGE) { + await removeHLSFileObjectStorageByFilename(streamingPlaylist.withVideo(this), filename) + } + } + isOutdated () { if (this.isOwned()) return false @@ -1744,28 +1883,43 @@ export class VideoModel extends Model>> { return this.hasPrivacyForFederation() === false && isPrivacyForFederation(newPrivacy) === true } - setAsRefreshed () { - return setAsUpdated('video', this.id) + setAsRefreshed (transaction?: Transaction) { + return setAsUpdated({ sequelize: this.sequelize, table: 'video', id: this.id, transaction }) } - requiresAuth () { - return this.privacy === VideoPrivacy.PRIVATE || this.privacy === VideoPrivacy.INTERNAL || !!this.VideoBlacklist - } + // --------------------------------------------------------------------------- - setPrivacy (newPrivacy: VideoPrivacy) { - if (this.privacy === VideoPrivacy.PRIVATE && newPrivacy !== VideoPrivacy.PRIVATE) { - this.publishedAt = new Date() + requiresAuth (options: { + urlParamId: string + checkBlacklist: boolean + }) { + const { urlParamId, checkBlacklist } = options + + if (this.privacy === VideoPrivacy.PRIVATE || this.privacy === VideoPrivacy.INTERNAL) { + return true } - this.privacy = newPrivacy + if (this.privacy === VideoPrivacy.UNLISTED) { + if (urlParamId && !isUUIDValid(urlParamId)) return true + + return false + } + + if (checkBlacklist && this.VideoBlacklist) return true + + if (this.privacy !== VideoPrivacy.PUBLIC) { + throw new Error(`Unknown video privacy ${this.privacy} to know if the video requires auth`) + } + + return false } - isConfidential () { - return this.privacy === VideoPrivacy.PRIVATE || - this.privacy === VideoPrivacy.UNLISTED || - this.privacy === VideoPrivacy.INTERNAL + hasPrivateStaticPath () { + return isVideoInPrivateDirectory(this.privacy) } + // --------------------------------------------------------------------------- + async setNewState (newState: VideoState, isNewVideo: boolean, transaction: Transaction) { if (this.state === newState) throw new Error('Cannot use same state ' + newState) @@ -1778,7 +1932,9 @@ export class VideoModel extends Model>> { await this.save({ transaction }) } - getBandwidthBits (videoFile: MVideoFile) { + getBandwidthBits (this: MVideo, videoFile: MVideoFile) { + if (!this.duration) throw new Error(`Cannot get bandwidth bits because video ${this.url} has duration of 0`) + return Math.ceil((videoFile.size * 8) / this.duration) }