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 {
- AfterDestroy,
AllowNull,
BeforeDestroy,
BelongsTo,
Default,
ForeignKey,
HasMany,
+ HasOne,
IFindOptions,
Is,
IsInt,
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 {
- createTorrentPromise, peertubeTruncate, renamePromise, statPromise, unlinkPromise,
+ copyFilePromise,
+ createTorrentPromise,
+ peertubeTruncate,
+ renamePromise,
+ statPromise,
+ unlinkPromise,
writeFilePromise
} from '../../helpers/core-utils'
import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
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 {
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,
import { ActorModel } from '../activitypub/actor'
import { AvatarModel } from '../avatar/avatar'
import { ServerModel } from '../server/server'
-import { getSort, throwIfNotValid } from '../utils'
+import { buildTrigramSearchIndex, createSimilarityAttribute, getSort, throwIfNotValid } from '../utils'
import { TagModel } from './tag'
import { VideoAbuseModel } from './video-abuse'
import { VideoChannelModel } from './video-channel'
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'
+
+// 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]: (actorId: number, filter?: VideoFilter, withFiles?: boolean) => {
+ [ScopeNames.AVAILABLE_FOR_LIST]: (options: AvailableForListOptions) => {
+ const accountInclude = {
+ attributes: [ 'id', 'name' ],
+ model: AccountModel.unscoped(),
+ required: true,
+ where: {},
+ include: [
+ {
+ attributes: [ 'id', 'uuid', 'preferredUsername', 'url', 'serverId', 'avatarId' ],
+ model: ActorModel.unscoped(),
+ required: true,
+ where: VideoModel.buildActorWhereWithFilter(options.filter),
+ include: [
+ {
+ attributes: [ 'host' ],
+ model: ServerModel.unscoped(),
+ required: false
+ },
+ {
+ model: AvatarModel.unscoped(),
+ required: false
+ }
+ ]
+ }
+ ]
+ }
+
+ const videoChannelInclude = {
+ attributes: [ 'name', 'description', 'id' ],
+ model: VideoChannelModel.unscoped(),
+ required: true,
+ where: {},
+ include: [
+ {
+ attributes: [ 'uuid', 'preferredUsername', 'url', 'serverId', 'avatarId' ],
+ model: ActorModel.unscoped(),
+ required: true,
+ include: [
+ {
+ attributes: [ 'host' ],
+ model: ServerModel.unscoped(),
+ required: false
+ },
+ {
+ model: AvatarModel.unscoped(),
+ required: false
+ }
+ ]
+ },
+ accountInclude
+ ]
+ }
+
+ // Force actorId to be a number to avoid SQL injections
+ const actorIdNumber = parseInt(options.actorId.toString(), 10)
+
+ // FIXME: It would be more efficient to use a CTE so we join AFTER the filters, but sequelize does not support it...
const query: IFindOptions<VideoModel> = {
where: {
id: {
),
[ Sequelize.Op.in ]: Sequelize.literal(
'(' +
- 'SELECT "videoShare"."videoId" AS "id" FROM "videoShare" ' +
- 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' +
- 'WHERE "actorFollow"."actorId" = ' + parseInt(actorId.toString(), 10) +
- ' 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" = ' + parseInt(actorId.toString(), 10) +
+ '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 ' +
+ ' 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 +
')'
)
},
- privacy: VideoPrivacy.PUBLIC
- },
- include: [
- {
- attributes: [ 'name', 'description' ],
- model: VideoChannelModel.unscoped(),
- required: true,
- include: [
- {
- attributes: [ 'name' ],
- model: AccountModel.unscoped(),
- required: true,
- include: [
- {
- attributes: [ 'preferredUsername', 'url', 'serverId', 'avatarId' ],
- model: ActorModel.unscoped(),
- required: true,
- where: VideoModel.buildActorWhereWithFilter(filter),
- include: [
- {
- attributes: [ 'host' ],
- model: ServerModel.unscoped(),
- required: false
- },
- {
- model: AvatarModel.unscoped(),
- required: false
- }
- ]
- }
- ]
+ // 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 ]
}
- if (withFiles === true) {
+ if (options.withFiles === true) {
query.include.push({
model: VideoFileModel.unscoped(),
required: true
})
}
+ // 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) {
+ accountInclude.where = {
+ id: options.accountId
+ }
+ }
+
+ if (options.videoChannelId) {
+ videoChannelInclude.where = {
+ id: options.videoChannelId
+ }
+ }
+
return query
},
[ScopeNames.WITH_ACCOUNT_DETAILS]: {
attributes: [ 'host' ],
model: () => ServerModel.unscoped(),
required: false
+ },
+ {
+ model: () => AvatarModel.unscoped(),
+ required: false
}
]
},
include: [
{
model: () => VideoFileModel.unscoped(),
- required: true
- }
- ]
- },
- [ScopeNames.WITH_SHARES]: {
- include: [
- {
- model: () => VideoShareModel.unscoped()
+ required: false
}
]
},
- [ScopeNames.WITH_RATES]: {
+ [ScopeNames.WITH_SCHEDULED_UPDATE]: {
include: [
{
- model: () => AccountVideoRateModel,
- include: [
- {
- model: () => AccountModel.unscoped(),
- required: true,
- include: [
- {
- attributes: [ 'url' ],
- model: () => ActorModel.unscoped()
- }
- ]
- }
- ]
- }
- ]
- },
- [ScopeNames.WITH_COMMENTS]: {
- include: [
- {
- 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<VideoModel> {
@AllowNull(true)
@Default(null)
@Is('VideoLanguage', value => throwIfNotValid(value, isVideoLanguageValid, 'language'))
- @Column
- language: number
+ @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.LANGUAGE.max))
+ language: string
@AllowNull(false)
@Is('VideoPrivacy', value => throwIfNotValid(value, isVideoPrivacyValid, 'privacy'))
@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
foreignKey: {
allowNull: true
},
- onDelete: 'cascade'
+ hooks: true
})
VideoChannel: VideoChannelModel
})
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()) {
}) as VideoChannelModel
}
- logger.debug('Sending delete of video %s.', instance.url)
-
return sendDeleteVideo(instance, options.transaction)
}
return undefined
}
- @AfterDestroy
- static async removeFilesAndSendDelete (instance: VideoModel) {
+ @BeforeDestroy
+ static async removeFiles (instance: VideoModel) {
const tasks: Promise<any>[] = []
+ logger.info('Removing files of video %s.', instance.url)
+
tasks.push(instance.removeThumbnail())
if (instance.isOwned()) {
})
}
- return Promise.all(tasks)
+ // Do not wait video deletion because we could be in a transaction
+ Promise.all(tasks)
.catch(err => {
- logger.error('Some errors when removing files of video %s in after destroy hook.', instance.uuid, { err })
+ logger.error('Some errors when removing files of video %s in before destroy hook.', instance.uuid, { err })
})
+
+ return undefined
}
static list () {
]
},
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]: [
{
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
]
})
}
- static listAccountVideosForApi (accountId: number, start: number, count: number, sort: string, withFiles = false) {
+ static listUserVideosForApi (accountId: number, start: number, count: number, sort: string, hideNSFW: boolean, withFiles = false) {
const query: IFindOptions<VideoModel> = {
offset: start,
limit: count,
required: true
}
]
+ },
+ {
+ model: ScheduleVideoUpdateModel,
+ required: false
}
]
}
})
}
+ if (hideNSFW === true) {
+ query.where = {
+ nsfw: false
+ }
+ }
+
return VideoModel.findAndCountAll(query).then(({ rows, count }) => {
return {
data: rows,
})
}
- static async listForApi (start: number, count: number, sort: string, filter?: VideoFilter, withFiles = false) {
+ static async listForApi (options: {
+ start: number,
+ count: number,
+ sort: string,
+ nsfw: boolean,
+ withFiles: boolean,
+ categoryOneOf?: number[],
+ licenceOneOf?: number[],
+ languageOneOf?: string[],
+ tagsOneOf?: string[],
+ tagsAllOf?: string[],
+ filter?: VideoFilter,
+ accountId?: number,
+ videoChannelId?: number
+ }) {
const query = {
- offset: start,
- limit: count,
- order: getSort(sort)
+ offset: options.start,
+ limit: options.count,
+ order: getSort(options.sort)
}
const serverActor = await getServerActor()
+ const scopes = {
+ method: [
+ ScopeNames.AVAILABLE_FOR_LIST, {
+ actorId: serverActor.id,
+ 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
+ ]
+ }
- return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST, serverActor.id, filter, withFiles ] })
+ return VideoModel.scope(scopes)
.findAndCountAll(query)
.then(({ rows, count }) => {
return {
})
}
- static async searchAndPopulateAccountAndServerAndTags (value: string, start: number, count: number, sort: string) {
+ 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 })
+ }
+
+ const attributesInclude = []
+ const escapedSearch = VideoModel.sequelize.escape(options.search)
+ const escapedLikeSearch = VideoModel.sequelize.escape('%' + options.search + '%')
+ if (options.search) {
+ whereAnd.push(
+ {
+ id: {
+ [ Sequelize.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 +
+ ')'
+ )
+ }
+ }
+ )
+
+ attributesInclude.push(createSimilarityAttribute('VideoModel.name', options.search))
+ }
+
+ // Cannot search on similarity if we don't have a search
+ if (!options.search) {
+ attributesInclude.push(
+ Sequelize.literal('0 as similarity')
+ )
+ }
+
const query: IFindOptions<VideoModel> = {
- offset: start,
- limit: count,
- order: getSort(sort),
+ attributes: {
+ include: attributesInclude
+ },
+ offset: options.start,
+ limit: options.count,
+ order: getSort(options.sort),
where: {
- [Sequelize.Op.or]: [
- {
- name: {
- [ Sequelize.Op.iLike ]: '%' + value + '%'
- }
- },
- {
- preferredUsername: Sequelize.where(Sequelize.col('preferredUsername'), {
- [ Sequelize.Op.iLike ]: '%' + value + '%'
- })
- },
- {
- host: Sequelize.where(Sequelize.col('host'), {
- [ Sequelize.Op.iLike ]: '%' + value + '%'
- })
- }
- ]
+ [ Sequelize.Op.and ]: whereAnd
}
}
const serverActor = await getServerActor()
+ const scopes = {
+ method: [
+ ScopeNames.AVAILABLE_FOR_LIST, {
+ actorId: serverActor.id,
+ nsfw: options.nsfw,
+ categoryOneOf: options.categoryOneOf,
+ licenceOneOf: options.licenceOneOf,
+ languageOneOf: options.languageOneOf,
+ tagsOneOf: options.tagsOneOf,
+ tagsAllOf: options.tagsAllOf
+ } as AvailableForListOptions
+ ]
+ }
- return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST, serverActor.id ] })
+ return VideoModel.scope(scopes)
.findAndCountAll(query)
.then(({ rows, count }) => {
return {
})
}
- static load (id: number) {
- return VideoModel.findById(id)
+ static load (id: number, t?: Sequelize.Transaction) {
+ const options = t ? { transaction: t } : undefined
+
+ return VideoModel.findById(id, options)
}
static loadByUrlAndPopulateAccount (url: string, t?: Sequelize.Transaction) {
}
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)
}
.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)
}
}
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 VIDEO_LICENCES[id] || 'Unknown'
+ }
- return licenceLabel
+ private static getLanguageLabel (id: string) {
+ return VIDEO_LANGUAGES[id] || 'Unknown'
}
- private static getLanguageLabel (id: number) {
- let languageLabel = VIDEO_LANGUAGES[id]
- if (!languageLabel) languageLabel = 'Unknown'
+ private static getPrivacyLabel (id: number) {
+ return VIDEO_PRIVACIES[id] || 'Unknown'
+ }
- return languageLabel
+ private static getStateLabel (id: number) {
+ return VIDEO_STATES[id] || 'Unknown'
}
getOriginalFile () {
)
}
+ getTorrentFilePath (videoFile: VideoFileModel) {
+ return join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile))
+ }
+
getVideoFilePath (videoFile: VideoFileModel) {
return join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile))
}
- createTorrentAndSetInfoHash = async function (videoFile: VideoFileModel) {
+ async createTorrentAndSetInfoHash (videoFile: VideoFileModel) {
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: [
[ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ],
[ CONFIG.WEBSERVER.URL + '/tracker/announce' ]
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,
id: this.language,
label: VideoModel.getLanguageLabel(this.language)
},
+ privacy: {
+ id: this.privacy,
+ label: VideoModel.getPrivacyLabel(this.privacy)
+ },
nsfw: this.nsfw,
description: this.getTruncatedDescription(),
isLocal: this.isOwned(),
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,
account: {
+ id: formattedAccount.id,
+ uuid: formattedAccount.uuid,
name: formattedAccount.name,
displayName: formattedAccount.displayName,
url: formattedAccount.url,
host: formattedAccount.host,
avatar: formattedAccount.avatar
+ },
+ channel: {
+ id: formattedVideoChannel.id,
+ uuid: formattedVideoChannel.uuid,
+ name: formattedVideoChannel.name,
+ displayName: formattedVideoChannel.displayName,
+ url: formattedVideoChannel.url,
+ host: formattedVideoChannel.host,
+ 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()
-
- // Maybe our server is not up to date and there are new privacy settings since our version
- let privacyLabel = VIDEO_PRIVACIES[this.privacy]
- if (!privacyLabel) privacyLabel = 'Unknown'
+ const formattedJson = this.toFormattedJSON({
+ additionalAttributes: {
+ scheduledUpdate: true
+ }
+ })
const detailsJson = {
- privacy: {
- id: this.privacy,
- label: privacyLabel
- },
support: this.support,
descriptionPath: this.getDescriptionPath(),
channel: this.VideoChannel.toFormattedJSON(),
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: []
}
},
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) => {
let language
if (this.language) {
language = {
- identifier: this.language + '',
+ identifier: this.language,
name: VideoModel.getLanguageLabel(this.language)
}
}
}
}
- 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
+ size: file.size,
+ fps: file.fps
})
url.push({
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,
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),
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',
}
}
- 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
return peertubeTruncate(this.description, maxLength)
}
- optimizeOriginalVideofile = async function () {
+ async optimizeOriginalVideofile () {
const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
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!
// 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()
}
}
- transcodeOriginalVideofile = async function (resolution: VideoResolution, isPortraitMode: boolean) {
+ async transcodeOriginalVideofile (resolution: VideoResolution, isPortraitMode: boolean) {
const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
const extname = '.mp4'
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)
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())
removeThumbnail () {
const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName())
return unlinkPromise(thumbnailPath)
+ .catch(err => logger.warn('Cannot delete thumbnail %s.', thumbnailPath, { err }))
}
removePreview () {
- // Same name than video thumbnail
- return unlinkPromise(CONFIG.STORAGE.PREVIEWS_DIR + this.getPreviewName())
+ const previewPath = join(CONFIG.STORAGE.PREVIEWS_DIR + this.getPreviewName())
+ return unlinkPromise(previewPath)
+ .catch(err => logger.warn('Cannot delete preview %s.', previewPath, { err }))
}
removeFile (videoFile: VideoFileModel) {
const filePath = join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile))
return unlinkPromise(filePath)
+ .catch(err => logger.warn('Cannot delete file %s.', filePath, { err }))
}
removeTorrent (videoFile: VideoFileModel) {
const torrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile))
return unlinkPromise(torrentPath)
+ .catch(err => logger.warn('Cannot delete torrent %s.', torrentPath, { err }))
}
getActivityStreamDuration () {
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' ]
projects / github / Chocobozzz / PeerTube.git / blobdiff