X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo.ts;h=3eed1b58d109c2eb8cf9b86b7ac78fef51da58a1;hb=e1ab52d7ec7370a6f9f5937192d6003206af1ac0;hp=56a5b0e18ee0f9236529c7cbfdea0e98f82bbc17;hpb=9e8789497377cac5554a622da605f5b89587aa9c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 56a5b0e18..3eed1b58d 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -1,4 +1,4 @@ -import * as Bluebird from 'bluebird' +import Bluebird from 'bluebird' import { remove } from 'fs-extra' import { maxBy, minBy } from 'lodash' import { join } from 'path' @@ -28,20 +28,22 @@ 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 { getHLSDirectory, getVideoFilePath } from '@server/lib/video-paths' +import { removeHLSObjectStorage, removeWebTorrentObjectStorage } from '@server/lib/object-storage' +import { getHLSDirectory, getHLSRedundancyDirectory } from '@server/lib/paths' +import { VideoPathManager } from '@server/lib/video-path-manager' import { getServerActor } from '@server/models/application/application' import { ModelCache } from '@server/models/model-cache' import { AttributesOnly, buildVideoEmbedPath, buildVideoWatchPath, pick } from '@shared/core-utils' +import { VideoInclude } from '@shared/models' 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 } from '../../../shared/models/videos' +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 { peertubeTruncate } from '../../helpers/core-utils' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' -import { isBooleanValid } from '../../helpers/custom-validators/misc' +import { exists, isBooleanValid } from '../../helpers/custom-validators/misc' import { isVideoDescriptionValid, isVideoDurationValid, @@ -103,8 +105,8 @@ 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 { VideoModelGetQueryBuilder } from './sql/video-model-get-query-builder' +import { BuildVideosListQueryOptions, DisplayOnlyForFollowerOptions, VideosIdListQueryBuilder } from './sql/videos-id-list-query-builder' import { VideosModelListQueryBuilder } from './sql/videos-model-list-query-builder' import { TagModel } from './tag' import { ThumbnailModel } from './thumbnail' @@ -114,6 +116,7 @@ import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel import { VideoCommentModel } from './video-comment' import { VideoFileModel } from './video-file' import { VideoImportModel } from './video-import' +import { VideoJobInfoModel } from './video-job-info' import { VideoLiveModel } from './video-live' import { VideoPlaylistElementModel } from './video-playlist-element' import { VideoShareModel } from './video-share' @@ -142,35 +145,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' ] @@ -732,6 +706,15 @@ export class VideoModel extends Model>> { }) VideoCaptions: VideoCaptionModel[] + @HasOne(() => VideoJobInfoModel, { + foreignKey: { + name: 'videoId', + allowNull: false + }, + onDelete: 'cascade' + }) + VideoJobInfo: VideoJobInfoModel + @BeforeDestroy static async sendDelete (instance: MVideoAccountLight, options) { if (!instance.isOwned()) return undefined @@ -822,14 +805,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) { @@ -852,7 +838,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 + ')') @@ -966,10 +952,12 @@ 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 { const where: WhereOptions = {} @@ -980,10 +968,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, @@ -993,6 +985,7 @@ export class VideoModel extends Model>> { { model: VideoChannelModel, required: true, + where: channelWhere, include: [ { model: AccountModel, @@ -1035,11 +1028,13 @@ 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[] @@ -1050,7 +1045,7 @@ export class VideoModel extends Model>> { accountId?: number videoChannelId?: number - followerActorId?: number + displayOnlyForFollower: DisplayOnlyForFollowerOptions | null videoPlaylistId?: number @@ -1063,9 +1058,7 @@ export class VideoModel extends Model>> { search?: string }) { - 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) const trendingDays = options.sort.endsWith('trending') ? CONFIG.TRENDING.VIDEOS.INTERVAL_DAYS @@ -1077,11 +1070,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', @@ -1094,19 +1082,21 @@ export class VideoModel extends Model>> { 'languageOneOf', 'tagsOneOf', 'tagsAllOf', - 'filter', - 'withFiles', + 'isLocal', + 'include', + 'displayOnlyForFollower', + 'hasFiles', 'accountId', 'videoChannelId', 'videoPlaylistId', - 'includeLocalVideos', 'user', 'historyOfUser', + 'hasHLSFiles', + 'hasWebtorrentFiles', 'search' ]), - followerActorId, - serverAccountId: serverActor.Account.id, + serverAccountIdForBlock: serverActor.Account.id, trendingDays, trendingAlgorithm } @@ -1118,31 +1108,44 @@ 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[] + + 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[] }) { + VideoModel.throwIfPrivateIncludeWithoutUser(options.include, options.user) + const serverActor = await getServerActor() const queryOptions = { ...pick(options, [ - 'includeLocalVideos', + 'include', 'nsfw', 'isLive', 'categoryOneOf', @@ -1151,7 +1154,7 @@ export class VideoModel extends Model>> { 'tagsOneOf', 'tagsAllOf', 'user', - 'filter', + 'isLocal', 'host', 'start', 'count', @@ -1162,12 +1165,13 @@ export class VideoModel extends Model>> { 'originallyPublishedEndDate', 'durationMin', 'durationMax', + 'hasHLSFiles', + 'hasWebtorrentFiles', 'uuids', - 'search' + 'search', + 'displayOnlyForFollower' ]), - - followerActorId: serverActor.id, - serverAccountId: serverActor.Account.id + serverAccountIdForBlock: serverActor.Account.id } return VideoModel.getAvailableForApi(queryOptions) @@ -1244,13 +1248,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' }) } @@ -1294,31 +1298,31 @@ 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) + const queryBuilder = new VideoModelGetQueryBuilder(VideoModel.sequelize) return queryBuilder.queryVideo({ id, transaction: t, type: 'full-light', userId }) } @@ -1329,7 +1333,7 @@ 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 }) } @@ -1350,13 +1354,17 @@ export class VideoModel extends Model>> { // Sequelize could return null... if (!totalLocalVideoViews) totalLocalVideoViews = 0 + const serverActor = await getServerActor() + const { total: totalVideos } = await VideoModel.listForApi({ start: 0, count: 0, sort: '-publishedAt', nsfw: buildNSFWFilter(), - includeLocalVideos: true, - withFiles: false + displayOnlyForFollower: { + actorId: serverActor.id, + orLocalVideos: true + } }) return { @@ -1436,7 +1444,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}"` ], @@ -1445,9 +1452,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) @@ -1499,6 +1508,19 @@ export class VideoModel extends Model>> { } } + 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 no user has not the see all videos right') + } + } + + private static isPrivateInclude (include: VideoInclude) { + return include & VideoInclude.BLACKLISTED || + include & VideoInclude.BLOCKED_OWNER || + include & VideoInclude.HIDDEN_PRIVACY || + include & VideoInclude.NOT_PUBLISHED_STATE + } + isBlacklisted () { return !!this.VideoBlacklist } @@ -1641,9 +1663,10 @@ export class VideoModel extends Model>> { getMaxQualityResolution () { const file = this.getMaxQualityFile() const videoOrPlaylist = file.getVideoOrStreamingPlaylist() - const originalFilePath = getVideoFilePath(videoOrPlaylist, file) - return getVideoFileResolution(originalFilePath) + return VideoPathManager.Instance.makeAvailableVideoFile(videoOrPlaylist, file, originalFilePath => { + return getVideoFileResolution(originalFilePath) + }) } getDescriptionAPIPath () { @@ -1654,6 +1677,8 @@ export class VideoModel extends Model>> { if (!this.VideoStreamingPlaylists) return undefined const playlist = this.VideoStreamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS) + if (!playlist) return undefined + playlist.Video = this return playlist @@ -1673,16 +1698,24 @@ export class VideoModel extends Model>> { } removeFileAndTorrent (videoFile: MVideoFile, isRedundancy = false) { - const filePath = getVideoFilePath(this, videoFile, isRedundancy) + const filePath = isRedundancy + ? VideoPathManager.Instance.getFSRedundancyVideoFilePath(this, videoFile) + : VideoPathManager.Instance.getFSVideoFileOutputPath(this, videoFile) const promises: Promise[] = [ remove(filePath) ] if (!isRedundancy) promises.push(videoFile.removeTorrent()) + if (videoFile.storage === VideoStorage.OBJECT_STORAGE) { + promises.push(removeWebTorrentObjectStorage(videoFile)) + } + return Promise.all(promises) } async removeStreamingPlaylistFiles (streamingPlaylist: MStreamingPlaylist, isRedundancy = false) { - const directoryPath = getHLSDirectory(this, isRedundancy) + const directoryPath = isRedundancy + ? getHLSRedundancyDirectory(this) + : getHLSDirectory(this) await remove(directoryPath) @@ -1698,6 +1731,10 @@ export class VideoModel extends Model>> { await Promise.all( streamingPlaylistWithFiles.VideoFiles.map(file => file.removeTorrent()) ) + + if (streamingPlaylist.storage === VideoStorage.OBJECT_STORAGE) { + await removeHLSObjectStorage(streamingPlaylist, this) + } } } @@ -1741,19 +1778,19 @@ export class VideoModel extends Model>> { this.privacy === VideoPrivacy.INTERNAL } - async publishIfNeededAndSave (t: Transaction) { - if (this.state !== VideoState.PUBLISHED) { - this.state = VideoState.PUBLISHED - this.publishedAt = new Date() - await this.save({ transaction: t }) + async setNewState (newState: VideoState, isNewVideo: boolean, transaction: Transaction) { + if (this.state === newState) throw new Error('Cannot use same state ' + newState) - return true + this.state = newState + + if (this.state === VideoState.PUBLISHED && isNewVideo) { + this.publishedAt = new Date() } - return false + await this.save({ transaction }) } - getBandwidthBits (videoFile: MVideoFile) { + getBandwidthBits (this: MVideo, videoFile: MVideoFile) { return Math.ceil((videoFile.size * 8) / this.duration) }