X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo.ts;h=0f0f894e45ebed6bc81ab3fd8680797c0867349c;hb=764b1a14fc494f2cfd7ea590d2f07b01df65c7ad;hp=749ef7197105bcb059bae197a8d9635e5ae6b00c;hpb=819b656439e5f0ec2ae5de9357502cdfe3196197;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 749ef7197..0f0f894e4 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -1,6 +1,6 @@ import * as Bluebird from 'bluebird' import { remove } from 'fs-extra' -import { maxBy, minBy, pick } from 'lodash' +import { maxBy, minBy } from 'lodash' import { join } from 'path' import { FindOptions, Includeable, IncludeOptions, Op, QueryTypes, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize' import { @@ -27,7 +27,7 @@ import { import { setAsUpdated } from '@server/helpers/database-utils' import { buildNSFWFilter } from '@server/helpers/express-utils' import { getPrivaciesForFederation, isPrivacyForFederation, isStateForFederation } from '@server/helpers/video' -import { LiveManager } from '@server/lib/live-manager' +import { LiveManager } from '@server/lib/live/live-manager' import { getHLSDirectory, getVideoFilePath } from '@server/lib/video-paths' import { getServerActor } from '@server/models/application/application' import { ModelCache } from '@server/models/model-cache' @@ -43,11 +43,8 @@ import { peertubeTruncate } from '../../helpers/core-utils' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' import { isBooleanValid } from '../../helpers/custom-validators/misc' import { - isVideoCategoryValid, isVideoDescriptionValid, isVideoDurationValid, - isVideoLanguageValid, - isVideoLicenceValid, isVideoNameValid, isVideoPrivacyValid, isVideoStateValid, @@ -56,19 +53,7 @@ import { 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, - VIDEO_CATEGORIES, - VIDEO_LANGUAGES, - VIDEO_LICENCES, - VIDEO_PRIVACIES, - VIDEO_STATES, - WEBSERVER -} from '../../initializers/constants' +import { ACTIVITY_PUB, API_VERSION, CONSTRAINTS_FIELDS, LAZY_STATIC_PATHS, STATIC_PATHS, WEBSERVER } from '../../initializers/constants' import { sendDeleteVideo } from '../../lib/activitypub/send' import { MChannel, @@ -88,13 +73,12 @@ import { MVideoFormattableDetails, MVideoForUser, MVideoFullLight, - MVideoIdThumbnail, + MVideoId, MVideoImmutable, MVideoThumbnail, MVideoThumbnailBlacklist, MVideoWithAllFiles, - MVideoWithFile, - MVideoWithRights + MVideoWithFile } from '../../types/models' import { MThumbnail } from '../../types/models/video/thumbnail' import { MVideoFile, MVideoFileStreamingPlaylistVideo } from '../../types/models/video/video-file' @@ -110,7 +94,17 @@ import { VideoTrackerModel } from '../server/video-tracker' import { UserModel } from '../user/user' import { UserVideoHistoryModel } from '../user/user-video-history' import { buildTrigramSearchIndex, buildWhereIdOrUUID, getVideoSort, isOutdated, throwIfNotValid } from '../utils' +import { + videoFilesModelToFormattedJSON, + VideoFormattingJSONOptions, + videoModelToActivityPubObject, + videoModelToFormattedDetailsJSON, + 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 { TagModel } from './tag' import { ThumbnailModel } from './thumbnail' import { VideoBlacklistModel } from './video-blacklist' @@ -118,37 +112,25 @@ import { VideoCaptionModel } from './video-caption' import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel' import { VideoCommentModel } from './video-comment' import { VideoFileModel } from './video-file' -import { - videoFilesModelToFormattedJSON, - VideoFormattingJSONOptions, - videoModelToActivityPubObject, - videoModelToFormattedDetailsJSON, - videoModelToFormattedJSON -} from './video-format-utils' import { VideoImportModel } from './video-import' import { VideoLiveModel } from './video-live' import { VideoPlaylistElementModel } from './video-playlist-element' -import { buildListQuery, BuildVideosQueryOptions, wrapForAPIResults } from './video-query-builder' import { VideoShareModel } from './video-share' import { VideoStreamingPlaylistModel } from './video-streaming-playlist' import { VideoTagModel } from './video-tag' import { VideoViewModel } from './video-view' export enum ScopeNames { - AVAILABLE_FOR_LIST_IDS = 'AVAILABLE_FOR_LIST_IDS', FOR_API = 'FOR_API', WITH_ACCOUNT_DETAILS = 'WITH_ACCOUNT_DETAILS', WITH_TAGS = 'WITH_TAGS', - WITH_TRACKERS = 'WITH_TRACKERS', WITH_WEBTORRENT_FILES = 'WITH_WEBTORRENT_FILES', WITH_SCHEDULED_UPDATE = 'WITH_SCHEDULED_UPDATE', WITH_BLACKLISTED = 'WITH_BLACKLISTED', - WITH_USER_HISTORY = 'WITH_USER_HISTORY', WITH_STREAMING_PLAYLISTS = 'WITH_STREAMING_PLAYLISTS', - WITH_USER_ID = 'WITH_USER_ID', WITH_IMMUTABLE_ATTRIBUTES = 'WITH_IMMUTABLE_ATTRIBUTES', - WITH_THUMBNAILS = 'WITH_THUMBNAILS', - WITH_LIVE = 'WITH_LIVE' + WITH_USER_HISTORY = 'WITH_USER_HISTORY', + WITH_THUMBNAILS = 'WITH_THUMBNAILS' } export type ForAPIOptions = { @@ -244,30 +226,6 @@ export type AvailableForListIDsOptions = { } ] }, - [ScopeNames.WITH_LIVE]: { - include: [ - { - model: VideoLiveModel.unscoped(), - required: false - } - ] - }, - [ScopeNames.WITH_USER_ID]: { - include: [ - { - attributes: [ 'accountId' ], - model: VideoChannelModel.unscoped(), - required: true, - include: [ - { - attributes: [ 'userId' ], - model: AccountModel.unscoped(), - required: true - } - ] - } - ] - }, [ScopeNames.WITH_ACCOUNT_DETAILS]: { include: [ { @@ -325,14 +283,6 @@ export type AvailableForListIDsOptions = { [ScopeNames.WITH_TAGS]: { include: [ TagModel ] }, - [ScopeNames.WITH_TRACKERS]: { - include: [ - { - attributes: [ 'id', 'url' ], - model: TrackerModel - } - ] - }, [ScopeNames.WITH_BLACKLISTED]: { include: [ { @@ -505,19 +455,16 @@ export class VideoModel extends Model>> { @AllowNull(true) @Default(null) - @Is('VideoCategory', value => throwIfNotValid(value, isVideoCategoryValid, 'category', true)) @Column category: number @AllowNull(true) @Default(null) - @Is('VideoLicence', value => throwIfNotValid(value, isVideoLicenceValid, 'licence', true)) @Column licence: number @AllowNull(true) @Default(null) - @Is('VideoLanguage', value => throwIfNotValid(value, isVideoLanguageValid, 'language', true)) @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.LANGUAGE.max)) language: string @@ -625,7 +572,7 @@ export class VideoModel extends Model>> { foreignKey: { allowNull: true }, - hooks: true + onDelete: 'cascade' }) VideoChannel: VideoChannelModel @@ -803,25 +750,24 @@ export class VideoModel extends Model>> { } @BeforeDestroy - static async removeFiles (instance: VideoModel) { + static async removeFiles (instance: VideoModel, options) { const tasks: Promise[] = [] logger.info('Removing files of video %s.', instance.url) if (instance.isOwned()) { if (!Array.isArray(instance.VideoFiles)) { - instance.VideoFiles = await instance.$get('VideoFiles') + instance.VideoFiles = await instance.$get('VideoFiles', { transaction: options.transaction }) } // Remove physical files and torrents instance.VideoFiles.forEach(file => { - tasks.push(instance.removeFile(file)) - tasks.push(file.removeTorrent()) + tasks.push(instance.removeFileAndTorrent(file)) }) // Remove playlists file if (!Array.isArray(instance.VideoStreamingPlaylists)) { - instance.VideoStreamingPlaylists = await instance.$get('VideoStreamingPlaylists') + instance.VideoStreamingPlaylists = await instance.$get('VideoStreamingPlaylists', { transaction: options.transaction }) } for (const p of instance.VideoStreamingPlaylists) { @@ -844,7 +790,7 @@ export class VideoModel extends Model>> { logger.info('Stopping live of video %s after video deletion.', instance.uuid) - return LiveManager.Instance.stopSessionOf(instance.id) + LiveManager.Instance.stopSessionOf(instance.id) } @BeforeDestroy @@ -857,7 +803,7 @@ export class VideoModel extends Model>> { const tasks: Promise[] = [] if (!Array.isArray(instance.VideoAbuses)) { - instance.VideoAbuses = await instance.$get('VideoAbuses') + instance.VideoAbuses = await instance.$get('VideoAbuses', { transaction: options.transaction }) if (instance.VideoAbuses.length === 0) return undefined } @@ -872,12 +818,7 @@ export class VideoModel extends Model>> { tasks.push(abuse.save({ transaction: options.transaction })) } - Promise.all(tasks) - .catch(err => { - logger.error('Some errors when saving details of video %s in its abuses before destroy hook.', instance.uuid, { err }) - }) - - return undefined + await Promise.all(tasks) } static listLocal (): Promise { @@ -1004,18 +945,19 @@ export class VideoModel extends Model>> { }) } - static async listPublishedLiveIds () { + static async listPublishedLiveUUIDs () { const options = { - attributes: [ 'id' ], + attributes: [ 'uuid' ], where: { isLive: true, + remote: false, state: VideoState.PUBLISHED } } const result = await VideoModel.findAll(options) - return result.map(v => v.id) + return result.map(v => v.uuid) } static listUserVideosForApi (options: { @@ -1298,27 +1240,16 @@ export class VideoModel extends Model>> { return VideoModel.count(options) } - static load (id: number | string, t?: Transaction): Promise { - const where = buildWhereIdOrUUID(id) - const options = { - where, - transaction: t - } + static load (id: number | string, transaction?: Transaction): Promise { + const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) - return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options) + return queryBuilder.queryVideo({ id, transaction, type: 'thumbnails' }) } - static loadWithBlacklist (id: number | string, t?: Transaction): Promise { - const where = buildWhereIdOrUUID(id) - const options = { - where, - transaction: t - } + static loadWithBlacklist (id: number | string, transaction?: Transaction): Promise { + const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) - return VideoModel.scope([ - ScopeNames.WITH_THUMBNAILS, - ScopeNames.WITH_BLACKLISTED - ]).findOne(options) + return queryBuilder.queryVideo({ id, transaction, type: 'thumbnails-blacklist' }) } static loadImmutableAttributes (id: number | string, t?: Transaction): Promise { @@ -1339,68 +1270,6 @@ export class VideoModel extends Model>> { }) } - static loadWithRights (id: number | string, t?: Transaction): Promise { - const where = buildWhereIdOrUUID(id) - const options = { - where, - transaction: t - } - - return VideoModel.scope([ - ScopeNames.WITH_BLACKLISTED, - ScopeNames.WITH_USER_ID - ]).findOne(options) - } - - static loadOnlyId (id: number | string, t?: Transaction): Promise { - const where = buildWhereIdOrUUID(id) - - const options = { - attributes: [ 'id' ], - where, - transaction: t - } - - return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options) - } - - static loadWithFiles (id: number | string, t?: Transaction, logging?: boolean): Promise { - const where = buildWhereIdOrUUID(id) - - const query = { - where, - transaction: t, - logging - } - - return VideoModel.scope([ - ScopeNames.WITH_WEBTORRENT_FILES, - ScopeNames.WITH_STREAMING_PLAYLISTS, - ScopeNames.WITH_THUMBNAILS - ]).findOne(query) - } - - static loadByUUID (uuid: string): Promise { - const options = { - where: { - uuid - } - } - - return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options) - } - - static loadByUrl (url: string, transaction?: Transaction): Promise { - const query: FindOptions = { - where: { - url - }, - transaction - } - - return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(query) - } - static loadByUrlImmutableAttributes (url: string, transaction?: Transaction): Promise { const fun = () => { const query: FindOptions = { @@ -1421,85 +1290,45 @@ export class VideoModel extends Model>> { }) } - static loadByUrlAndPopulateAccount (url: string, transaction?: Transaction): Promise { - const query: FindOptions = { - where: { - url - }, - transaction - } + static loadOnlyId (id: number | string, transaction?: Transaction): Promise { + const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) - return VideoModel.scope([ - ScopeNames.WITH_ACCOUNT_DETAILS, - ScopeNames.WITH_WEBTORRENT_FILES, - ScopeNames.WITH_STREAMING_PLAYLISTS, - ScopeNames.WITH_THUMBNAILS, - ScopeNames.WITH_BLACKLISTED - ]).findOne(query) + return queryBuilder.queryVideo({ id, transaction, type: 'id' }) } - static loadAndPopulateAccountAndServerAndTags (id: number | string, t?: Transaction, userId?: number): Promise { - const where = buildWhereIdOrUUID(id) + static loadWithFiles (id: number | string, transaction?: Transaction, logging?: boolean): Promise { + const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) - const options = { - order: [ [ 'Tags', 'name', 'ASC' ] ] as any, - where, - transaction: t - } + return queryBuilder.queryVideo({ id, transaction, type: 'all-files', logging }) + } - const scopes: (string | ScopeOptions)[] = [ - ScopeNames.WITH_TAGS, - ScopeNames.WITH_BLACKLISTED, - ScopeNames.WITH_ACCOUNT_DETAILS, - ScopeNames.WITH_SCHEDULED_UPDATE, - ScopeNames.WITH_WEBTORRENT_FILES, - ScopeNames.WITH_STREAMING_PLAYLISTS, - ScopeNames.WITH_THUMBNAILS, - ScopeNames.WITH_LIVE - ] + static loadByUrl (url: string, transaction?: Transaction): Promise { + const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) - if (userId) { - scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] }) - } + return queryBuilder.queryVideo({ url, transaction, type: 'thumbnails' }) + } + + static loadByUrlAndPopulateAccount (url: string, transaction?: Transaction): Promise { + const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) - return VideoModel - .scope(scopes) - .findOne(options) + 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) + + return queryBuilder.queryVideo({ id, transaction: t, type: 'full-light', userId }) } static loadForGetAPI (parameters: { id: number | string - t?: Transaction + transaction?: Transaction userId?: number }): Promise { - const { id, t, userId } = parameters - const where = buildWhereIdOrUUID(id) + const { id, transaction, userId } = parameters + const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize) - const options = { - order: [ [ 'Tags', 'name', 'ASC' ] ] as any, // FIXME: sequelize typings - where, - transaction: t - } - - const scopes: (string | ScopeOptions)[] = [ - ScopeNames.WITH_TAGS, - ScopeNames.WITH_BLACKLISTED, - ScopeNames.WITH_ACCOUNT_DETAILS, - ScopeNames.WITH_SCHEDULED_UPDATE, - ScopeNames.WITH_THUMBNAILS, - ScopeNames.WITH_LIVE, - ScopeNames.WITH_TRACKERS, - { method: [ ScopeNames.WITH_WEBTORRENT_FILES, true ] }, - { method: [ ScopeNames.WITH_STREAMING_PLAYLISTS, true ] } - ] - - if (userId) { - scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] }) - } - - return VideoModel - .scope(scopes) - .findOne(options) + return queryBuilder.queryVideo({ id, transaction, type: 'api', userId }) } static async getStats () { @@ -1550,7 +1379,7 @@ export class VideoModel extends Model>> { const rawQuery = `UPDATE "video" SET "${field}" = ` + '(' + - 'SELECT COUNT(id) FROM "accountVideoRate" WHERE "accountVideoRate"."videoId" = "video"."id" AND type = :rateType' + + 'SELECT COUNT(id) FROM "accountVideoRate" WHERE "accountVideoRate"."videoId" = "video"."id" AND type = :rateType' + ') ' + 'WHERE "video"."id" = :videoId' @@ -1578,15 +1407,15 @@ export class VideoModel extends Model>> { .then(results => results.length === 1) } - static bulkUpdateSupportField (videoChannel: MChannel, t: Transaction) { + static bulkUpdateSupportField (ofChannel: MChannel, t: Transaction) { const options = { where: { - channelId: videoChannel.id + channelId: ofChannel.id }, transaction: t } - return VideoModel.update({ support: videoChannel.support }, options) + return VideoModel.update({ support: ofChannel.support }, options) } static getAllIdsFromChannel (videoChannel: MChannelId): Promise { @@ -1606,7 +1435,7 @@ export class VideoModel extends Model>> { const serverActor = await getServerActor() const followerActorId = serverActor.id - const queryOptions: BuildVideosQueryOptions = { + const queryOptions: BuildVideosListQueryOptions = { attributes: [ `"${field}"` ], group: `GROUP BY "${field}"`, having: `HAVING COUNT("${field}") >= ${threshold}`, @@ -1618,10 +1447,10 @@ export class VideoModel extends Model>> { includeLocalVideos: true } - const { query, replacements } = buildListQuery(VideoModel.sequelize, queryOptions) + const queryBuilder = new VideosIdListQueryBuilder(VideoModel.sequelize) - return this.sequelize.query(query, { replacements, type: QueryTypes.SELECT }) - .then(rows => rows.map(r => r[field])) + return queryBuilder.queryVideoIds(queryOptions) + .then(rows => rows.map(r => r[field])) } static buildTrendingQuery (trendingDays: number) { @@ -1639,27 +1468,24 @@ export class VideoModel extends Model>> { } private static async getAvailableForApi ( - options: BuildVideosQueryOptions, + options: BuildVideosListQueryOptions, countVideos = true ): Promise> { function getCount () { if (countVideos !== true) return Promise.resolve(undefined) const countOptions = Object.assign({}, options, { isCount: true }) - const { query: queryCount, replacements: replacementsCount } = buildListQuery(VideoModel.sequelize, countOptions) + const queryBuilder = new VideosIdListQueryBuilder(VideoModel.sequelize) - return VideoModel.sequelize.query(queryCount, { replacements: replacementsCount, type: QueryTypes.SELECT }) - .then(rows => rows.length !== 0 ? rows[0].total : 0) + return queryBuilder.countVideoIds(countOptions) } function getModels () { if (options.count === 0) return Promise.resolve([]) - const { query, replacements, order } = buildListQuery(VideoModel.sequelize, options) - const queryModels = wrapForAPIResults(query, replacements, options, order) + const queryBuilder = new VideosModelListQueryBuilder(VideoModel.sequelize) - return VideoModel.sequelize.query(queryModels, { replacements, type: QueryTypes.SELECT, nest: true }) - .then(rows => VideoModel.buildAPIResult(rows)) + return queryBuilder.queryVideos(options) } const [ count, rows ] = await Promise.all([ getCount(), getModels() ]) @@ -1670,173 +1496,6 @@ export class VideoModel extends Model>> { } } - private static buildAPIResult (rows: any[]) { - const videosMemo: { [ id: number ]: VideoModel } = {} - const videoStreamingPlaylistMemo: { [ id: number ]: VideoStreamingPlaylistModel } = {} - - const thumbnailsDone = new Set() - const historyDone = new Set() - const videoFilesDone = new Set() - - const videos: VideoModel[] = [] - - const avatarKeys = [ 'id', 'filename', 'fileUrl', 'onDisk', 'createdAt', 'updatedAt' ] - const actorKeys = [ 'id', 'preferredUsername', 'url', 'serverId', 'avatarId' ] - const serverKeys = [ 'id', 'host' ] - const videoFileKeys = [ - 'id', - 'createdAt', - 'updatedAt', - 'resolution', - 'size', - 'extname', - 'filename', - 'fileUrl', - 'torrentFilename', - 'torrentUrl', - 'infoHash', - 'fps', - 'videoId', - 'videoStreamingPlaylistId' - ] - const videoStreamingPlaylistKeys = [ 'id', 'type', 'playlistUrl' ] - const videoKeys = [ - 'id', - 'uuid', - 'name', - 'category', - 'licence', - 'language', - 'privacy', - 'nsfw', - 'description', - 'support', - 'duration', - 'views', - 'likes', - 'dislikes', - 'remote', - 'isLive', - 'url', - 'commentsEnabled', - 'downloadEnabled', - 'waitTranscoding', - 'state', - 'publishedAt', - 'originallyPublishedAt', - 'channelId', - 'createdAt', - 'updatedAt' - ] - const buildOpts = { raw: true } - - function buildActor (rowActor: any) { - const avatarModel = rowActor.Avatar.id !== null - ? new ActorImageModel(pick(rowActor.Avatar, avatarKeys), buildOpts) - : null - - const serverModel = rowActor.Server.id !== null - ? new ServerModel(pick(rowActor.Server, serverKeys), buildOpts) - : null - - const actorModel = new ActorModel(pick(rowActor, actorKeys), buildOpts) - actorModel.Avatar = avatarModel - actorModel.Server = serverModel - - return actorModel - } - - for (const row of rows) { - if (!videosMemo[row.id]) { - // Build Channel - const channel = row.VideoChannel - const channelModel = new VideoChannelModel(pick(channel, [ 'id', 'name', 'description', 'actorId' ]), buildOpts) - channelModel.Actor = buildActor(channel.Actor) - - const account = row.VideoChannel.Account - const accountModel = new AccountModel(pick(account, [ 'id', 'name' ]), buildOpts) - accountModel.Actor = buildActor(account.Actor) - - channelModel.Account = accountModel - - const videoModel = new VideoModel(pick(row, videoKeys), buildOpts) - videoModel.VideoChannel = channelModel - - videoModel.UserVideoHistories = [] - videoModel.Thumbnails = [] - videoModel.VideoFiles = [] - videoModel.VideoStreamingPlaylists = [] - - videosMemo[row.id] = videoModel - // Don't take object value to have a sorted array - videos.push(videoModel) - } - - const videoModel = videosMemo[row.id] - - if (row.userVideoHistory?.id && !historyDone.has(row.userVideoHistory.id)) { - const historyModel = new UserVideoHistoryModel(pick(row.userVideoHistory, [ 'id', 'currentTime' ]), buildOpts) - videoModel.UserVideoHistories.push(historyModel) - - historyDone.add(row.userVideoHistory.id) - } - - if (row.Thumbnails?.id && !thumbnailsDone.has(row.Thumbnails.id)) { - const thumbnailModel = new ThumbnailModel(pick(row.Thumbnails, [ 'id', 'type', 'filename' ]), buildOpts) - videoModel.Thumbnails.push(thumbnailModel) - - thumbnailsDone.add(row.Thumbnails.id) - } - - if (row.VideoFiles?.id && !videoFilesDone.has(row.VideoFiles.id)) { - const videoFileModel = new VideoFileModel(pick(row.VideoFiles, videoFileKeys), buildOpts) - videoModel.VideoFiles.push(videoFileModel) - - videoFilesDone.add(row.VideoFiles.id) - } - - if (row.VideoStreamingPlaylists?.id && !videoStreamingPlaylistMemo[row.VideoStreamingPlaylists.id]) { - const streamingPlaylist = new VideoStreamingPlaylistModel(pick(row.VideoStreamingPlaylists, videoStreamingPlaylistKeys), buildOpts) - streamingPlaylist.VideoFiles = [] - - videoModel.VideoStreamingPlaylists.push(streamingPlaylist) - - videoStreamingPlaylistMemo[streamingPlaylist.id] = streamingPlaylist - } - - if (row.VideoStreamingPlaylists?.VideoFiles?.id && !videoFilesDone.has(row.VideoStreamingPlaylists.VideoFiles.id)) { - const streamingPlaylist = videoStreamingPlaylistMemo[row.VideoStreamingPlaylists.id] - - const videoFileModel = new VideoFileModel(pick(row.VideoStreamingPlaylists.VideoFiles, videoFileKeys), buildOpts) - streamingPlaylist.VideoFiles.push(videoFileModel) - - videoFilesDone.add(row.VideoStreamingPlaylists.VideoFiles.id) - } - } - - return videos - } - - static getCategoryLabel (id: number) { - return VIDEO_CATEGORIES[id] || 'Misc' - } - - static getLicenceLabel (id: number) { - return VIDEO_LICENCES[id] || 'Unknown' - } - - static getLanguageLabel (id: string) { - return VIDEO_LANGUAGES[id] || 'Unknown' - } - - static getPrivacyLabel (id: number) { - return VIDEO_PRIVACIES[id] || 'Unknown' - } - - static getStateLabel (id: number) { - return VIDEO_STATES[id] || 'Unknown' - } - isBlacklisted () { return !!this.VideoBlacklist } @@ -1885,7 +1544,7 @@ export class VideoModel extends Model>> { return Array.isArray(this.VideoFiles) === true && this.VideoFiles.length !== 0 } - async addAndSaveThumbnail (thumbnail: MThumbnail, transaction: Transaction) { + async addAndSaveThumbnail (thumbnail: MThumbnail, transaction?: Transaction) { thumbnail.videoId = this.id const savedThumbnail = await thumbnail.save({ transaction }) @@ -1919,7 +1578,7 @@ export class VideoModel extends Model>> { } getWatchStaticPath () { - return '/videos/watch/' + this.uuid + return '/w/' + this.uuid } getEmbedStaticPath () { @@ -2010,10 +1669,13 @@ export class VideoModel extends Model>> { .concat(toAdd) } - removeFile (videoFile: MVideoFile, isRedundancy = false) { + removeFileAndTorrent (videoFile: MVideoFile, isRedundancy = false) { const filePath = getVideoFilePath(this, videoFile, isRedundancy) - return remove(filePath) - .catch(err => logger.warn('Cannot delete file %s.', filePath, { err })) + + const promises: Promise[] = [ remove(filePath) ] + if (!isRedundancy) promises.push(videoFile.removeTorrent()) + + return Promise.all(promises) } async removeStreamingPlaylistFiles (streamingPlaylist: MStreamingPlaylist, isRedundancy = false) {