UpdatedAt
} from 'sequelize-typescript'
import { ActorModel } from '../activitypub/actor'
-import { getVideoSort, parseAggregateResult, throwIfNotValid } from '../utils'
+import { getSort, getVideoSort, parseAggregateResult, throwIfNotValid } from '../utils'
import { isActivityPubUrlValid, isUrlValid } from '../../helpers/custom-validators/activitypub/misc'
import { CONSTRAINTS_FIELDS, MIMETYPES } from '../../initializers/constants'
import { VideoFileModel } from '../video/video-file'
-import { getServerActor } from '../../helpers/utils'
import { VideoModel } from '../video/video'
-import { VideoRedundancyStrategy } from '../../../shared/models/redundancy'
+import { VideoRedundancyStrategy, VideoRedundancyStrategyWithManual } from '../../../shared/models/redundancy'
import { logger } from '../../helpers/logger'
import { CacheFileObject, VideoPrivacy } from '../../../shared'
import { VideoChannelModel } from '../video/video-channel'
import { sample } from 'lodash'
import { isTestInstance } from '../../helpers/core-utils'
import * as Bluebird from 'bluebird'
-import { col, FindOptions, fn, literal, Op, Transaction } from 'sequelize'
+import { col, FindOptions, fn, literal, Op, Transaction, WhereOptions } from 'sequelize'
import { VideoStreamingPlaylistModel } from '../video/video-streaming-playlist'
import { CONFIG } from '../../initializers/config'
-import { MVideoRedundancy, MVideoRedundancyAP, MVideoRedundancyVideo } from '@server/typings/models'
+import { MVideoForRedundancyAPI, MVideoRedundancy, MVideoRedundancyAP, MVideoRedundancyVideo } from '@server/typings/models'
+import { VideoRedundanciesTarget } from '@shared/models/redundancy/video-redundancies-filters.model'
+import {
+ FileRedundancyInformation,
+ StreamingPlaylistRedundancyInformation,
+ VideoRedundancy
+} from '@shared/models/redundancy/video-redundancy.model'
+import { getServerActor } from '@server/models/application/application'
export enum ScopeNames {
WITH_VIDEO = 'WITH_VIDEO'
}
@Scopes(() => ({
- [ ScopeNames.WITH_VIDEO ]: {
+ [ScopeNames.WITH_VIDEO]: {
include: [
{
model: VideoFileModel,
@UpdatedAt
updatedAt: Date
- @AllowNull(false)
+ @AllowNull(true)
@Column
expiresOn: Date
logger.info('Removing duplicated video streaming playlist %s.', videoUUID)
videoStreamingPlaylist.Video.removeStreamingPlaylistFiles(videoStreamingPlaylist, true)
- .catch(err => logger.error('Cannot delete video streaming playlist files of %s.', videoUUID, { err }))
+ .catch(err => logger.error('Cannot delete video streaming playlist files of %s.', videoUUID, { err }))
}
return undefined
return VideoRedundancyModel.scope(ScopeNames.WITH_VIDEO).findOne(query)
}
+ static loadByIdWithVideo (id: number, transaction?: Transaction): Bluebird<MVideoRedundancyVideo> {
+ const query = {
+ where: { id },
+ transaction
+ }
+
+ return VideoRedundancyModel.scope(ScopeNames.WITH_VIDEO).findOne(query)
+ }
+
static loadByUrl (url: string, transaction?: Transaction): Bluebird<MVideoRedundancy> {
const query = {
where: {
},
include: [
{
- attributes: [ ],
+ attributes: [],
model: VideoFileModel,
required: true,
include: [
{
- attributes: [ ],
+ attributes: [],
model: VideoModel,
required: true,
where: {
}
return VideoRedundancyModel.findOne(query)
- .then(r => !!r)
+ .then(r => !!r)
}
static async getVideoSample (p: Bluebird<VideoModel[]>) {
where: {
privacy: VideoPrivacy.PUBLIC,
views: {
- [ Op.gte ]: minViews
+ [Op.gte]: minViews
}
},
include: [
actorId: actor.id,
strategy,
createdAt: {
- [ Op.lt ]: expiredDate
+ [Op.lt]: expiredDate
}
}
}
where: {
actorId: actor.id,
expiresOn: {
- [ Op.lt ]: new Date()
+ [Op.lt]: new Date()
}
}
}
[Op.ne]: actor.id
},
expiresOn: {
- [ Op.lt ]: new Date()
+ [Op.lt]: new Date(),
+ [Op.ne]: null
}
}
}
return VideoRedundancyModel.findAll(query)
}
- static async getStats (strategy: VideoRedundancyStrategy) {
+ static listForApi (options: {
+ start: number
+ count: number
+ sort: string
+ target: VideoRedundanciesTarget
+ strategy?: string
+ }) {
+ const { start, count, sort, target, strategy } = options
+ const redundancyWhere: WhereOptions = {}
+ const videosWhere: WhereOptions = {}
+ let redundancySqlSuffix = ''
+
+ if (target === 'my-videos') {
+ Object.assign(videosWhere, { remote: false })
+ } else if (target === 'remote-videos') {
+ Object.assign(videosWhere, { remote: true })
+ Object.assign(redundancyWhere, { strategy: { [Op.ne]: null } })
+ redundancySqlSuffix = ' AND "videoRedundancy"."strategy" IS NOT NULL'
+ }
+
+ if (strategy) {
+ Object.assign(redundancyWhere, { strategy: strategy })
+ }
+
+ const videoFilterWhere = {
+ [Op.and]: [
+ {
+ [Op.or]: [
+ {
+ id: {
+ [Op.in]: literal(
+ '(' +
+ 'SELECT "videoId" FROM "videoFile" ' +
+ 'INNER JOIN "videoRedundancy" ON "videoRedundancy"."videoFileId" = "videoFile".id' +
+ redundancySqlSuffix +
+ ')'
+ )
+ }
+ },
+ {
+ id: {
+ [Op.in]: literal(
+ '(' +
+ 'select "videoId" FROM "videoStreamingPlaylist" ' +
+ 'INNER JOIN "videoRedundancy" ON "videoRedundancy"."videoStreamingPlaylistId" = "videoStreamingPlaylist".id' +
+ redundancySqlSuffix +
+ ')'
+ )
+ }
+ }
+ ]
+ },
+
+ videosWhere
+ ]
+ }
+
+ // /!\ On video model /!\
+ const findOptions = {
+ offset: start,
+ limit: count,
+ order: getSort(sort),
+ include: [
+ {
+ required: false,
+ model: VideoFileModel,
+ include: [
+ {
+ model: VideoRedundancyModel.unscoped(),
+ required: false,
+ where: redundancyWhere
+ }
+ ]
+ },
+ {
+ required: false,
+ model: VideoStreamingPlaylistModel.unscoped(),
+ include: [
+ {
+ model: VideoRedundancyModel.unscoped(),
+ required: false,
+ where: redundancyWhere
+ },
+ {
+ model: VideoFileModel,
+ required: false
+ }
+ ]
+ }
+ ],
+ where: videoFilterWhere
+ }
+
+ // /!\ On video model /!\
+ const countOptions = {
+ where: videoFilterWhere
+ }
+
+ return Promise.all([
+ VideoModel.findAll(findOptions),
+
+ VideoModel.count(countOptions)
+ ]).then(([ data, total ]) => ({ total, data }))
+ }
+
+ static async getStats (strategy: VideoRedundancyStrategyWithManual) {
const actor = await getServerActor()
const query: FindOptions = {
}
return VideoRedundancyModel.findOne(query)
- .then((r: any) => ({
- totalUsed: parseAggregateResult(r.totalUsed),
- totalVideos: r.totalVideos,
- totalVideoFiles: r.totalVideoFiles
- }))
+ .then((r: any) => ({
+ totalUsed: parseAggregateResult(r.totalUsed),
+ totalVideos: r.totalVideos,
+ totalVideoFiles: r.totalVideoFiles
+ }))
+ }
+
+ static toFormattedJSONStatic (video: MVideoForRedundancyAPI): VideoRedundancy {
+ const filesRedundancies: FileRedundancyInformation[] = []
+ const streamingPlaylistsRedundancies: StreamingPlaylistRedundancyInformation[] = []
+
+ for (const file of video.VideoFiles) {
+ for (const redundancy of file.RedundancyVideos) {
+ filesRedundancies.push({
+ id: redundancy.id,
+ fileUrl: redundancy.fileUrl,
+ strategy: redundancy.strategy,
+ createdAt: redundancy.createdAt,
+ updatedAt: redundancy.updatedAt,
+ expiresOn: redundancy.expiresOn,
+ size: file.size
+ })
+ }
+ }
+
+ for (const playlist of video.VideoStreamingPlaylists) {
+ const size = playlist.VideoFiles.reduce((a, b) => a + b.size, 0)
+
+ for (const redundancy of playlist.RedundancyVideos) {
+ streamingPlaylistsRedundancies.push({
+ id: redundancy.id,
+ fileUrl: redundancy.fileUrl,
+ strategy: redundancy.strategy,
+ createdAt: redundancy.createdAt,
+ updatedAt: redundancy.updatedAt,
+ expiresOn: redundancy.expiresOn,
+ size
+ })
+ }
+ }
+
+ return {
+ id: video.id,
+ name: video.name,
+ url: video.url,
+ uuid: video.uuid,
+
+ redundancies: {
+ files: filesRedundancies,
+ streamingPlaylists: streamingPlaylistsRedundancies
+ }
+ }
}
getVideo () {
id: this.url,
type: 'CacheFile' as 'CacheFile',
object: this.VideoStreamingPlaylist.Video.url,
- expires: this.expiresOn.toISOString(),
+ expires: this.expiresOn ? this.expiresOn.toISOString() : null,
url: {
type: 'Link',
mediaType: 'application/x-mpegURL',
id: this.url,
type: 'CacheFile' as 'CacheFile',
object: this.VideoFile.Video.url,
- expires: this.expiresOn.toISOString(),
+ expires: this.expiresOn ? this.expiresOn.toISOString() : null,
url: {
type: 'Link',
- mediaType: 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,
const notIn = literal(
'(' +
- `SELECT "videoFileId" FROM "videoRedundancy" WHERE "actorId" = ${actor.id} AND "videoFileId" IS NOT NULL` +
+ `SELECT "videoFileId" FROM "videoRedundancy" WHERE "actorId" = ${actor.id} AND "videoFileId" IS NOT NULL` +
')'
)
return {
attributes: [],
- model: VideoFileModel.unscoped(),
+ model: VideoFileModel,
required: true,
where: {
id: {
- [ Op.notIn ]: notIn
+ [Op.notIn]: notIn
}
}
}
projects / github / Chocobozzz / PeerTube.git / blobdiff