import {
- AfterDestroy,
AllowNull,
+ BeforeDestroy,
BelongsTo,
Column,
CreatedAt,
UpdatedAt
} from 'sequelize-typescript'
import { ActorModel } from '../activitypub/actor'
-import { getVideoSort, throwIfNotValid } from '../utils'
+import { getVideoSort, parseAggregateResult, throwIfNotValid } from '../utils'
import { isActivityPubUrlValid, isUrlValid } from '../../helpers/custom-validators/activitypub/misc'
-import { CONFIG, CONSTRAINTS_FIELDS, VIDEO_EXT_MIMETYPE } from '../../initializers'
+import { CONSTRAINTS_FIELDS, MIMETYPES } from '../../initializers/constants'
import { VideoFileModel } from '../video/video-file'
import { getServerActor } from '../../helpers/utils'
import { VideoModel } from '../video/video'
import { sample } from 'lodash'
import { isTestInstance } from '../../helpers/core-utils'
import * as Bluebird from 'bluebird'
-import * as Sequelize from 'sequelize'
+import { col, FindOptions, fn, literal, Op, Transaction } from 'sequelize'
+import { VideoStreamingPlaylistModel } from '../video/video-streaming-playlist'
+import { CONFIG } from '../../initializers/config'
+import { MVideoRedundancy, MVideoRedundancyAP, MVideoRedundancyVideo } from '@server/typings/models'
export enum ScopeNames {
WITH_VIDEO = 'WITH_VIDEO'
}
-@Scopes({
+@Scopes(() => ({
[ ScopeNames.WITH_VIDEO ]: {
include: [
{
- model: () => VideoFileModel,
- required: true,
+ model: VideoFileModel,
+ required: false,
include: [
{
- model: () => VideoModel,
+ model: VideoModel,
+ required: true
+ }
+ ]
+ },
+ {
+ model: VideoStreamingPlaylistModel,
+ required: false,
+ include: [
+ {
+ model: VideoModel,
required: true
}
]
}
]
}
-})
+}))
@Table({
tableName: 'videoRedundancy',
@BelongsTo(() => VideoFileModel, {
foreignKey: {
- allowNull: false
+ allowNull: true
},
onDelete: 'cascade'
})
VideoFile: VideoFileModel
+ @ForeignKey(() => VideoStreamingPlaylistModel)
+ @Column
+ videoStreamingPlaylistId: number
+
+ @BelongsTo(() => VideoStreamingPlaylistModel, {
+ foreignKey: {
+ allowNull: true
+ },
+ onDelete: 'cascade'
+ })
+ VideoStreamingPlaylist: VideoStreamingPlaylistModel
+
@ForeignKey(() => ActorModel)
@Column
actorId: number
})
Actor: ActorModel
- @AfterDestroy
- static removeFile (instance: VideoRedundancyModel) {
- // Not us
- if (!instance.strategy) return
+ @BeforeDestroy
+ static async removeFile (instance: VideoRedundancyModel) {
+ if (!instance.isOwned()) return
+
+ if (instance.videoFileId) {
+ const videoFile = await VideoFileModel.loadWithVideo(instance.videoFileId)
+
+ const logIdentifier = `${videoFile.Video.uuid}-${videoFile.resolution}`
+ logger.info('Removing duplicated video file %s.', logIdentifier)
- logger.info('Removing duplicated video file %s-%s.', instance.VideoFile.Video.uuid, instance.VideoFile.resolution)
+ videoFile.Video.removeFile(videoFile, true)
+ .catch(err => logger.error('Cannot delete %s files.', logIdentifier, { err }))
+ }
+
+ if (instance.videoStreamingPlaylistId) {
+ const videoStreamingPlaylist = await VideoStreamingPlaylistModel.loadWithVideo(instance.videoStreamingPlaylistId)
+
+ const videoUUID = videoStreamingPlaylist.Video.uuid
+ logger.info('Removing duplicated video streaming playlist %s.', videoUUID)
+
+ videoStreamingPlaylist.Video.removeStreamingPlaylist(true)
+ .catch(err => logger.error('Cannot delete video streaming playlist files of %s.', videoUUID, { err }))
+ }
- return instance.VideoFile.Video.removeFile(instance.VideoFile)
+ return undefined
}
- static async loadLocalByFileId (videoFileId: number) {
+ static async loadLocalByFileId (videoFileId: number): Promise<MVideoRedundancyVideo> {
const actor = await getServerActor()
const query = {
return VideoRedundancyModel.scope(ScopeNames.WITH_VIDEO).findOne(query)
}
- static loadByUrl (url: string, transaction?: Sequelize.Transaction) {
+ static async loadLocalByStreamingPlaylistId (videoStreamingPlaylistId: number): Promise<MVideoRedundancyVideo> {
+ const actor = await getServerActor()
+
+ const query = {
+ where: {
+ actorId: actor.id,
+ videoStreamingPlaylistId
+ }
+ }
+
+ return VideoRedundancyModel.scope(ScopeNames.WITH_VIDEO).findOne(query)
+ }
+
+ static loadByUrl (url: string, transaction?: Transaction): Bluebird<MVideoRedundancy> {
const query = {
where: {
url
static async getVideoSample (p: Bluebird<VideoModel[]>) {
const rows = await p
+ if (rows.length === 0) return undefined
+
const ids = rows.map(r => r.id)
const id = sample(ids)
- return VideoModel.loadWithFile(id, undefined, !isTestInstance())
+ return VideoModel.loadWithFiles(id, undefined, !isTestInstance())
}
static async findMostViewToDuplicate (randomizedFactor: number) {
where: {
privacy: VideoPrivacy.PUBLIC,
views: {
- [ Sequelize.Op.gte ]: minViews
+ [ Op.gte ]: minViews
}
},
include: [
return VideoRedundancyModel.getVideoSample(VideoModel.unscoped().findAll(query))
}
- static async loadOldestLocalThatAlreadyExpired (strategy: VideoRedundancyStrategy, expiresAfterMs: number) {
+ static async loadOldestLocalExpired (strategy: VideoRedundancyStrategy, expiresAfterMs: number): Promise<MVideoRedundancyVideo> {
const expiredDate = new Date()
expiredDate.setMilliseconds(expiredDate.getMilliseconds() - expiresAfterMs)
actorId: actor.id,
strategy,
createdAt: {
- [ Sequelize.Op.lt ]: expiredDate
+ [ Op.lt ]: expiredDate
}
}
}
static async getTotalDuplicated (strategy: VideoRedundancyStrategy) {
const actor = await getServerActor()
+ const redundancyInclude = {
+ attributes: [],
+ model: VideoRedundancyModel,
+ required: true,
+ where: {
+ actorId: actor.id,
+ strategy
+ }
+ }
+
+ const queryFiles: FindOptions = {
+ include: [ redundancyInclude ]
+ }
- const options = {
+ const queryStreamingPlaylists: FindOptions = {
include: [
{
attributes: [],
- model: VideoRedundancyModel,
+ model: VideoModel.unscoped(),
required: true,
- where: {
- actorId: actor.id,
- strategy
- }
+ include: [
+ {
+ required: true,
+ attributes: [],
+ model: VideoStreamingPlaylistModel.unscoped(),
+ include: [
+ redundancyInclude
+ ]
+ }
+ ]
}
]
}
- return VideoFileModel.sum('size', options as any) // FIXME: typings
+ return Promise.all([
+ VideoFileModel.aggregate('size', 'SUM', queryFiles),
+ VideoFileModel.aggregate('size', 'SUM', queryStreamingPlaylists)
+ ]).then(([ r1, r2 ]) => {
+ return parseAggregateResult(r1) + parseAggregateResult(r2)
+ })
}
static async listLocalExpired () {
where: {
actorId: actor.id,
expiresOn: {
- [ Sequelize.Op.lt ]: new Date()
+ [ Op.lt ]: new Date()
}
}
}
const query = {
where: {
actorId: {
- [Sequelize.Op.ne]: actor.id
+ [Op.ne]: actor.id
},
expiresOn: {
- [ Sequelize.Op.lt ]: new Date()
+ [ Op.lt ]: new Date()
}
}
}
static async listLocalOfServer (serverId: number) {
const actor = await getServerActor()
-
- const query = {
- where: {
- actorId: actor.id
- },
+ const buildVideoInclude = () => ({
+ model: VideoModel,
+ required: true,
include: [
{
- model: VideoFileModel,
+ attributes: [],
+ model: VideoChannelModel.unscoped(),
required: true,
include: [
{
- model: VideoModel,
+ attributes: [],
+ model: ActorModel.unscoped(),
required: true,
- include: [
- {
- attributes: [],
- model: VideoChannelModel.unscoped(),
- required: true,
- include: [
- {
- attributes: [],
- model: ActorModel.unscoped(),
- required: true,
- where: {
- serverId
- }
- }
- ]
- }
- ]
+ where: {
+ serverId
+ }
}
]
}
]
+ })
+
+ const query = {
+ where: {
+ actorId: actor.id
+ },
+ include: [
+ {
+ model: VideoFileModel,
+ required: false,
+ include: [ buildVideoInclude() ]
+ },
+ {
+ model: VideoStreamingPlaylistModel,
+ required: false,
+ include: [ buildVideoInclude() ]
+ }
+ ]
}
return VideoRedundancyModel.findAll(query)
static async getStats (strategy: VideoRedundancyStrategy) {
const actor = await getServerActor()
- const query = {
+ const query: FindOptions = {
raw: true,
attributes: [
- [ Sequelize.fn('COALESCE', Sequelize.fn('SUM', Sequelize.col('VideoFile.size')), '0'), 'totalUsed' ],
- [ Sequelize.fn('COUNT', Sequelize.fn('DISTINCT', Sequelize.col('videoId'))), 'totalVideos' ],
- [ Sequelize.fn('COUNT', Sequelize.col('videoFileId')), 'totalVideoFiles' ]
+ [ fn('COALESCE', fn('SUM', col('VideoFile.size')), '0'), 'totalUsed' ],
+ [ fn('COUNT', fn('DISTINCT', col('videoId'))), 'totalVideos' ],
+ [ fn('COUNT', col('videoFileId')), 'totalVideoFiles' ]
],
where: {
strategy,
]
}
- return VideoRedundancyModel.find(query as any) // FIXME: typings
+ return VideoRedundancyModel.findOne(query)
.then((r: any) => ({
- totalUsed: parseInt(r.totalUsed.toString(), 10),
+ totalUsed: parseAggregateResult(r.totalUsed),
totalVideos: r.totalVideos,
totalVideoFiles: r.totalVideoFiles
}))
}
- toActivityPubObject (): CacheFileObject {
+ getVideo () {
+ if (this.VideoFile) return this.VideoFile.Video
+
+ return this.VideoStreamingPlaylist.Video
+ }
+
+ isOwned () {
+ return !!this.strategy
+ }
+
+ toActivityPubObject (this: MVideoRedundancyAP): CacheFileObject {
+ if (this.VideoStreamingPlaylist) {
+ return {
+ id: this.url,
+ type: 'CacheFile' as 'CacheFile',
+ object: this.VideoStreamingPlaylist.Video.url,
+ expires: this.expiresOn.toISOString(),
+ url: {
+ type: 'Link',
+ mimeType: 'application/x-mpegURL',
+ mediaType: 'application/x-mpegURL',
+ href: this.fileUrl
+ }
+ }
+ }
+
return {
id: this.url,
type: 'CacheFile' as 'CacheFile',
expires: this.expiresOn.toISOString(),
url: {
type: 'Link',
- mimeType: VIDEO_EXT_MIMETYPE[ this.VideoFile.extname ] as any,
+ mimeType: MIMETYPES.VIDEO.EXT_MIMETYPE[ this.VideoFile.extname ] as any,
+ mediaType: MIMETYPES.VIDEO.EXT_MIMETYPE[ this.VideoFile.extname ] as any,
href: this.fileUrl,
height: this.VideoFile.resolution,
size: this.VideoFile.size,
private static async buildVideoFileForDuplication () {
const actor = await getServerActor()
- const notIn = Sequelize.literal(
+ const notIn = literal(
'(' +
- `SELECT "videoFileId" FROM "videoRedundancy" WHERE "actorId" = ${actor.id}` +
+ `SELECT "videoFileId" FROM "videoRedundancy" WHERE "actorId" = ${actor.id} AND "videoFileId" IS NOT NULL` +
')'
)
required: true,
where: {
id: {
- [ Sequelize.Op.notIn ]: notIn
+ [ Op.notIn ]: notIn
}
}
}
projects / github / Chocobozzz / PeerTube.git / blobdiff