X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo.ts;h=27e73bbf126d18dd36987ec89991f2d219c4857c;hb=8cd72bd37724054f8942f2fefc7aa2e60eca74cf;hp=012a758eeaa63df5637e40ede7e40f8493b118f5;hpb=06be7ed0b27b371465c5d1b7f92b4adfb0b866ea;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 012a758ee..27e73bbf1 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -2,7 +2,7 @@ import * as Bluebird from 'bluebird' import { map, maxBy } from 'lodash' import * as magnetUtil from 'magnet-uri' import * as parseTorrent from 'parse-torrent' -import { join } from 'path' +import { extname, join } from 'path' import * as Sequelize from 'sequelize' import { AllowNull, @@ -15,6 +15,7 @@ import { Default, ForeignKey, HasMany, + HasOne, IFindOptions, Is, IsInt, @@ -25,12 +26,12 @@ import { Table, UpdatedAt } from 'sequelize-typescript' -import { VideoPrivacy, VideoResolution } from '../../../shared' +import { VideoPrivacy, VideoResolution, VideoState } from '../../../shared' import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' import { Video, VideoDetails, VideoFile } from '../../../shared/models/videos' import { VideoFilter } from '../../../shared/models/videos/video-query.type' -import { activityPubCollection } from '../../helpers/activitypub' import { + copyFilePromise, createTorrentPromise, peertubeTruncate, renamePromise, @@ -48,9 +49,10 @@ import { isVideoLicenceValid, isVideoNameValid, isVideoPrivacyValid, + isVideoStateValid, isVideoSupportValid } from '../../helpers/custom-validators/videos' -import { generateImageFromVideoFile, getVideoFileResolution, transcode } from '../../helpers/ffmpeg-utils' +import { generateImageFromVideoFile, getVideoFileFPS, getVideoFileResolution, transcode } from '../../helpers/ffmpeg-utils' import { logger } from '../../helpers/logger' import { getServerActor } from '../../helpers/utils' import { @@ -59,12 +61,15 @@ import { CONSTRAINTS_FIELDS, PREVIEWS_SIZE, REMOTE_SCHEME, + STATIC_DOWNLOAD_PATHS, STATIC_PATHS, THUMBNAILS_SIZE, VIDEO_CATEGORIES, + VIDEO_EXT_MIMETYPE, VIDEO_LANGUAGES, VIDEO_LICENCES, - VIDEO_PRIVACIES + VIDEO_PRIVACIES, + VIDEO_STATES } from '../../initializers' import { getVideoCommentsActivityPubUrl, @@ -78,7 +83,7 @@ import { AccountVideoRateModel } from '../account/account-video-rate' import { ActorModel } from '../activitypub/actor' import { AvatarModel } from '../avatar/avatar' import { ServerModel } from '../server/server' -import { getSort, throwIfNotValid } from '../utils' +import { buildTrigramSearchIndex, createSearchTrigramQuery, createSimilarityAttribute, getSort, throwIfNotValid } from '../utils' import { TagModel } from './tag' import { VideoAbuseModel } from './video-abuse' import { VideoChannelModel } from './video-channel' @@ -86,26 +91,61 @@ import { VideoCommentModel } from './video-comment' import { VideoFileModel } from './video-file' import { VideoShareModel } from './video-share' import { VideoTagModel } from './video-tag' +import { ScheduleVideoUpdateModel } from './schedule-video-update' +import { VideoCaptionModel } from './video-caption' +import { VideosSearchQuery } from '../../../shared/models/search' + +// FIXME: Define indexes here because there is an issue with TS and Sequelize.literal when called directly in the annotation +const indexes: Sequelize.DefineIndexesOptions[] = [ + buildTrigramSearchIndex('video_name_trigram', 'name'), + + { fields: [ 'createdAt' ] }, + { fields: [ 'publishedAt' ] }, + { fields: [ 'duration' ] }, + { fields: [ 'category' ] }, + { fields: [ 'licence' ] }, + { fields: [ 'nsfw' ] }, + { fields: [ 'language' ] }, + { fields: [ 'waitTranscoding' ] }, + { fields: [ 'state' ] }, + { fields: [ 'remote' ] }, + { fields: [ 'views' ] }, + { fields: [ 'likes' ] }, + { fields: [ 'channelId' ] }, + { + fields: [ 'uuid' ], + unique: true + }, + { + fields: [ 'url'], + unique: true + } +] -enum ScopeNames { +export enum ScopeNames { AVAILABLE_FOR_LIST = 'AVAILABLE_FOR_LIST', WITH_ACCOUNT_DETAILS = 'WITH_ACCOUNT_DETAILS', WITH_TAGS = 'WITH_TAGS', WITH_FILES = 'WITH_FILES', - WITH_SHARES = 'WITH_SHARES', - WITH_RATES = 'WITH_RATES', - WITH_COMMENTS = 'WITH_COMMENTS' + WITH_SCHEDULED_UPDATE = 'WITH_SCHEDULED_UPDATE' +} + +type AvailableForListOptions = { + actorId: number, + filter?: VideoFilter, + categoryOneOf?: number[], + nsfw?: boolean, + licenceOneOf?: number[], + languageOneOf?: string[], + tagsOneOf?: string[], + tagsAllOf?: string[], + withFiles?: boolean, + accountId?: number, + videoChannelId?: number } @Scopes({ - [ScopeNames.AVAILABLE_FOR_LIST]: (options: { - actorId: number, - hideNSFW: boolean, - filter?: VideoFilter, - withFiles?: boolean, - accountId?: number, - videoChannelId?: number - }) => { + [ScopeNames.AVAILABLE_FOR_LIST]: (options: AvailableForListOptions) => { const accountInclude = { attributes: [ 'id', 'name' ], model: AccountModel.unscoped(), @@ -168,20 +208,33 @@ enum ScopeNames { ), [ Sequelize.Op.in ]: Sequelize.literal( '(' + - 'SELECT "videoShare"."videoId" AS "id" FROM "videoShare" ' + - 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' + - 'WHERE "actorFollow"."actorId" = ' + actorIdNumber + - ' UNION ' + - '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" ' + - 'LEFT JOIN "actorFollow" ON "actorFollow"."targetActorId" = "actor"."id" ' + - 'WHERE "actor"."serverId" IS NULL OR "actorFollow"."actorId" = ' + actorIdNumber + + 'SELECT "videoShare"."videoId" AS "id" FROM "videoShare" ' + + 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' + + 'WHERE "actorFollow"."actorId" = ' + actorIdNumber + + ' UNION ' + + '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 OR ' + + '"actor"."id" IN (SELECT "targetActorId" FROM "actorFollow" WHERE "actorId" = 1)' + // Subquery for optimization ')' ) }, - privacy: VideoPrivacy.PUBLIC + // Always list public videos + privacy: VideoPrivacy.PUBLIC, + // Always list published videos, or videos that are being transcoded but on which we don't want to wait for transcoding + [ Sequelize.Op.or ]: [ + { + state: VideoState.PUBLISHED + }, + { + [ Sequelize.Op.and ]: { + state: VideoState.TO_TRANSCODE, + waitTranscoding: false + } + } + ] }, include: [ videoChannelInclude ] } @@ -193,9 +246,55 @@ enum ScopeNames { }) } - // Hide nsfw videos? - if (options.hideNSFW === true) { - query.where['nsfw'] = false + // FIXME: issues with sequelize count when making a join on n:m relation, so we just make a IN() + if (options.tagsAllOf || options.tagsOneOf) { + const createTagsIn = (tags: string[]) => { + return tags.map(t => VideoModel.sequelize.escape(t)) + .join(', ') + } + + if (options.tagsOneOf) { + query.where['id'][Sequelize.Op.in] = Sequelize.literal( + '(' + + 'SELECT "videoId" FROM "videoTag" ' + + 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' + + 'WHERE "tag"."name" IN (' + createTagsIn(options.tagsOneOf) + ')' + + ')' + ) + } + + if (options.tagsAllOf) { + query.where['id'][Sequelize.Op.in] = Sequelize.literal( + '(' + + 'SELECT "videoId" FROM "videoTag" ' + + 'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' + + 'WHERE "tag"."name" IN (' + createTagsIn(options.tagsAllOf) + ')' + + 'GROUP BY "videoTag"."videoId" HAVING COUNT(*) = ' + options.tagsAllOf.length + + ')' + ) + } + } + + if (options.nsfw === true || options.nsfw === false) { + query.where['nsfw'] = options.nsfw + } + + if (options.categoryOneOf) { + query.where['category'] = { + [Sequelize.Op.or]: options.categoryOneOf + } + } + + if (options.licenceOneOf) { + query.where['licence'] = { + [Sequelize.Op.or]: options.licenceOneOf + } + } + + if (options.languageOneOf) { + query.where['language'] = { + [Sequelize.Op.or]: options.languageOneOf + } } if (options.accountId) { @@ -229,6 +328,10 @@ enum ScopeNames { attributes: [ 'host' ], model: () => ServerModel.unscoped(), required: false + }, + { + model: () => AvatarModel.unscoped(), + required: false } ] }, @@ -271,75 +374,18 @@ enum ScopeNames { } ] }, - [ScopeNames.WITH_SHARES]: { - include: [ - { - ['separate' as any]: true, - model: () => VideoShareModel.unscoped() - } - ] - }, - [ScopeNames.WITH_RATES]: { - include: [ - { - ['separate' as any]: true, - model: () => AccountVideoRateModel, - include: [ - { - model: () => AccountModel.unscoped(), - required: true, - include: [ - { - attributes: [ 'url' ], - model: () => ActorModel.unscoped() - } - ] - } - ] - } - ] - }, - [ScopeNames.WITH_COMMENTS]: { + [ScopeNames.WITH_SCHEDULED_UPDATE]: { include: [ { - ['separate' as any]: true, - model: () => VideoCommentModel.unscoped() + model: () => ScheduleVideoUpdateModel.unscoped(), + required: false } ] } }) @Table({ tableName: 'video', - indexes: [ - { - fields: [ 'name' ] - }, - { - fields: [ 'createdAt' ] - }, - { - fields: [ 'duration' ] - }, - { - fields: [ 'views' ] - }, - { - fields: [ 'likes' ] - }, - { - fields: [ 'uuid' ] - }, - { - fields: [ 'channelId' ] - }, - { - fields: [ 'id', 'privacy' ] - }, - { - fields: [ 'url'], - unique: true - } - ] + indexes }) export class VideoModel extends Model { @@ -433,6 +479,16 @@ export class VideoModel extends Model { @Column commentsEnabled: boolean + @AllowNull(false) + @Column + waitTranscoding: boolean + + @AllowNull(false) + @Default(null) + @Is('VideoState', value => throwIfNotValid(value, isVideoStateValid, 'state')) + @Column + state: VideoState + @CreatedAt createdAt: Date @@ -509,6 +565,26 @@ export class VideoModel extends Model { }) VideoComments: VideoCommentModel[] + @HasOne(() => ScheduleVideoUpdateModel, { + foreignKey: { + name: 'videoId', + allowNull: false + }, + onDelete: 'cascade' + }) + ScheduleVideoUpdate: ScheduleVideoUpdateModel + + @HasMany(() => VideoCaptionModel, { + foreignKey: { + name: 'videoId', + allowNull: false + }, + onDelete: 'cascade', + hooks: true, + ['separate' as any]: true + }) + VideoCaptions: VideoCaptionModel[] + @BeforeDestroy static async sendDelete (instance: VideoModel, options) { if (instance.isOwned()) { @@ -533,7 +609,7 @@ export class VideoModel extends Model { } @BeforeDestroy - static async removeFilesAndSendDelete (instance: VideoModel) { + static async removeFiles (instance: VideoModel) { const tasks: Promise[] = [] logger.debug('Removing files of video %s.', instance.url) @@ -598,10 +674,16 @@ export class VideoModel extends Model { ] }, include: [ + { + attributes: [ 'language' ], + model: VideoCaptionModel.unscoped(), + required: false + }, { attributes: [ 'id', 'url' ], model: VideoShareModel.unscoped(), required: false, + // We only want videos shared by this actor where: { [Sequelize.Op.and]: [ { @@ -631,48 +713,19 @@ export class VideoModel extends Model { required: true, include: [ { - attributes: [ 'id', 'url' ], + attributes: [ 'id', 'url', 'followersUrl' ], model: ActorModel.unscoped(), required: true } ] }, { - attributes: [ 'id', 'url' ], + attributes: [ 'id', 'url', 'followersUrl' ], model: ActorModel.unscoped(), required: true } ] }, - { - attributes: [ 'type' ], - model: AccountVideoRateModel, - required: false, - include: [ - { - attributes: [ 'id' ], - model: AccountModel.unscoped(), - include: [ - { - attributes: [ 'url' ], - model: ActorModel.unscoped(), - include: [ - { - attributes: [ 'host' ], - model: ServerModel, - required: false - } - ] - } - ] - } - ] - }, - { - attributes: [ 'url' ], - model: VideoCommentModel, - required: false - }, VideoFileModel, TagModel ] @@ -697,7 +750,7 @@ export class VideoModel extends Model { }) } - static listAccountVideosForApi (accountId: number, start: number, count: number, sort: string, hideNSFW: boolean, withFiles = false) { + static listUserVideosForApi (accountId: number, start: number, count: number, sort: string, hideNSFW: boolean, withFiles = false) { const query: IFindOptions = { offset: start, limit: count, @@ -715,6 +768,10 @@ export class VideoModel extends Model { required: true } ] + }, + { + model: ScheduleVideoUpdateModel, + required: false } ] } @@ -744,8 +801,13 @@ export class VideoModel extends Model { start: number, count: number, sort: string, - hideNSFW: boolean, + nsfw: boolean, withFiles: boolean, + categoryOneOf?: number[], + licenceOneOf?: number[], + languageOneOf?: string[], + tagsOneOf?: string[], + tagsAllOf?: string[], filter?: VideoFilter, accountId?: number, videoChannelId?: number @@ -761,12 +823,17 @@ export class VideoModel extends Model { method: [ ScopeNames.AVAILABLE_FOR_LIST, { actorId: serverActor.id, - hideNSFW: options.hideNSFW, + nsfw: options.nsfw, + categoryOneOf: options.categoryOneOf, + licenceOneOf: options.licenceOneOf, + languageOneOf: options.languageOneOf, + tagsOneOf: options.tagsOneOf, + tagsAllOf: options.tagsAllOf, filter: options.filter, withFiles: options.withFiles, accountId: options.accountId, videoChannelId: options.videoChannelId - } + } as AvailableForListOptions ] } @@ -780,34 +847,53 @@ export class VideoModel extends Model { }) } - static async searchAndPopulateAccountAndServer (value: string, start: number, count: number, sort: string, hideNSFW: boolean) { + static async searchAndPopulateAccountAndServer (options: { + search: string + start?: number + count?: number + sort?: string + startDate?: string // ISO 8601 + endDate?: string // ISO 8601 + nsfw?: boolean + categoryOneOf?: number[] + licenceOneOf?: number[] + languageOneOf?: string[] + tagsOneOf?: string[] + tagsAllOf?: string[] + durationMin?: number // seconds + durationMax?: number // seconds + }) { + const whereAnd = [ ] + + if (options.startDate || options.endDate) { + const publishedAtRange = { } + + if (options.startDate) publishedAtRange[Sequelize.Op.gte] = options.startDate + if (options.endDate) publishedAtRange[Sequelize.Op.lte] = options.endDate + + whereAnd.push({ publishedAt: publishedAtRange }) + } + + if (options.durationMin || options.durationMax) { + const durationRange = { } + + if (options.durationMin) durationRange[Sequelize.Op.gte] = options.durationMin + if (options.durationMax) durationRange[Sequelize.Op.lte] = options.durationMax + + whereAnd.push({ duration: durationRange }) + } + + whereAnd.push(createSearchTrigramQuery('VideoModel.name', options.search)) + const query: IFindOptions = { - offset: start, - limit: count, - order: getSort(sort), + attributes: { + include: [ createSimilarityAttribute('VideoModel.name', options.search) ] + }, + offset: options.start, + limit: options.count, + order: getSort(options.sort), where: { - [Sequelize.Op.or]: [ - { - name: { - [ Sequelize.Op.iLike ]: '%' + value + '%' - } - }, - { - preferredUsernameChannel: Sequelize.where(Sequelize.col('VideoChannel->Actor.preferredUsername'), { - [ Sequelize.Op.iLike ]: '%' + value + '%' - }) - }, - { - preferredUsernameAccount: Sequelize.where(Sequelize.col('VideoChannel->Account->Actor.preferredUsername'), { - [ Sequelize.Op.iLike ]: '%' + value + '%' - }) - }, - { - host: Sequelize.where(Sequelize.col('VideoChannel->Account->Actor->Server.host'), { - [ Sequelize.Op.iLike ]: '%' + value + '%' - }) - } - ] + [ Sequelize.Op.and ]: whereAnd } } @@ -816,8 +902,13 @@ export class VideoModel extends Model { method: [ ScopeNames.AVAILABLE_FOR_LIST, { actorId: serverActor.id, - hideNSFW - } + nsfw: options.nsfw, + categoryOneOf: options.categoryOneOf, + licenceOneOf: options.licenceOneOf, + languageOneOf: options.languageOneOf, + tagsOneOf: options.tagsOneOf, + tagsAllOf: options.tagsAllOf + } as AvailableForListOptions ] } @@ -868,7 +959,7 @@ export class VideoModel extends Model { } return VideoModel - .scope([ ScopeNames.WITH_TAGS, ScopeNames.WITH_FILES, ScopeNames.WITH_ACCOUNT_DETAILS ]) + .scope([ ScopeNames.WITH_TAGS, ScopeNames.WITH_FILES, ScopeNames.WITH_ACCOUNT_DETAILS, ScopeNames.WITH_SCHEDULED_UPDATE ]) .findById(id, options) } @@ -884,36 +975,17 @@ export class VideoModel extends Model { .findOne(options) } - static loadByUUIDAndPopulateAccountAndServerAndTags (uuid: string) { + static loadByUUIDAndPopulateAccountAndServerAndTags (uuid: string, t?: Sequelize.Transaction) { const options = { order: [ [ 'Tags', 'name', 'ASC' ] ], where: { uuid - } - } - - return VideoModel - .scope([ ScopeNames.WITH_TAGS, ScopeNames.WITH_FILES, ScopeNames.WITH_ACCOUNT_DETAILS ]) - .findOne(options) - } - - static loadAndPopulateAll (id: number) { - const options = { - order: [ [ 'Tags', 'name', 'ASC' ] ], - where: { - id - } + }, + transaction: t } return VideoModel - .scope([ - ScopeNames.WITH_RATES, - ScopeNames.WITH_SHARES, - ScopeNames.WITH_TAGS, - ScopeNames.WITH_FILES, - ScopeNames.WITH_ACCOUNT_DETAILS, - ScopeNames.WITH_COMMENTS - ]) + .scope([ ScopeNames.WITH_TAGS, ScopeNames.WITH_FILES, ScopeNames.WITH_ACCOUNT_DETAILS, ScopeNames.WITH_SCHEDULED_UPDATE ]) .findOne(options) } @@ -951,31 +1023,23 @@ export class VideoModel extends Model { } private static getCategoryLabel (id: number) { - let categoryLabel = VIDEO_CATEGORIES[id] - if (!categoryLabel) categoryLabel = 'Misc' - - return categoryLabel + return VIDEO_CATEGORIES[id] || 'Misc' } private static getLicenceLabel (id: number) { - let licenceLabel = VIDEO_LICENCES[id] - if (!licenceLabel) licenceLabel = 'Unknown' - - return licenceLabel + return VIDEO_LICENCES[id] || 'Unknown' } private static getLanguageLabel (id: string) { - let languageLabel = VIDEO_LANGUAGES[id] - if (!languageLabel) languageLabel = 'Unknown' - - return languageLabel + return VIDEO_LANGUAGES[id] || 'Unknown' } private static getPrivacyLabel (id: number) { - let privacyLabel = VIDEO_PRIVACIES[id] - if (!privacyLabel) privacyLabel = 'Unknown' + return VIDEO_PRIVACIES[id] || 'Unknown' + } - return privacyLabel + private static getStateLabel (id: number) { + return VIDEO_STATES[id] || 'Unknown' } getOriginalFile () { @@ -1027,6 +1091,10 @@ export class VideoModel extends Model { ) } + getTorrentFilePath (videoFile: VideoFileModel) { + return join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile)) + } + getVideoFilePath (videoFile: VideoFileModel) { return join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile)) } @@ -1056,23 +1124,29 @@ export class VideoModel extends Model { videoFile.infoHash = parsedTorrent.infoHash } - getEmbedPath () { + getEmbedStaticPath () { return '/videos/embed/' + this.uuid } - getThumbnailPath () { + getThumbnailStaticPath () { return join(STATIC_PATHS.THUMBNAILS, this.getThumbnailName()) } - getPreviewPath () { + getPreviewStaticPath () { return join(STATIC_PATHS.PREVIEWS, this.getPreviewName()) } - toFormattedJSON (): Video { + toFormattedJSON (options?: { + additionalAttributes: { + state?: boolean, + waitTranscoding?: boolean, + scheduledUpdate?: boolean + } + }): Video { const formattedAccount = this.VideoChannel.Account.toFormattedJSON() const formattedVideoChannel = this.VideoChannel.toFormattedJSON() - return { + const videoObject: Video = { id: this.id, uuid: this.uuid, name: this.name, @@ -1099,9 +1173,9 @@ export class VideoModel extends Model { views: this.views, likes: this.likes, dislikes: this.dislikes, - thumbnailPath: this.getThumbnailPath(), - previewPath: this.getPreviewPath(), - embedPath: this.getEmbedPath(), + thumbnailPath: this.getThumbnailStaticPath(), + previewPath: this.getPreviewStaticPath(), + embedPath: this.getEmbedStaticPath(), createdAt: this.createdAt, updatedAt: this.updatedAt, publishedAt: this.publishedAt, @@ -1124,10 +1198,36 @@ export class VideoModel extends Model { avatar: formattedVideoChannel.avatar } } + + if (options) { + if (options.additionalAttributes.state === true) { + videoObject.state = { + id: this.state, + label: VideoModel.getStateLabel(this.state) + } + } + + if (options.additionalAttributes.waitTranscoding === true) { + videoObject.waitTranscoding = this.waitTranscoding + } + + if (options.additionalAttributes.scheduledUpdate === true && this.ScheduleVideoUpdate) { + videoObject.scheduledUpdate = { + updateAt: this.ScheduleVideoUpdate.updateAt, + privacy: this.ScheduleVideoUpdate.privacy || undefined + } + } + } + + return videoObject } toFormattedDetailsJSON (): VideoDetails { - const formattedJson = this.toFormattedJSON() + const formattedJson = this.toFormattedJSON({ + additionalAttributes: { + scheduledUpdate: true + } + }) const detailsJson = { support: this.support, @@ -1136,6 +1236,11 @@ export class VideoModel extends Model { account: this.VideoChannel.Account.toFormattedJSON(), tags: map(this.Tags, 'name'), commentsEnabled: this.commentsEnabled, + waitTranscoding: this.waitTranscoding, + state: { + id: this.state, + label: VideoModel.getStateLabel(this.state) + }, files: [] } @@ -1159,8 +1264,11 @@ export class VideoModel extends Model { }, magnetUri: this.generateMagnetUri(videoFile, baseUrlHttp, baseUrlWs), size: videoFile.size, + fps: videoFile.fps, torrentUrl: this.getTorrentUrl(videoFile, baseUrlHttp), - fileUrl: this.getVideoFileUrl(videoFile, baseUrlHttp) + torrentDownloadUrl: this.getTorrentDownloadUrl(videoFile, baseUrlHttp), + fileUrl: this.getVideoFileUrl(videoFile, baseUrlHttp), + fileDownloadUrl: this.getVideoFileDownloadUrl(videoFile, baseUrlHttp) } as VideoFile }) .sort((a, b) => { @@ -1203,30 +1311,11 @@ export class VideoModel extends Model { } } - let likesObject - let dislikesObject - - if (Array.isArray(this.AccountVideoRates)) { - const res = this.toRatesActivityPubObjects() - likesObject = res.likesObject - dislikesObject = res.dislikesObject - } - - let sharesObject - if (Array.isArray(this.VideoShares)) { - sharesObject = this.toAnnouncesActivityPubObject() - } - - let commentsObject - if (Array.isArray(this.VideoComments)) { - commentsObject = this.toCommentsActivityPubObject() - } - const url = [] for (const file of this.VideoFiles) { url.push({ type: 'Link', - mimeType: 'video/' + file.extname.replace('.', ''), + mimeType: VIDEO_EXT_MIMETYPE[file.extname], href: this.getVideoFileUrl(file, baseUrlHttp), width: file.resolution, size: file.size @@ -1254,6 +1343,14 @@ export class VideoModel extends Model { href: CONFIG.WEBSERVER.URL + '/videos/watch/' + this.uuid }) + const subtitleLanguage = [] + for (const caption of this.VideoCaptions) { + subtitleLanguage.push({ + identifier: caption.language, + name: VideoCaptionModel.getLanguageLabel(caption.language) + }) + } + return { type: 'Video' as 'Video', id: this.url, @@ -1266,12 +1363,15 @@ export class VideoModel extends Model { language, views: this.views, sensitive: this.nsfw, + waitTranscoding: this.waitTranscoding, + state: this.state, commentsEnabled: this.commentsEnabled, published: this.publishedAt.toISOString(), updated: this.updatedAt.toISOString(), mediaType: 'text/markdown', content: this.getTruncatedDescription(), support: this.support, + subtitleLanguage, icon: { type: 'Image', url: this.getThumbnailUrl(baseUrlHttp), @@ -1280,10 +1380,10 @@ export class VideoModel extends Model { height: THUMBNAILS_SIZE.height }, url, - likes: likesObject, - dislikes: dislikesObject, - shares: sharesObject, - comments: commentsObject, + likes: getVideoLikesActivityPubUrl(this), + dislikes: getVideoDislikesActivityPubUrl(this), + shares: getVideoSharesActivityPubUrl(this), + comments: getVideoCommentsActivityPubUrl(this), attributedTo: [ { type: 'Person', @@ -1297,44 +1397,6 @@ export class VideoModel extends Model { } } - toAnnouncesActivityPubObject () { - const shares: string[] = [] - - for (const videoShare of this.VideoShares) { - shares.push(videoShare.url) - } - - return activityPubCollection(getVideoSharesActivityPubUrl(this), shares) - } - - toCommentsActivityPubObject () { - const comments: string[] = [] - - for (const videoComment of this.VideoComments) { - comments.push(videoComment.url) - } - - return activityPubCollection(getVideoCommentsActivityPubUrl(this), comments) - } - - toRatesActivityPubObjects () { - const likes: string[] = [] - const dislikes: string[] = [] - - for (const rate of this.AccountVideoRates) { - if (rate.type === 'like') { - likes.push(rate.Account.Actor.url) - } else if (rate.type === 'dislike') { - dislikes.push(rate.Account.Actor.url) - } - } - - const likesObject = activityPubCollection(getVideoLikesActivityPubUrl(this), likes) - const dislikesObject = activityPubCollection(getVideoDislikesActivityPubUrl(this), dislikes) - - return { likesObject, dislikesObject } - } - getTruncatedDescription () { if (!this.description) return null @@ -1347,11 +1409,11 @@ export class VideoModel extends Model { const newExtname = '.mp4' const inputVideoFile = this.getOriginalFile() const videoInputPath = join(videosDirectory, this.getVideoFilename(inputVideoFile)) - const videoOutputPath = join(videosDirectory, this.id + '-transcoded' + newExtname) + const videoTranscodedPath = join(videosDirectory, this.id + '-transcoded' + newExtname) const transcodeOptions = { inputPath: videoInputPath, - outputPath: videoOutputPath + outputPath: videoTranscodedPath } // Could be very long! @@ -1363,10 +1425,13 @@ export class VideoModel extends Model { // Important to do this before getVideoFilename() to take in account the new file extension inputVideoFile.set('extname', newExtname) - await renamePromise(videoOutputPath, this.getVideoFilePath(inputVideoFile)) - const stats = await statPromise(this.getVideoFilePath(inputVideoFile)) + const videoOutputPath = this.getVideoFilePath(inputVideoFile) + await renamePromise(videoTranscodedPath, videoOutputPath) + const stats = await statPromise(videoOutputPath) + const fps = await getVideoFileFPS(videoOutputPath) inputVideoFile.set('size', stats.size) + inputVideoFile.set('fps', fps) await this.createTorrentAndSetInfoHash(inputVideoFile) await inputVideoFile.save() @@ -1404,8 +1469,10 @@ export class VideoModel extends Model { await transcode(transcodeOptions) const stats = await statPromise(videoOutputPath) + const fps = await getVideoFileFPS(videoOutputPath) newVideoFile.set('size', stats.size) + newVideoFile.set('fps', fps) await this.createTorrentAndSetInfoHash(newVideoFile) @@ -1414,6 +1481,46 @@ export class VideoModel extends Model { this.VideoFiles.push(newVideoFile) } + async importVideoFile (inputFilePath: string) { + const { videoFileResolution } = await getVideoFileResolution(inputFilePath) + const { size } = await statPromise(inputFilePath) + const fps = await getVideoFileFPS(inputFilePath) + + let updatedVideoFile = new VideoFileModel({ + resolution: videoFileResolution, + extname: extname(inputFilePath), + size, + fps, + videoId: this.id + }) + + const currentVideoFile = this.VideoFiles.find(videoFile => videoFile.resolution === updatedVideoFile.resolution) + + if (currentVideoFile) { + // Remove old file and old torrent + await this.removeFile(currentVideoFile) + await this.removeTorrent(currentVideoFile) + // Remove the old video file from the array + this.VideoFiles = this.VideoFiles.filter(f => f !== currentVideoFile) + + // Update the database + currentVideoFile.set('extname', updatedVideoFile.extname) + currentVideoFile.set('size', updatedVideoFile.size) + currentVideoFile.set('fps', updatedVideoFile.fps) + + updatedVideoFile = currentVideoFile + } + + const outputPath = this.getVideoFilePath(updatedVideoFile) + await copyFilePromise(inputFilePath, outputPath) + + await this.createTorrentAndSetInfoHash(updatedVideoFile) + + await updatedVideoFile.save() + + this.VideoFiles.push(updatedVideoFile) + } + getOriginalFileResolution () { const originalFilePath = this.getVideoFilePath(this.getOriginalFile()) @@ -1472,10 +1579,18 @@ export class VideoModel extends Model { return baseUrlHttp + STATIC_PATHS.TORRENTS + this.getTorrentFileName(videoFile) } + private getTorrentDownloadUrl (videoFile: VideoFileModel, baseUrlHttp: string) { + return baseUrlHttp + STATIC_DOWNLOAD_PATHS.TORRENTS + this.getTorrentFileName(videoFile) + } + private getVideoFileUrl (videoFile: VideoFileModel, baseUrlHttp: string) { return baseUrlHttp + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile) } + private getVideoFileDownloadUrl (videoFile: VideoFileModel, baseUrlHttp: string) { + return baseUrlHttp + STATIC_DOWNLOAD_PATHS.VIDEOS + this.getVideoFilename(videoFile) + } + private generateMagnetUri (videoFile: VideoFileModel, baseUrlHttp: string, baseUrlWs: string) { const xs = this.getTorrentUrl(videoFile, baseUrlHttp) const announce = [ baseUrlWs + '/tracker/socket', baseUrlHttp + '/tracker/announce' ]