X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo.ts;h=20e1f1c4aa97c043243001a231b75d23df473f17;hb=0374b6b5cd685316f924874b2a3068bb345eb0dd;hp=7b1f0bc316b698cc8403b8725079cbfa46c72a9f;hpb=453e83ea5d81d203ba34bc43cd5c2c750ba40568;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 7b1f0bc31..20e1f1c4a 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -1,20 +1,7 @@ import * as Bluebird from 'bluebird' -import { maxBy } from 'lodash' -import * as magnetUtil from 'magnet-uri' -import * as parseTorrent from 'parse-torrent' +import { maxBy, minBy } from 'lodash' import { join } from 'path' -import { - CountOptions, - FindOptions, - IncludeOptions, - ModelIndexesOptions, - Op, - QueryTypes, - ScopeOptions, - Sequelize, - Transaction, - WhereOptions -} from 'sequelize' +import { CountOptions, FindOptions, IncludeOptions, Op, QueryTypes, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize' import { AllowNull, BeforeDestroy, @@ -38,11 +25,11 @@ import { } from 'sequelize-typescript' import { UserRight, VideoPrivacy, VideoState } from '../../../shared' import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' -import { Video, VideoDetails, VideoFile } from '../../../shared/models/videos' +import { Video, VideoDetails } from '../../../shared/models/videos' import { VideoFilter } from '../../../shared/models/videos/video-query.type' import { peertubeTruncate } from '../../helpers/core-utils' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' -import { isArray, isBooleanValid } from '../../helpers/custom-validators/misc' +import { isBooleanValid } from '../../helpers/custom-validators/misc' import { isVideoCategoryValid, isVideoDescriptionValid, @@ -61,8 +48,6 @@ import { ACTIVITY_PUB, API_VERSION, CONSTRAINTS_FIELDS, - HLS_REDUNDANCY_DIRECTORY, - HLS_STREAMING_PLAYLIST_DIRECTORY, LAZY_STATIC_PATHS, REMOTE_SCHEME, STATIC_DOWNLOAD_PATHS, @@ -100,7 +85,7 @@ import { VideoTagModel } from './video-tag' import { ScheduleVideoUpdateModel } from './schedule-video-update' import { VideoCaptionModel } from './video-caption' import { VideoBlacklistModel } from './video-blacklist' -import { remove, writeFile } from 'fs-extra' +import { remove } from 'fs-extra' import { VideoViewModel } from './video-views' import { VideoRedundancyModel } from '../redundancy/video-redundancy' import { @@ -117,99 +102,45 @@ import { VideoPlaylistElementModel } from './video-playlist-element' import { CONFIG } from '../../initializers/config' import { ThumbnailModel } from './thumbnail' import { ThumbnailType } from '../../../shared/models/videos/thumbnail.type' -import { createTorrentPromise } from '../../helpers/webtorrent' import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type' import { MChannel, - MChannelActorAccountDefault, + MChannelAccountDefault, MChannelId, + MStreamingPlaylist, + MStreamingPlaylistFilesVideo, MUserAccountId, MUserId, - MVideoAccountAllFiles, MVideoAccountLight, + MVideoAccountLightBlacklistAllFiles, + MVideoAP, MVideoDetails, + MVideoFileVideo, + MVideoFormattable, + MVideoFormattableDetails, + MVideoForUser, MVideoFullLight, MVideoIdThumbnail, MVideoThumbnail, + MVideoThumbnailBlacklist, MVideoWithAllFiles, - MVideoWithBlacklistThumbnailScheduled, + MVideoWithFile, MVideoWithRights } from '../../typings/models' -import { MVideoFile, MVideoFileRedundanciesOpt } from '../../typings/models/video/video-file' +import { MVideoFile, MVideoFileStreamingPlaylistVideo } from '../../typings/models/video/video-file' import { MThumbnail } from '../../typings/models/video/thumbnail' - -// FIXME: Define indexes here because there is an issue with TS and Sequelize.literal when called directly in the annotation -const indexes: (ModelIndexesOptions & { where?: WhereOptions })[] = [ - buildTrigramSearchIndex('video_name_trigram', 'name'), - - { fields: [ 'createdAt' ] }, - { fields: [ 'publishedAt' ] }, - { fields: [ 'duration' ] }, - { fields: [ 'views' ] }, - { fields: [ 'channelId' ] }, - { - fields: [ 'originallyPublishedAt' ], - where: { - originallyPublishedAt: { - [Op.ne]: null - } - } - }, - { - fields: [ 'category' ], // We don't care videos with an unknown category - where: { - category: { - [Op.ne]: null - } - } - }, - { - fields: [ 'licence' ], // We don't care videos with an unknown licence - where: { - licence: { - [Op.ne]: null - } - } - }, - { - fields: [ 'language' ], // We don't care videos with an unknown language - where: { - language: { - [Op.ne]: null - } - } - }, - { - fields: [ 'nsfw' ], // Most of the videos are not NSFW - where: { - nsfw: true - } - }, - { - fields: [ 'remote' ], // Only index local videos - where: { - remote: false - } - }, - { - fields: [ 'uuid' ], - unique: true - }, - { - fields: [ 'url' ], - unique: true - } -] +import { VideoFile } from '@shared/models/videos/video-file.model' +import { getHLSDirectory, getTorrentFileName, getTorrentFilePath, getVideoFilename, getVideoFilePath } from '@server/lib/video-paths' +import validator from 'validator' 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_FILES = 'WITH_FILES', + WITH_WEBTORRENT_FILES = 'WITH_WEBTORRENT_FILES', WITH_SCHEDULED_UPDATE = 'WITH_SCHEDULED_UPDATE', WITH_BLACKLISTED = 'WITH_BLACKLISTED', - WITH_BLOCKLIST = 'WITH_BLOCKLIST', WITH_USER_HISTORY = 'WITH_USER_HISTORY', WITH_STREAMING_PLAYLISTS = 'WITH_STREAMING_PLAYLISTS', WITH_USER_ID = 'WITH_USER_ID', @@ -281,7 +212,7 @@ export type AvailableForListIDsOptions = { if (options.ids) { query.where = { id: { - [ Op.in ]: options.ids // FIXME: sequelize ANY seems broken + [ Op.in ]: options.ids } } } @@ -306,7 +237,7 @@ export type AvailableForListIDsOptions = { return query }, [ ScopeNames.AVAILABLE_FOR_LIST_IDS ]: (options: AvailableForListIDsOptions) => { - const whereAnd = options.baseWhere ? options.baseWhere : [] + const whereAnd = options.baseWhere ? [].concat(options.baseWhere) : [] const query: FindOptions = { raw: true, @@ -342,9 +273,8 @@ export type AvailableForListIDsOptions = { // Only list public/published videos if (!options.filter || options.filter !== 'all-local') { - const privacyWhere = { - // Always list public videos - privacy: VideoPrivacy.PUBLIC, + + const publishWhere = { // Always list published videos, or videos that are being transcoded but on which we don't want to wait for transcoding [ Op.or ]: [ { @@ -358,8 +288,26 @@ export type AvailableForListIDsOptions = { } ] } + whereAnd.push(publishWhere) - whereAnd.push(privacyWhere) + // List internal videos if the user is logged in + if (options.user) { + const privacyWhere = { + [Op.or]: [ + { + privacy: VideoPrivacy.INTERNAL + }, + { + privacy: VideoPrivacy.PUBLIC + } + ] + } + + whereAnd.push(privacyWhere) + } else { // Or only public videos + const privacyWhere = { privacy: VideoPrivacy.PUBLIC } + whereAnd.push(privacyWhere) + } } if (options.videoPlaylistId) { @@ -375,7 +323,13 @@ export type AvailableForListIDsOptions = { query.subQuery = false } - if (options.filter || options.accountId || options.videoChannelId) { + if (options.filter && (options.filter === 'local' || options.filter === 'all-local')) { + whereAnd.push({ + remote: false + }) + } + + if (options.accountId || options.videoChannelId) { const videoChannelInclude: IncludeOptions = { attributes: [], model: VideoChannelModel.unscoped(), @@ -388,28 +342,14 @@ export type AvailableForListIDsOptions = { } } - if (options.filter || options.accountId) { + if (options.accountId) { const accountInclude: IncludeOptions = { attributes: [], model: AccountModel.unscoped(), required: true } - if (options.filter) { - accountInclude.include = [ - { - attributes: [], - model: ActorModel.unscoped(), - required: true, - where: VideoModel.buildActorWhereWithFilter(options.filter) - } - ] - } - - if (options.accountId) { - accountInclude.where = { id: options.accountId } - } - + accountInclude.where = { id: options.accountId } videoChannelInclude.include = [ accountInclude ] } @@ -417,36 +357,42 @@ export type AvailableForListIDsOptions = { } if (options.followerActorId) { - let localVideosReq = '' + let localVideosReq: WhereOptions = {} if (options.includeLocalVideos === true) { - localVideosReq = ' UNION ALL ' + - 'SELECT "video"."id" AS "id" FROM "video" ' + - 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' + - 'INNER JOIN "account" ON "account"."id" = "videoChannel"."accountId" ' + - 'INNER JOIN "actor" ON "account"."actorId" = "actor"."id" ' + - 'WHERE "actor"."serverId" IS NULL' + localVideosReq = { remote: false } } // Force actorId to be a number to avoid SQL injections const actorIdNumber = parseInt(options.followerActorId.toString(), 10) whereAnd.push({ - id: { - [ Op.in ]: Sequelize.literal( - '(' + - 'SELECT "videoShare"."videoId" AS "id" FROM "videoShare" ' + - 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' + - 'WHERE "actorFollow"."actorId" = ' + actorIdNumber + - ' UNION ALL ' + - 'SELECT "video"."id" AS "id" FROM "video" ' + - 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' + - 'INNER JOIN "account" ON "account"."id" = "videoChannel"."accountId" ' + - 'INNER JOIN "actor" ON "account"."actorId" = "actor"."id" ' + - 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "actor"."id" ' + - 'WHERE "actorFollow"."actorId" = ' + actorIdNumber + - localVideosReq + - ')' - ) - } + [Op.or]: [ + { + id: { + [ Op.in ]: Sequelize.literal( + '(' + + 'SELECT "videoShare"."videoId" AS "id" FROM "videoShare" ' + + 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' + + 'WHERE "actorFollow"."actorId" = ' + actorIdNumber + + ')' + ) + } + }, + { + id: { + [ Op.in ]: Sequelize.literal( + '(' + + 'SELECT "video"."id" AS "id" FROM "video" ' + + 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' + + 'INNER JOIN "account" ON "account"."id" = "videoChannel"."accountId" ' + + 'INNER JOIN "actor" ON "account"."actorId" = "actor"."id" ' + + 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "actor"."id" ' + + 'WHERE "actorFollow"."actorId" = ' + actorIdNumber + + ')' + ) + } + }, + localVideosReq + ] }) } @@ -463,13 +409,15 @@ export type AvailableForListIDsOptions = { // FIXME: issues with sequelize count when making a join on n:m relation, so we just make a IN() if (options.tagsAllOf || options.tagsOneOf) { if (options.tagsOneOf) { + const tagsOneOfLower = options.tagsOneOf.map(t => t.toLowerCase()) + whereAnd.push({ id: { [ Op.in ]: Sequelize.literal( '(' + 'SELECT "videoId" FROM "videoTag" ' + 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' + - 'WHERE "tag"."name" IN (' + createSafeIn(VideoModel, options.tagsOneOf) + ')' + + 'WHERE lower("tag"."name") IN (' + createSafeIn(VideoModel, tagsOneOfLower) + ')' + ')' ) } @@ -477,14 +425,16 @@ export type AvailableForListIDsOptions = { } if (options.tagsAllOf) { + const tagsAllOfLower = options.tagsAllOf.map(t => t.toLowerCase()) + whereAnd.push({ id: { [ Op.in ]: Sequelize.literal( '(' + 'SELECT "videoId" FROM "videoTag" ' + 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' + - 'WHERE "tag"."name" IN (' + createSafeIn(VideoModel, options.tagsAllOf) + ')' + - 'GROUP BY "videoTag"."videoId" HAVING COUNT(*) = ' + options.tagsAllOf.length + + 'WHERE lower("tag"."name") IN (' + createSafeIn(VideoModel, tagsAllOfLower) + ')' + + 'GROUP BY "videoTag"."videoId" HAVING COUNT(*) = ' + tagsAllOfLower.length + ')' ) } @@ -565,9 +515,6 @@ export type AvailableForListIDsOptions = { } return query - }, - [ScopeNames.WITH_BLOCKLIST]: { - }, [ ScopeNames.WITH_THUMBNAILS ]: { include: [ @@ -657,7 +604,7 @@ export type AvailableForListIDsOptions = { } ] }, - [ ScopeNames.WITH_FILES ]: (withRedundancies = false) => { + [ ScopeNames.WITH_WEBTORRENT_FILES ]: (withRedundancies = false) => { let subInclude: any[] = [] if (withRedundancies === true) { @@ -682,16 +629,19 @@ export type AvailableForListIDsOptions = { } }, [ ScopeNames.WITH_STREAMING_PLAYLISTS ]: (withRedundancies = false) => { - let subInclude: any[] = [] + const subInclude: IncludeOptions[] = [ + { + model: VideoFileModel.unscoped(), + required: false + } + ] if (withRedundancies === true) { - subInclude = [ - { - attributes: [ 'fileUrl' ], - model: VideoRedundancyModel.unscoped(), - required: false - } - ] + subInclude.push({ + attributes: [ 'fileUrl' ], + model: VideoRedundancyModel.unscoped(), + required: false + }) } return { @@ -730,7 +680,72 @@ export type AvailableForListIDsOptions = { })) @Table({ tableName: 'video', - indexes + indexes: [ + buildTrigramSearchIndex('video_name_trigram', 'name'), + + { fields: [ 'createdAt' ] }, + { + fields: [ + { name: 'publishedAt', order: 'DESC' }, + { name: 'id', order: 'ASC' } + ] + }, + { fields: [ 'duration' ] }, + { fields: [ 'views' ] }, + { fields: [ 'channelId' ] }, + { + fields: [ 'originallyPublishedAt' ], + where: { + originallyPublishedAt: { + [Op.ne]: null + } + } + }, + { + fields: [ 'category' ], // We don't care videos with an unknown category + where: { + category: { + [Op.ne]: null + } + } + }, + { + fields: [ 'licence' ], // We don't care videos with an unknown licence + where: { + licence: { + [Op.ne]: null + } + } + }, + { + fields: [ 'language' ], // We don't care videos with an unknown language + where: { + language: { + [Op.ne]: null + } + } + }, + { + fields: [ 'nsfw' ], // Most of the videos are not NSFW + where: { + nsfw: true + } + }, + { + fields: [ 'remote' ], // Only index local videos + where: { + remote: false + } + }, + { + fields: [ 'uuid' ], + unique: true + }, + { + fields: [ 'url' ], + unique: true + } + ] }) export class VideoModel extends Model { @@ -904,7 +919,7 @@ export class VideoModel extends Model { @HasMany(() => VideoFileModel, { foreignKey: { name: 'videoId', - allowNull: false + allowNull: true }, hooks: true, onDelete: 'cascade' @@ -1015,7 +1030,7 @@ export class VideoModel extends Model { AccountModel ], transaction: options.transaction - }) as MChannelActorAccountDefault + }) as MChannelAccountDefault } return sendDeleteVideo(instance, options.transaction) @@ -1032,7 +1047,7 @@ export class VideoModel extends Model { if (instance.isOwned()) { if (!Array.isArray(instance.VideoFiles)) { - instance.VideoFiles = await instance.$get('VideoFiles') as VideoFileModel[] + instance.VideoFiles = await instance.$get('VideoFiles') } // Remove physical files and torrents @@ -1042,7 +1057,13 @@ export class VideoModel extends Model { }) // Remove playlists file - tasks.push(instance.removeStreamingPlaylist()) + if (!Array.isArray(instance.VideoStreamingPlaylists)) { + instance.VideoStreamingPlaylists = await instance.$get('VideoStreamingPlaylists') + } + + for (const p of instance.VideoStreamingPlaylists) { + tasks.push(instance.removeStreamingPlaylistFiles(p)) + } } // Do not wait video deletion because we could be in a transaction @@ -1062,7 +1083,7 @@ export class VideoModel extends Model { } return VideoModel.scope([ - ScopeNames.WITH_FILES, + ScopeNames.WITH_WEBTORRENT_FILES, ScopeNames.WITH_STREAMING_PLAYLISTS, ScopeNames.WITH_THUMBNAILS ]).findAll(query) @@ -1174,9 +1195,15 @@ export class VideoModel extends Model { }) } - static listUserVideosForApi (accountId: number, start: number, count: number, sort: string) { + static listUserVideosForApi ( + accountId: number, + start: number, + count: number, + sort: string, + search?: string + ) { function buildBaseQuery (): FindOptions { - return { + let baseQuery = { offset: start, limit: count, order: getVideoSort(sort), @@ -1196,12 +1223,24 @@ export class VideoModel extends Model { } ] } + + if (search) { + baseQuery = Object.assign(baseQuery, { + where: { + name: { + [ Op.iLike ]: '%' + search + '%' + } + } + }) + } + + return baseQuery } const countQuery = buildBaseQuery() const findQuery = buildBaseQuery() - const findScopes = [ + const findScopes: (string | ScopeOptions)[] = [ ScopeNames.WITH_SCHEDULED_UPDATE, ScopeNames.WITH_BLACKLISTED, ScopeNames.WITH_THUMBNAILS @@ -1209,10 +1248,10 @@ export class VideoModel extends Model { return Promise.all([ VideoModel.count(countQuery), - VideoModel.scope(findScopes).findAll(findQuery) + VideoModel.scope(findScopes).findAll(findQuery) ]).then(([ count, rows ]) => { return { - data: rows as MVideoWithBlacklistThumbnailScheduled[], + data: rows, total: count } }) @@ -1237,8 +1276,9 @@ export class VideoModel extends Model { videoPlaylistId?: number, trendingDays?: number, user?: MUserAccountId, - historyOfUser?: MUserId - }, countVideos = true) { + historyOfUser?: MUserId, + countVideos?: boolean + }) { if (options.filter && options.filter === 'all-local' && !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') } @@ -1281,7 +1321,7 @@ export class VideoModel extends Model { trendingDays } - return VideoModel.getAvailableForApi(query, queryOptions, countVideos) + return VideoModel.getAvailableForApi(query, queryOptions, options.countVideos) } static async searchAndPopulateAccountAndServer (options: { @@ -1338,24 +1378,35 @@ export class VideoModel extends Model { const escapedSearch = VideoModel.sequelize.escape(options.search) const escapedLikeSearch = VideoModel.sequelize.escape('%' + options.search + '%') if (options.search) { - whereAnd.push( - { - id: { - [ Op.in ]: Sequelize.literal( - '(' + - 'SELECT "video"."id" FROM "video" ' + - 'WHERE ' + - 'lower(immutable_unaccent("video"."name")) % lower(immutable_unaccent(' + escapedSearch + ')) OR ' + - 'lower(immutable_unaccent("video"."name")) LIKE lower(immutable_unaccent(' + escapedLikeSearch + '))' + - 'UNION ALL ' + - 'SELECT "video"."id" FROM "video" LEFT JOIN "videoTag" ON "videoTag"."videoId" = "video"."id" ' + - 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' + - 'WHERE "tag"."name" = ' + escapedSearch + - ')' - ) - } + const trigramSearch = { + id: { + [ Op.in ]: Sequelize.literal( + '(' + + 'SELECT "video"."id" FROM "video" ' + + 'WHERE ' + + 'lower(immutable_unaccent("video"."name")) % lower(immutable_unaccent(' + escapedSearch + ')) OR ' + + 'lower(immutable_unaccent("video"."name")) LIKE lower(immutable_unaccent(' + escapedLikeSearch + '))' + + 'UNION ALL ' + + 'SELECT "video"."id" FROM "video" LEFT JOIN "videoTag" ON "videoTag"."videoId" = "video"."id" ' + + 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' + + 'WHERE lower("tag"."name") = lower(' + escapedSearch + ')' + + ')' + ) } - ) + } + + if (validator.isUUID(options.search)) { + whereAnd.push({ + [Op.or]: [ + trigramSearch, + { + uuid: options.search + } + ] + }) + } else { + whereAnd.push(trigramSearch) + } attributesInclude.push(createSimilarityAttribute('VideoModel.name', options.search)) } @@ -1405,6 +1456,19 @@ export class VideoModel extends Model { return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options) } + static loadWithBlacklist (id: number | string, t?: Transaction): Bluebird { + const where = buildWhereIdOrUUID(id) + const options = { + where, + transaction: t + } + + return VideoModel.scope([ + ScopeNames.WITH_THUMBNAILS, + ScopeNames.WITH_BLACKLISTED + ]).findOne(options) + } + static loadWithRights (id: number | string, t?: Transaction): Bluebird { const where = buildWhereIdOrUUID(id) const options = { @@ -1441,7 +1505,7 @@ export class VideoModel extends Model { } return VideoModel.scope([ - ScopeNames.WITH_FILES, + ScopeNames.WITH_WEBTORRENT_FILES, ScopeNames.WITH_STREAMING_PLAYLISTS, ScopeNames.WITH_THUMBNAILS ]).findOne(query) @@ -1468,7 +1532,7 @@ export class VideoModel extends Model { return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(query) } - static loadByUrlAndPopulateAccount (url: string, transaction?: Transaction): Bluebird { + static loadByUrlAndPopulateAccount (url: string, transaction?: Transaction): Bluebird { const query: FindOptions = { where: { url @@ -1478,7 +1542,7 @@ export class VideoModel extends Model { return VideoModel.scope([ ScopeNames.WITH_ACCOUNT_DETAILS, - ScopeNames.WITH_FILES, + ScopeNames.WITH_WEBTORRENT_FILES, ScopeNames.WITH_STREAMING_PLAYLISTS, ScopeNames.WITH_THUMBNAILS, ScopeNames.WITH_BLACKLISTED @@ -1499,7 +1563,7 @@ export class VideoModel extends Model { ScopeNames.WITH_BLACKLISTED, ScopeNames.WITH_ACCOUNT_DETAILS, ScopeNames.WITH_SCHEDULED_UPDATE, - ScopeNames.WITH_FILES, + ScopeNames.WITH_WEBTORRENT_FILES, ScopeNames.WITH_STREAMING_PLAYLISTS, ScopeNames.WITH_THUMBNAILS ] @@ -1533,7 +1597,7 @@ export class VideoModel extends Model { ScopeNames.WITH_ACCOUNT_DETAILS, ScopeNames.WITH_SCHEDULED_UPDATE, ScopeNames.WITH_THUMBNAILS, - { method: [ ScopeNames.WITH_FILES, true ] }, + { method: [ ScopeNames.WITH_WEBTORRENT_FILES, true ] }, { method: [ ScopeNames.WITH_STREAMING_PLAYLISTS, true ] } ] @@ -1586,7 +1650,7 @@ export class VideoModel extends Model { 'LIMIT 1' const options = { - type: QueryTypes.SELECT, + type: QueryTypes.SELECT as QueryTypes.SELECT, bind: { followerActorId, videoId }, raw: true } @@ -1659,16 +1723,6 @@ export class VideoModel extends Model { } } - private static buildActorWhereWithFilter (filter?: VideoFilter) { - if (filter && (filter === 'local' || filter === 'all-local')) { - return { - serverId: null - } - } - - return {} - } - private static async getAvailableForApi ( query: FindOptions & { where?: null }, // Forbid where field in query options: AvailableForListIDsOptions, @@ -1689,17 +1743,25 @@ export class VideoModel extends Model { ] } - const [ count, ids ] = await Promise.all([ + const [ count, rows ] = await Promise.all([ countVideos ? VideoModel.scope(countScope).count(countQuery) : Promise.resolve(undefined), VideoModel.scope(idsScope) - .findAll(query) + .findAll(Object.assign({}, query, { raw: true })) .then(rows => rows.map(r => r.id)) + .then(ids => VideoModel.loadCompleteVideosForApi(ids, query, options)) ]) - if (ids.length === 0) return { data: [], total: count } + return { + data: rows, + total: count + } + } + + private static loadCompleteVideosForApi (ids: number[], query: FindOptions, options: AvailableForListIDsOptions) { + if (ids.length === 0) return [] const secondQuery: FindOptions = { offset: 0, @@ -1728,12 +1790,13 @@ export class VideoModel extends Model { ] }) - const rows = await VideoModel.scope(apiScope).findAll(secondQuery) + return VideoModel.scope(apiScope).findAll(secondQuery) + } - return { - data: rows, - total: count - } + private static isPrivacyForFederation (privacy: VideoPrivacy) { + const castedPrivacy = parseInt(privacy + '', 10) + + return castedPrivacy === VideoPrivacy.PUBLIC || castedPrivacy === VideoPrivacy.UNLISTED } static getCategoryLabel (id: number) { @@ -1765,17 +1828,39 @@ export class VideoModel extends Model { this.VideoChannel.Account.isBlocked() } - getOriginalFile () { - if (Array.isArray(this.VideoFiles) === false) return undefined + getQualityFileBy (this: T, fun: (files: MVideoFile[], it: (file: MVideoFile) => number) => MVideoFile) { + if (Array.isArray(this.VideoFiles) && this.VideoFiles.length !== 0) { + const file = fun(this.VideoFiles, file => file.resolution) + + return Object.assign(file, { Video: this }) + } + + // No webtorrent files, try with streaming playlist files + if (Array.isArray(this.VideoStreamingPlaylists) && this.VideoStreamingPlaylists.length !== 0) { + 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 + } + + getMaxQualityFile (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo { + return this.getQualityFileBy(maxBy) + } - // The original file is the file that have the higher resolution - return maxBy(this.VideoFiles, file => file.resolution) + getMinQualityFile (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo { + return this.getQualityFileBy(minBy) } - getFile (resolution: number) { + getWebTorrentFile (this: T, resolution: number): MVideoFileVideo { if (Array.isArray(this.VideoFiles) === false) return undefined - return this.VideoFiles.find(f => f.resolution === resolution) + const file = this.VideoFiles.find(f => f.resolution === resolution) + if (!file) return undefined + + return Object.assign(file, { Video: this }) } async addAndSaveThumbnail (thumbnail: MThumbnail, transaction: Transaction) { @@ -1791,10 +1876,6 @@ export class VideoModel extends Model { this.Thumbnails.push(savedThumbnail) } - getVideoFilename (videoFile: MVideoFile) { - return this.uuid + '-' + videoFile.resolution + videoFile.extname - } - generateThumbnailName () { return this.uuid + '.jpg' } @@ -1815,46 +1896,10 @@ export class VideoModel extends Model { return this.Thumbnails.find(t => t.type === ThumbnailType.PREVIEW) } - getTorrentFileName (videoFile: MVideoFile) { - const extension = '.torrent' - return this.uuid + '-' + videoFile.resolution + extension - } - isOwned () { return this.remote === false } - getTorrentFilePath (videoFile: MVideoFile) { - return join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile)) - } - - getVideoFilePath (videoFile: MVideoFile) { - return join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile)) - } - - async createTorrentAndSetInfoHash (videoFile: MVideoFile) { - const options = { - // Keep the extname, it's used by the client to stream the file inside a web browser - name: `${this.name} ${videoFile.resolution}p${videoFile.extname}`, - createdBy: 'PeerTube', - announceList: [ - [ WEBSERVER.WS + '://' + WEBSERVER.HOSTNAME + ':' + WEBSERVER.PORT + '/tracker/socket' ], - [ WEBSERVER.URL + '/tracker/announce' ] - ], - urlList: [ WEBSERVER.URL + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile) ] - } - - const torrent = await createTorrentPromise(this.getVideoFilePath(videoFile), options) - - const filePath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile)) - logger.info('Creating torrent %s.', filePath) - - await writeFile(filePath, torrent) - - const parsedTorrent = parseTorrent(torrent) - videoFile.infoHash = parsedTorrent.infoHash - } - getWatchStaticPath () { return '/videos/watch/' + this.uuid } @@ -1878,19 +1923,20 @@ export class VideoModel extends Model { return join(LAZY_STATIC_PATHS.PREVIEWS, preview.filename) } - toFormattedJSON (options?: VideoFormattingJSONOptions): Video { + toFormattedJSON (this: MVideoFormattable, options?: VideoFormattingJSONOptions): Video { return videoModelToFormattedJSON(this, options) } - toFormattedDetailsJSON (): VideoDetails { + toFormattedDetailsJSON (this: MVideoFormattableDetails): VideoDetails { return videoModelToFormattedDetailsJSON(this) } getFormattedVideoFilesJSON (): VideoFile[] { - return videoFilesModelToFormattedJSON(this, this.VideoFiles) + const { baseUrlHttp, baseUrlWs } = this.getBaseUrls() + return videoFilesModelToFormattedJSON(this, baseUrlHttp, baseUrlWs, this.VideoFiles) } - toActivityPubObject (): VideoTorrentObject { + toActivityPubObject (this: MVideoAP): VideoTorrentObject { return videoModelToActivityPubObject(this) } @@ -1898,11 +1944,13 @@ export class VideoModel extends Model { if (!this.description) return null const maxLength = CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max - return peertubeTruncate(this.description, maxLength) + return peertubeTruncate(this.description, { length: maxLength }) } - getOriginalFileResolution () { - const originalFilePath = this.getVideoFilePath(this.getOriginalFile()) + getMaxQualityResolution () { + const file = this.getMaxQualityFile() + const videoOrPlaylist = file.getVideoOrStreamingPlaylist() + const originalFilePath = getVideoFilePath(videoOrPlaylist, file) return getVideoFileResolution(originalFilePath) } @@ -1911,32 +1959,58 @@ export class VideoModel extends Model { return `/api/${API_VERSION}/videos/${this.uuid}/description` } - getHLSPlaylist () { + getHLSPlaylist (): MStreamingPlaylistFilesVideo { if (!this.VideoStreamingPlaylists) return undefined - return this.VideoStreamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS) + const playlist = this.VideoStreamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS) + playlist.Video = this + + return playlist } - removeFile (videoFile: MVideoFile, isRedundancy = false) { - const baseDir = isRedundancy ? CONFIG.STORAGE.REDUNDANCY_DIR : CONFIG.STORAGE.VIDEOS_DIR + setHLSPlaylist (playlist: MStreamingPlaylist) { + const toAdd = [ playlist ] as [ VideoStreamingPlaylistModel ] - const filePath = join(baseDir, this.getVideoFilename(videoFile)) + if (Array.isArray(this.VideoStreamingPlaylists) === false || this.VideoStreamingPlaylists.length === 0) { + this.VideoStreamingPlaylists = toAdd + return + } + + this.VideoStreamingPlaylists = this.VideoStreamingPlaylists + .filter(s => s.type !== VideoStreamingPlaylistType.HLS) + .concat(toAdd) + } + + removeFile (videoFile: MVideoFile, isRedundancy = false) { + const filePath = getVideoFilePath(this, videoFile, isRedundancy) return remove(filePath) .catch(err => logger.warn('Cannot delete file %s.', filePath, { err })) } removeTorrent (videoFile: MVideoFile) { - const torrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile)) + const torrentPath = getTorrentFilePath(this, videoFile) return remove(torrentPath) .catch(err => logger.warn('Cannot delete torrent %s.', torrentPath, { err })) } - removeStreamingPlaylist (isRedundancy = false) { - const baseDir = isRedundancy ? HLS_REDUNDANCY_DIRECTORY : HLS_STREAMING_PLAYLIST_DIRECTORY + async removeStreamingPlaylistFiles (streamingPlaylist: MStreamingPlaylist, isRedundancy = false) { + const directoryPath = getHLSDirectory(this, isRedundancy) - const filePath = join(baseDir, this.uuid) - return remove(filePath) - .catch(err => logger.warn('Cannot delete playlist directory %s.', filePath, { err })) + await remove(directoryPath) + + if (isRedundancy !== true) { + let streamingPlaylistWithFiles = streamingPlaylist as MStreamingPlaylistFilesVideo + streamingPlaylistWithFiles.Video = this + + if (!Array.isArray(streamingPlaylistWithFiles.VideoFiles)) { + streamingPlaylistWithFiles.VideoFiles = await streamingPlaylistWithFiles.$get('VideoFiles') + } + + // Remove physical files and torrents + await Promise.all( + streamingPlaylistWithFiles.VideoFiles.map(file => streamingPlaylistWithFiles.removeTorrent(file)) + ) + } } isOutdated () { @@ -1945,44 +2019,62 @@ export class VideoModel extends Model { return isOutdated(this, ACTIVITY_PUB.VIDEO_REFRESH_INTERVAL) } + hasPrivacyForFederation () { + return VideoModel.isPrivacyForFederation(this.privacy) + } + + isNewVideo (newPrivacy: VideoPrivacy) { + return this.hasPrivacyForFederation() === false && VideoModel.isPrivacyForFederation(newPrivacy) === true + } + setAsRefreshed () { this.changed('updatedAt', true) return this.save() } - getBaseUrls () { - let baseUrlHttp - let baseUrlWs + requiresAuth () { + return this.privacy === VideoPrivacy.PRIVATE || this.privacy === VideoPrivacy.INTERNAL || !!this.VideoBlacklist + } - if (this.isOwned()) { - baseUrlHttp = WEBSERVER.URL - baseUrlWs = WEBSERVER.WS + '://' + WEBSERVER.HOSTNAME + ':' + WEBSERVER.PORT - } else { - baseUrlHttp = REMOTE_SCHEME.HTTP + '://' + this.VideoChannel.Account.Actor.Server.host - baseUrlWs = REMOTE_SCHEME.WS + '://' + this.VideoChannel.Account.Actor.Server.host + setPrivacy (newPrivacy: VideoPrivacy) { + if (this.privacy === VideoPrivacy.PRIVATE && newPrivacy !== VideoPrivacy.PRIVATE) { + this.publishedAt = new Date() } - return { baseUrlHttp, baseUrlWs } + this.privacy = newPrivacy } - generateMagnetUri (videoFile: MVideoFileRedundanciesOpt, baseUrlHttp: string, baseUrlWs: string) { - const xs = this.getTorrentUrl(videoFile, baseUrlHttp) - const announce = this.getTrackerUrls(baseUrlHttp, baseUrlWs) - let urlList = [ this.getVideoFileUrl(videoFile, baseUrlHttp) ] + isConfidential () { + return this.privacy === VideoPrivacy.PRIVATE || + this.privacy === VideoPrivacy.UNLISTED || + this.privacy === VideoPrivacy.INTERNAL + } - const redundancies = videoFile.RedundancyVideos - if (isArray(redundancies)) urlList = urlList.concat(redundancies.map(r => r.fileUrl)) + async publishIfNeededAndSave (t: Transaction) { + if (this.state !== VideoState.PUBLISHED) { + this.state = VideoState.PUBLISHED + this.publishedAt = new Date() + await this.save({ transaction: t }) - const magnetHash = { - xs, - announce, - urlList, - infoHash: videoFile.infoHash, - name: this.name + return true } - return magnetUtil.encode(magnetHash) + return false + } + + getBaseUrls () { + if (this.isOwned()) { + return { + baseUrlHttp: WEBSERVER.URL, + baseUrlWs: WEBSERVER.WS + '://' + WEBSERVER.HOSTNAME + ':' + WEBSERVER.PORT + } + } + + return { + baseUrlHttp: REMOTE_SCHEME.HTTP + '://' + this.VideoChannel.Account.Actor.Server.host, + baseUrlWs: REMOTE_SCHEME.WS + '://' + this.VideoChannel.Account.Actor.Server.host + } } getTrackerUrls (baseUrlHttp: string, baseUrlWs: string) { @@ -1990,23 +2082,23 @@ export class VideoModel extends Model { } getTorrentUrl (videoFile: MVideoFile, baseUrlHttp: string) { - return baseUrlHttp + STATIC_PATHS.TORRENTS + this.getTorrentFileName(videoFile) + return baseUrlHttp + STATIC_PATHS.TORRENTS + getTorrentFileName(this, videoFile) } getTorrentDownloadUrl (videoFile: MVideoFile, baseUrlHttp: string) { - return baseUrlHttp + STATIC_DOWNLOAD_PATHS.TORRENTS + this.getTorrentFileName(videoFile) + return baseUrlHttp + STATIC_DOWNLOAD_PATHS.TORRENTS + getTorrentFileName(this, videoFile) } getVideoFileUrl (videoFile: MVideoFile, baseUrlHttp: string) { - return baseUrlHttp + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile) + return baseUrlHttp + STATIC_PATHS.WEBSEED + getVideoFilename(this, videoFile) } getVideoRedundancyUrl (videoFile: MVideoFile, baseUrlHttp: string) { - return baseUrlHttp + STATIC_PATHS.REDUNDANCY + this.getVideoFilename(videoFile) + return baseUrlHttp + STATIC_PATHS.REDUNDANCY + getVideoFilename(this, videoFile) } getVideoFileDownloadUrl (videoFile: MVideoFile, baseUrlHttp: string) { - return baseUrlHttp + STATIC_DOWNLOAD_PATHS.VIDEOS + this.getVideoFilename(videoFile) + return baseUrlHttp + STATIC_DOWNLOAD_PATHS.VIDEOS + getVideoFilename(this, videoFile) } getBandwidthBits (videoFile: MVideoFile) {