import * as Bluebird from 'bluebird'
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,
MVideoFormattableDetails,
MVideoForUser,
MVideoFullLight,
- MVideoIdThumbnail,
+ MVideoIdThumbnail, MVideoImmutable,
MVideoThumbnail,
MVideoThumbnailBlacklist,
MVideoWithAllFiles,
import { MThumbnail } from '../../typings/models/video/thumbnail'
import { VideoFile } from '@shared/models/videos/video-file.model'
import { getHLSDirectory, getTorrentFileName, getTorrentFilePath, getVideoFilename, getVideoFilePath } from '@server/lib/video-paths'
-import * as validator from 'validator'
-import { ActorFollowModel } from '@server/models/activitypub/actor-follow'
-
-// 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 validator from 'validator'
+import { ModelCache } from '@server/models/model-cache'
export enum ScopeNames {
AVAILABLE_FOR_LIST_IDS = 'AVAILABLE_FOR_LIST_IDS',
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',
+ WITH_IMMUTABLE_ATTRIBUTES = 'WITH_IMMUTABLE_ATTRIBUTES',
WITH_THUMBNAILS = 'WITH_THUMBNAILS'
}
}
@Scopes(() => ({
- [ ScopeNames.FOR_API ]: (options: ForAPIOptions) => {
+ [ScopeNames.WITH_IMMUTABLE_ATTRIBUTES]: {
+ attributes: [ 'id', 'url', 'uuid', 'remote' ]
+ },
+ [ScopeNames.FOR_API]: (options: ForAPIOptions) => {
const query: FindOptions = {
include: [
{
if (options.ids) {
query.where = {
id: {
- [ Op.in ]: options.ids // FIXME: sequelize ANY seems broken
+ [Op.in]: options.ids
}
}
}
return query
},
- [ ScopeNames.AVAILABLE_FOR_LIST_IDS ]: (options: AvailableForListIDsOptions) => {
- const whereAnd = options.baseWhere ? options.baseWhere : []
+ [ScopeNames.AVAILABLE_FOR_LIST_IDS]: (options: AvailableForListIDsOptions) => {
+ const whereAnd = options.baseWhere ? [].concat(options.baseWhere) : []
const query: FindOptions = {
raw: true,
const attributesType = options.attributesType || 'id'
if (attributesType === 'id') query.attributes = [ 'id' ]
- else if (attributesType === 'none') query.attributes = [ ]
+ else if (attributesType === 'none') query.attributes = []
whereAnd.push({
id: {
- [ Op.notIn ]: Sequelize.literal(
+ [Op.notIn]: Sequelize.literal(
'(SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")'
)
}
if (options.serverAccountId) {
whereAnd.push({
channelId: {
- [ Op.notIn ]: Sequelize.literal(
+ [Op.notIn]: Sequelize.literal(
'(' +
'SELECT id FROM "videoChannel" WHERE "accountId" IN (' +
buildBlockedAccountSQL(options.serverAccountId, options.user ? options.user.Account.id : undefined) +
// Only list public/published videos
if (!options.filter || options.filter !== 'all-local') {
-
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 ]: [
+ [Op.or]: [
{
state: VideoState.PUBLISHED
},
{
- [ Op.and ]: {
+ [Op.and]: {
state: VideoState.TO_TRANSCODE,
waitTranscoding: false
}
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(),
}
}
- 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 ]
}
[Op.or]: [
{
id: {
- [ Op.in ]: Sequelize.literal(
+ [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 ' +
+ ')'
+ )
+ }
+ },
+ {
+ 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" ' +
if (options.withFiles === true) {
whereAnd.push({
id: {
- [ Op.in ]: Sequelize.literal(
+ [Op.in]: Sequelize.literal(
'(SELECT "videoId" FROM "videoFile")'
)
}
whereAnd.push({
id: {
- [ Op.in ]: Sequelize.literal(
+ [Op.in]: Sequelize.literal(
'(' +
'SELECT "videoId" FROM "videoTag" ' +
'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
whereAnd.push({
id: {
- [ Op.in ]: Sequelize.literal(
+ [Op.in]: Sequelize.literal(
'(' +
'SELECT "videoId" FROM "videoTag" ' +
'INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
if (options.categoryOneOf) {
whereAnd.push({
category: {
- [ Op.or ]: options.categoryOneOf
+ [Op.or]: options.categoryOneOf
}
})
}
if (options.licenceOneOf) {
whereAnd.push({
licence: {
- [ Op.or ]: options.licenceOneOf
+ [Op.or]: options.licenceOneOf
}
})
}
[Op.or]: [
{
language: {
- [ Op.or ]: videoLanguages
+ [Op.or]: videoLanguages
}
},
{
id: {
- [ Op.in ]: Sequelize.literal(
+ [Op.in]: Sequelize.literal(
'(' +
'SELECT "videoId" FROM "videoCaption" ' +
'WHERE "language" IN (' + createSafeIn(VideoModel, options.languageOneOf) + ') ' +
}
query.where = {
- [ Op.and ]: whereAnd
+ [Op.and]: whereAnd
}
return query
},
- [ScopeNames.WITH_BLOCKLIST]: {
-
- },
- [ ScopeNames.WITH_THUMBNAILS ]: {
+ [ScopeNames.WITH_THUMBNAILS]: {
include: [
{
model: ThumbnailModel,
}
]
},
- [ ScopeNames.WITH_USER_ID ]: {
+ [ScopeNames.WITH_USER_ID]: {
include: [
{
attributes: [ 'accountId' ],
}
]
},
- [ ScopeNames.WITH_ACCOUNT_DETAILS ]: {
+ [ScopeNames.WITH_ACCOUNT_DETAILS]: {
include: [
{
model: VideoChannelModel.unscoped(),
}
]
},
- [ ScopeNames.WITH_TAGS ]: {
+ [ScopeNames.WITH_TAGS]: {
include: [ TagModel ]
},
- [ ScopeNames.WITH_BLACKLISTED ]: {
+ [ScopeNames.WITH_BLACKLISTED]: {
include: [
{
attributes: [ 'id', 'reason', 'unfederated' ],
}
]
},
- [ ScopeNames.WITH_WEBTORRENT_FILES ]: (withRedundancies = false) => {
+ [ScopeNames.WITH_WEBTORRENT_FILES]: (withRedundancies = false) => {
let subInclude: any[] = []
if (withRedundancies === true) {
]
}
},
- [ ScopeNames.WITH_STREAMING_PLAYLISTS ]: (withRedundancies = false) => {
+ [ScopeNames.WITH_STREAMING_PLAYLISTS]: (withRedundancies = false) => {
const subInclude: IncludeOptions[] = [
{
model: VideoFileModel.unscoped(),
]
}
},
- [ ScopeNames.WITH_SCHEDULED_UPDATE ]: {
+ [ScopeNames.WITH_SCHEDULED_UPDATE]: {
include: [
{
model: ScheduleVideoUpdateModel.unscoped(),
}
]
},
- [ ScopeNames.WITH_USER_HISTORY ]: (userId: number) => {
+ [ScopeNames.WITH_USER_HISTORY]: (userId: number) => {
return {
include: [
{
}))
@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<VideoModel> {
},
onDelete: 'cascade',
hooks: true,
- [ 'separate' as any ]: true
+ ['separate' as any]: true
})
VideoCaptions: VideoCaptionModel[]
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
})
// 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
return undefined
}
+ @BeforeDestroy
+ static invalidateCache (instance: VideoModel) {
+ ModelCache.Instance.invalidateCache('video', instance.id)
+ }
+
static listLocal (): Bluebird<MVideoWithAllFiles[]> {
const query = {
where: {
order: getVideoSort('createdAt', [ 'Tags', 'name', 'ASC' ] as any), // FIXME: sequelize typings
where: {
id: {
- [ Op.in ]: Sequelize.literal('(' + rawQuery + ')')
+ [Op.in]: Sequelize.literal('(' + rawQuery + ')')
},
- [ Op.or ]: [
+ [Op.or]: [
{ privacy: VideoPrivacy.PUBLIC },
{ privacy: VideoPrivacy.UNLISTED }
]
},
include: [
{
- attributes: [ 'language' ],
+ attributes: [ 'language', 'fileUrl' ],
model: VideoCaptionModel.unscoped(),
required: false
},
required: false,
// We only want videos shared by this actor
where: {
- [ Op.and ]: [
+ [Op.and]: [
{
id: {
- [ Op.not ]: null
+ [Op.not]: null
}
},
{
// totals: totalVideos + totalVideoShares
let totalVideos = 0
let totalVideoShares = 0
- if (totals[ 0 ]) totalVideos = parseInt(totals[ 0 ].total, 10)
- if (totals[ 1 ]) totalVideoShares = parseInt(totals[ 1 ].total, 10)
+ if (totals[0]) totalVideos = parseInt(totals[0].total, 10)
+ if (totals[1]) totalVideoShares = parseInt(totals[1].total, 10)
const total = totalVideos + totalVideoShares
return {
})
}
- 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),
}
]
}
+
+ 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
}
static async listForApi (options: {
- start: number,
- count: number,
- sort: string,
- nsfw: boolean,
- includeLocalVideos: boolean,
- withFiles: boolean,
- categoryOneOf?: number[],
- licenceOneOf?: number[],
- languageOneOf?: string[],
- tagsOneOf?: string[],
- tagsAllOf?: string[],
- filter?: VideoFilter,
- accountId?: number,
- videoChannelId?: number,
+ start: number
+ count: number
+ sort: string
+ nsfw: boolean
+ includeLocalVideos: boolean
+ withFiles: boolean
+ categoryOneOf?: number[]
+ licenceOneOf?: number[]
+ languageOneOf?: string[]
+ tagsOneOf?: string[]
+ tagsAllOf?: string[]
+ filter?: VideoFilter
+ accountId?: number
+ videoChannelId?: number
followerActorId?: number
- videoPlaylistId?: number,
- trendingDays?: number,
- user?: MUserAccountId,
+ videoPlaylistId?: number
+ trendingDays?: number
+ user?: MUserAccountId
historyOfUser?: MUserId
- }, countVideos = true) {
+ 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')
}
trendingDays
}
- return VideoModel.getAvailableForApi(query, queryOptions, countVideos)
+ return VideoModel.getAvailableForApi(query, queryOptions, options.countVideos)
}
static async searchAndPopulateAccountAndServer (options: {
tagsAllOf?: string[]
durationMin?: number // seconds
durationMax?: number // seconds
- user?: MUserAccountId,
+ user?: MUserAccountId
filter?: VideoFilter
}) {
const whereAnd = []
if (options.startDate || options.endDate) {
const publishedAtRange = {}
- if (options.startDate) publishedAtRange[ Op.gte ] = options.startDate
- if (options.endDate) publishedAtRange[ Op.lte ] = options.endDate
+ if (options.startDate) publishedAtRange[Op.gte] = options.startDate
+ if (options.endDate) publishedAtRange[Op.lte] = options.endDate
whereAnd.push({ publishedAt: publishedAtRange })
}
if (options.originallyPublishedStartDate || options.originallyPublishedEndDate) {
const originallyPublishedAtRange = {}
- if (options.originallyPublishedStartDate) originallyPublishedAtRange[ Op.gte ] = options.originallyPublishedStartDate
- if (options.originallyPublishedEndDate) originallyPublishedAtRange[ Op.lte ] = options.originallyPublishedEndDate
+ if (options.originallyPublishedStartDate) originallyPublishedAtRange[Op.gte] = options.originallyPublishedStartDate
+ if (options.originallyPublishedEndDate) originallyPublishedAtRange[Op.lte] = options.originallyPublishedEndDate
whereAnd.push({ originallyPublishedAt: originallyPublishedAtRange })
}
if (options.durationMin || options.durationMax) {
const durationRange = {}
- if (options.durationMin) durationRange[ Op.gte ] = options.durationMin
- if (options.durationMax) durationRange[ Op.lte ] = options.durationMax
+ if (options.durationMin) durationRange[Op.gte] = options.durationMin
+ if (options.durationMax) durationRange[Op.lte] = options.durationMax
whereAnd.push({ duration: durationRange })
}
if (options.search) {
const trigramSearch = {
id: {
- [ Op.in ]: Sequelize.literal(
+ [Op.in]: Sequelize.literal(
'(' +
'SELECT "video"."id" FROM "video" ' +
'WHERE ' +
'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 +
+ 'WHERE lower("tag"."name") = lower(' + escapedSearch + ')' +
')'
)
}
]).findOne(options)
}
+ static loadImmutableAttributes (id: number | string, t?: Transaction): Bluebird<MVideoImmutable> {
+ const fun = () => {
+ const query = {
+ where: buildWhereIdOrUUID(id),
+ transaction: t
+ }
+
+ return VideoModel.scope(ScopeNames.WITH_IMMUTABLE_ATTRIBUTES).findOne(query)
+ }
+
+ return ModelCache.Instance.doCache({
+ cacheType: 'load-video-immutable-id',
+ key: '' + id,
+ deleteKey: 'video',
+ fun
+ })
+ }
+
static loadWithRights (id: number | string, t?: Transaction): Bluebird<MVideoWithRights> {
const where = buildWhereIdOrUUID(id)
const options = {
return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(query)
}
+ static loadByUrlImmutableAttributes (url: string, transaction?: Transaction): Bluebird<MVideoImmutable> {
+ const fun = () => {
+ const query: FindOptions = {
+ where: {
+ url
+ },
+ transaction
+ }
+
+ return VideoModel.scope(ScopeNames.WITH_IMMUTABLE_ATTRIBUTES).findOne(query)
+ }
+
+ return ModelCache.Instance.doCache({
+ cacheType: 'load-video-immutable-url',
+ key: url,
+ deleteKey: 'video',
+ fun
+ })
+ }
+
static loadByUrlAndPopulateAccount (url: string, transaction?: Transaction): Bluebird<MVideoAccountLightBlacklistAllFiles> {
const query: FindOptions = {
where: {
}
static loadForGetAPI (parameters: {
- id: number | string,
- t?: Transaction,
+ id: number | string
+ t?: Transaction
userId?: number
}): Bluebird<MVideoDetails> {
const { id, t, userId } = parameters
static checkVideoHasInstanceFollow (videoId: number, followerActorId: number) {
// Instances only share videos
const query = 'SELECT 1 FROM "videoShare" ' +
- 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' +
- 'WHERE "actorFollow"."actorId" = $followerActorId AND "videoShare"."videoId" = $videoId ' +
- 'LIMIT 1'
+ 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = "videoShare"."actorId" ' +
+ 'WHERE "actorFollow"."actorId" = $followerActorId AND "videoShare"."videoId" = $videoId ' +
+ 'LIMIT 1'
const options = {
type: QueryTypes.SELECT as QueryTypes.SELECT,
}
return VideoModel.findAll(query)
- .then(videos => videos.map(v => v.id))
+ .then(videos => videos.map(v => v.id))
}
// threshold corresponds to how many video the field should have to be returned
limit: count,
group: field,
having: Sequelize.where(
- Sequelize.fn('COUNT', Sequelize.col(field)), { [ Op.gte ]: threshold }
+ Sequelize.fn('COUNT', Sequelize.col(field)), { [Op.gte]: threshold }
),
order: [ (this.sequelize as any).random() ]
}
return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST_IDS, scopeOptions ] })
.findAll(query)
- .then(rows => rows.map(r => r[ field ]))
+ .then(rows => rows.map(r => r[field]))
}
static buildTrendingQuery (trendingDays: number) {
required: false,
where: {
startDate: {
- [ Op.gte ]: new Date(new Date().getTime() - (24 * 3600 * 1000) * trendingDays)
+ [Op.gte]: new Date(new Date().getTime() - (24 * 3600 * 1000) * trendingDays)
}
}
}
}
- 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,
]
}
- const [ count, ids ] = await Promise.all([
+ const [ count, rows ] = await Promise.all([
countVideos
? VideoModel.scope(countScope).count(countQuery)
: Promise.resolve<number>(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,
]
})
- const rows = await VideoModel.scope(apiScope).findAll(secondQuery)
-
- return {
- data: rows,
- total: count
- }
+ return VideoModel.scope(apiScope).findAll(secondQuery)
}
private static isPrivacyForFederation (privacy: VideoPrivacy) {
- return privacy === VideoPrivacy.PUBLIC || privacy === VideoPrivacy.UNLISTED
+ const castedPrivacy = parseInt(privacy + '', 10)
+
+ return castedPrivacy === VideoPrivacy.PUBLIC || castedPrivacy === VideoPrivacy.UNLISTED
}
static getCategoryLabel (id: number) {
- return VIDEO_CATEGORIES[ id ] || 'Misc'
+ return VIDEO_CATEGORIES[id] || 'Misc'
}
static getLicenceLabel (id: number) {
- return VIDEO_LICENCES[ id ] || 'Unknown'
+ return VIDEO_LICENCES[id] || 'Unknown'
}
static getLanguageLabel (id: string) {
- return VIDEO_LANGUAGES[ id ] || 'Unknown'
+ return VIDEO_LANGUAGES[id] || 'Unknown'
}
static getPrivacyLabel (id: number) {
- return VIDEO_PRIVACIES[ id ] || 'Unknown'
+ return VIDEO_PRIVACIES[id] || 'Unknown'
}
static getStateLabel (id: number) {
- return VIDEO_STATES[ id ] || 'Unknown'
+ return VIDEO_STATES[id] || 'Unknown'
}
isBlacklisted () {
this.VideoChannel.Account.isBlocked()
}
- getQualityFileBy <T extends MVideoWithFile> (this: T, fun: (files: MVideoFile[], it: (file: MVideoFile) => number) => MVideoFile) {
+ getQualityFileBy<T extends MVideoWithFile> (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 undefined
}
- getMaxQualityFile <T extends MVideoWithFile> (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo {
+ getMaxQualityFile<T extends MVideoWithFile> (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo {
return this.getQualityFileBy(maxBy)
}
- getMinQualityFile <T extends MVideoWithFile> (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo {
+ getMinQualityFile<T extends MVideoWithFile> (this: T): MVideoFileVideo | MVideoFileStreamingPlaylistVideo {
return this.getQualityFileBy(minBy)
}
- getWebTorrentFile <T extends MVideoWithFile> (this: T, resolution: number): MVideoFileVideo {
+ getWebTorrentFile<T extends MVideoWithFile> (this: T, resolution: number): MVideoFileVideo {
if (Array.isArray(this.VideoFiles) === false) return undefined
const file = this.VideoFiles.find(f => f.resolution === resolution)
}
this.VideoStreamingPlaylists = this.VideoStreamingPlaylists
- .filter(s => s.type !== VideoStreamingPlaylistType.HLS)
- .concat(toAdd)
+ .filter(s => s.type !== VideoStreamingPlaylistType.HLS)
+ .concat(toAdd)
}
removeFile (videoFile: MVideoFile, isRedundancy = false) {
.catch(err => logger.warn('Cannot delete torrent %s.', torrentPath, { err }))
}
- removeStreamingPlaylist (isRedundancy = false) {
+ async removeStreamingPlaylistFiles (streamingPlaylist: MStreamingPlaylist, isRedundancy = false) {
const directoryPath = getHLSDirectory(this, isRedundancy)
- return remove(directoryPath)
- .catch(err => logger.warn('Cannot delete playlist directory %s.', directoryPath, { err }))
+ await remove(directoryPath)
+
+ if (isRedundancy !== true) {
+ const 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 () {
projects / github / Chocobozzz / PeerTube.git / blobdiff