X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo.ts;h=1a10d2da229ec59d4d8484fc582cea90dbbc07e3;hb=32fde390f465b9ceef9e49c4037acdacbe176d65;hp=a8ea67c395379a22090f396268bafefc434dbeb2;hpb=b42c2c7e89a64ed730d8140840fe74a13c31f2a4;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video.ts b/server/models/video/video.ts index a8ea67c39..1a10d2da2 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -26,14 +26,15 @@ import { } from 'sequelize-typescript' import { getPrivaciesForFederation, isPrivacyForFederation, isStateForFederation } from '@server/helpers/video' import { LiveManager } from '@server/lib/live/live-manager' -import { removeHLSFileObjectStorage, removeHLSObjectStorage, removeWebTorrentObjectStorage } from '@server/lib/object-storage' +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 { 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 { ModelCache } from '@server/models/shared/model-cache' import { buildVideoEmbedPath, buildVideoWatchPath, pick } from '@shared/core-utils' -import { ffprobePromise, getAudioStream, uuidToShort } from '@shared/extra-utils' +import { ffprobePromise, getAudioStream, hasAudioStream, uuidToShort } from '@shared/extra-utils' import { ResultList, ThumbnailType, @@ -52,7 +53,7 @@ import { import { AttributesOnly } from '@shared/typescript-utils' import { peertubeTruncate } from '../../helpers/core-utils' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' -import { exists, isBooleanValid } from '../../helpers/custom-validators/misc' +import { exists, isBooleanValid, isUUIDValid } from '../../helpers/custom-validators/misc' import { isVideoDescriptionValid, isVideoDurationValid, @@ -102,10 +103,9 @@ 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, @@ -784,9 +784,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 } @@ -1458,6 +1457,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 = { @@ -1696,12 +1701,12 @@ 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) } @@ -1745,9 +1750,11 @@ export class VideoModel extends Model>> { const probe = await ffprobePromise(originalFilePath) const { audioStream } = await getAudioStream(originalFilePath, probe) + const hasAudio = await hasAudioStream(originalFilePath, probe) return { audioStream, + hasAudio, ...await getVideoStreamDimensionsInfo(originalFilePath, probe) } @@ -1764,9 +1771,7 @@ export class VideoModel extends Model>> { const playlist = this.VideoStreamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS) if (!playlist) return undefined - playlist.Video = this - - return playlist + return playlist.withVideo(this) } setHLSPlaylist (playlist: MStreamingPlaylist) { @@ -1832,8 +1837,8 @@ export class VideoModel extends Model>> { await remove(VideoPathManager.Instance.getFSHLSOutputPath(this, resolutionFilename)) if (videoFile.storage === VideoStorage.OBJECT_STORAGE) { - await removeHLSFileObjectStorage(streamingPlaylist.withVideo(this), videoFile.filename) - await removeHLSFileObjectStorage(streamingPlaylist.withVideo(this), resolutionFilename) + await removeHLSFileObjectStorageByFilename(streamingPlaylist.withVideo(this), videoFile.filename) + await removeHLSFileObjectStorageByFilename(streamingPlaylist.withVideo(this), resolutionFilename) } } @@ -1842,7 +1847,7 @@ export class VideoModel extends Model>> { await remove(filePath) if (streamingPlaylist.storage === VideoStorage.OBJECT_STORAGE) { - await removeHLSFileObjectStorage(streamingPlaylist.withVideo(this), filename) + await removeHLSFileObjectStorageByFilename(streamingPlaylist.withVideo(this), filename) } } @@ -1865,27 +1870,42 @@ export class VideoModel extends Model>> { } setAsRefreshed (transaction?: Transaction) { - return setAsUpdated('video', this.id, 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) @@ -1899,6 +1919,8 @@ export class VideoModel extends Model>> { } 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) }