Table,
UpdatedAt
} from 'sequelize-typescript'
-import { setAsUpdated } from '@server/helpers/database-utils'
import { buildNSFWFilter } from '@server/helpers/express-utils'
+import { uuidToShort } from '@server/helpers/uuid'
import { getPrivaciesForFederation, isPrivacyForFederation, isStateForFederation } from '@server/helpers/video'
-import { LiveManager } from '@server/lib/live-manager'
+import { LiveManager } from '@server/lib/live/live-manager'
import { getHLSDirectory, getVideoFilePath } from '@server/lib/video-paths'
import { getServerActor } from '@server/models/application/application'
import { ModelCache } from '@server/models/model-cache'
-import { AttributesOnly } from '@shared/core-utils'
+import { AttributesOnly, buildVideoEmbedPath, buildVideoWatchPath } from '@shared/core-utils'
import { VideoFile } from '@shared/models/videos/video-file.model'
import { ResultList, UserRight, VideoPrivacy, VideoState } from '../../../shared'
import { VideoObject } from '../../../shared/models/activitypub/objects'
import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
import { isBooleanValid } from '../../helpers/custom-validators/misc'
import {
- isVideoCategoryValid,
isVideoDescriptionValid,
isVideoDurationValid,
- isVideoLanguageValid,
- isVideoLicenceValid,
isVideoNameValid,
isVideoPrivacyValid,
isVideoStateValid,
import { getVideoFileResolution } from '../../helpers/ffprobe-utils'
import { logger } from '../../helpers/logger'
import { CONFIG } from '../../initializers/config'
-import {
- ACTIVITY_PUB,
- API_VERSION,
- CONSTRAINTS_FIELDS,
- LAZY_STATIC_PATHS,
- STATIC_PATHS,
- VIDEO_CATEGORIES,
- VIDEO_LANGUAGES,
- VIDEO_LICENCES,
- VIDEO_PRIVACIES,
- VIDEO_STATES,
- WEBSERVER
-} from '../../initializers/constants'
+import { ACTIVITY_PUB, API_VERSION, CONSTRAINTS_FIELDS, LAZY_STATIC_PATHS, STATIC_PATHS, WEBSERVER } from '../../initializers/constants'
import { sendDeleteVideo } from '../../lib/activitypub/send'
import {
MChannel,
MVideoFormattableDetails,
MVideoForUser,
MVideoFullLight,
- MVideoIdThumbnail,
+ MVideoId,
MVideoImmutable,
MVideoThumbnail,
MVideoThumbnailBlacklist,
MVideoWithAllFiles,
- MVideoWithFile,
- MVideoWithRights
+ MVideoWithFile
} from '../../types/models'
import { MThumbnail } from '../../types/models/video/thumbnail'
import { MVideoFile, MVideoFileStreamingPlaylistVideo } from '../../types/models/video/video-file'
import { ServerModel } from '../server/server'
import { TrackerModel } from '../server/tracker'
import { VideoTrackerModel } from '../server/video-tracker'
+import { setAsUpdated } from '../shared'
import { UserModel } from '../user/user'
import { UserVideoHistoryModel } from '../user/user-video-history'
import { buildTrigramSearchIndex, buildWhereIdOrUUID, getVideoSort, isOutdated, throwIfNotValid } from '../utils'
videoModelToFormattedJSON
} from './formatter/video-format-utils'
import { ScheduleVideoUpdateModel } from './schedule-video-update'
+import { VideosModelGetQueryBuilder } from './sql/video-model-get-query-builder'
import { BuildVideosListQueryOptions, VideosIdListQueryBuilder } from './sql/videos-id-list-query-builder'
import { VideosModelListQueryBuilder } from './sql/videos-model-list-query-builder'
import { TagModel } from './tag'
import { VideoViewModel } from './video-view'
export enum ScopeNames {
- AVAILABLE_FOR_LIST_IDS = 'AVAILABLE_FOR_LIST_IDS',
FOR_API = 'FOR_API',
WITH_ACCOUNT_DETAILS = 'WITH_ACCOUNT_DETAILS',
WITH_TAGS = 'WITH_TAGS',
- WITH_TRACKERS = 'WITH_TRACKERS',
WITH_WEBTORRENT_FILES = 'WITH_WEBTORRENT_FILES',
WITH_SCHEDULED_UPDATE = 'WITH_SCHEDULED_UPDATE',
WITH_BLACKLISTED = 'WITH_BLACKLISTED',
- 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',
- WITH_LIVE = 'WITH_LIVE'
+ WITH_USER_HISTORY = 'WITH_USER_HISTORY',
+ WITH_THUMBNAILS = 'WITH_THUMBNAILS'
}
export type ForAPIOptions = {
}
]
},
- [ScopeNames.WITH_LIVE]: {
- include: [
- {
- model: VideoLiveModel.unscoped(),
- required: false
- }
- ]
- },
- [ScopeNames.WITH_USER_ID]: {
- include: [
- {
- attributes: [ 'accountId' ],
- model: VideoChannelModel.unscoped(),
- required: true,
- include: [
- {
- attributes: [ 'userId' ],
- model: AccountModel.unscoped(),
- required: true
- }
- ]
- }
- ]
- },
[ScopeNames.WITH_ACCOUNT_DETAILS]: {
include: [
{
[ScopeNames.WITH_TAGS]: {
include: [ TagModel ]
},
- [ScopeNames.WITH_TRACKERS]: {
- include: [
- {
- attributes: [ 'id', 'url' ],
- model: TrackerModel
- }
- ]
- },
[ScopeNames.WITH_BLACKLISTED]: {
include: [
{
@AllowNull(true)
@Default(null)
- @Is('VideoCategory', value => throwIfNotValid(value, isVideoCategoryValid, 'category', true))
@Column
category: number
@AllowNull(true)
@Default(null)
- @Is('VideoLicence', value => throwIfNotValid(value, isVideoLicenceValid, 'licence', true))
@Column
licence: number
@AllowNull(true)
@Default(null)
- @Is('VideoLanguage', value => throwIfNotValid(value, isVideoLanguageValid, 'language', true))
@Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.LANGUAGE.max))
language: string
foreignKey: {
allowNull: true
},
- hooks: true
+ onDelete: 'cascade'
})
VideoChannel: VideoChannelModel
}
@BeforeDestroy
- static async removeFiles (instance: VideoModel) {
+ static async removeFiles (instance: VideoModel, options) {
const tasks: Promise<any>[] = []
logger.info('Removing files of video %s.', instance.url)
if (instance.isOwned()) {
if (!Array.isArray(instance.VideoFiles)) {
- instance.VideoFiles = await instance.$get('VideoFiles')
+ instance.VideoFiles = await instance.$get('VideoFiles', { transaction: options.transaction })
}
// Remove physical files and torrents
instance.VideoFiles.forEach(file => {
- tasks.push(instance.removeFile(file))
- tasks.push(file.removeTorrent())
+ tasks.push(instance.removeFileAndTorrent(file))
})
// Remove playlists file
if (!Array.isArray(instance.VideoStreamingPlaylists)) {
- instance.VideoStreamingPlaylists = await instance.$get('VideoStreamingPlaylists')
+ instance.VideoStreamingPlaylists = await instance.$get('VideoStreamingPlaylists', { transaction: options.transaction })
}
for (const p of instance.VideoStreamingPlaylists) {
logger.info('Stopping live of video %s after video deletion.', instance.uuid)
- return LiveManager.Instance.stopSessionOf(instance.id)
+ LiveManager.Instance.stopSessionOf(instance.id)
}
@BeforeDestroy
const tasks: Promise<any>[] = []
if (!Array.isArray(instance.VideoAbuses)) {
- instance.VideoAbuses = await instance.$get('VideoAbuses')
+ instance.VideoAbuses = await instance.$get('VideoAbuses', { transaction: options.transaction })
if (instance.VideoAbuses.length === 0) return undefined
}
tasks.push(abuse.save({ transaction: options.transaction }))
}
- Promise.all(tasks)
- .catch(err => {
- logger.error('Some errors when saving details of video %s in its abuses before destroy hook.', instance.uuid, { err })
- })
-
- return undefined
+ await Promise.all(tasks)
}
static listLocal (): Promise<MVideo[]> {
static async searchAndPopulateAccountAndServer (options: {
includeLocalVideos: boolean
search?: string
+ host?: string
start?: number
count?: number
sort?: string
durationMax?: number // seconds
user?: MUserAccountId
filter?: VideoFilter
+ uuids?: string[]
}) {
const serverActor = await getServerActor()
user: options.user,
filter: options.filter,
+ host: options.host,
start: options.start,
count: options.count,
durationMin: options.durationMin,
durationMax: options.durationMax,
+ uuids: options.uuids,
+
search: options.search
}
return VideoModel.count(options)
}
- static load (id: number | string, t?: Transaction): Promise<MVideoThumbnail> {
- const where = buildWhereIdOrUUID(id)
- const options = {
- where,
- transaction: t
- }
+ static load (id: number | string, transaction?: Transaction): Promise<MVideoThumbnail> {
+ const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize)
- return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options)
+ return queryBuilder.queryVideo({ id, transaction, type: 'thumbnails' })
}
- static loadWithBlacklist (id: number | string, t?: Transaction): Promise<MVideoThumbnailBlacklist> {
- const where = buildWhereIdOrUUID(id)
- const options = {
- where,
- transaction: t
- }
+ static loadWithBlacklist (id: number | string, transaction?: Transaction): Promise<MVideoThumbnailBlacklist> {
+ const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize)
- return VideoModel.scope([
- ScopeNames.WITH_THUMBNAILS,
- ScopeNames.WITH_BLACKLISTED
- ]).findOne(options)
+ return queryBuilder.queryVideo({ id, transaction, type: 'thumbnails-blacklist' })
}
static loadImmutableAttributes (id: number | string, t?: Transaction): Promise<MVideoImmutable> {
})
}
- static loadWithRights (id: number | string, t?: Transaction): Promise<MVideoWithRights> {
- const where = buildWhereIdOrUUID(id)
- const options = {
- where,
- transaction: t
- }
-
- return VideoModel.scope([
- ScopeNames.WITH_BLACKLISTED,
- ScopeNames.WITH_USER_ID
- ]).findOne(options)
- }
-
- static loadOnlyId (id: number | string, t?: Transaction): Promise<MVideoIdThumbnail> {
- const where = buildWhereIdOrUUID(id)
-
- const options = {
- attributes: [ 'id' ],
- where,
- transaction: t
- }
-
- return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options)
- }
-
- static loadWithFiles (id: number | string, t?: Transaction, logging?: boolean): Promise<MVideoWithAllFiles> {
- const where = buildWhereIdOrUUID(id)
-
- const query = {
- where,
- transaction: t,
- logging
- }
-
- return VideoModel.scope([
- ScopeNames.WITH_WEBTORRENT_FILES,
- ScopeNames.WITH_STREAMING_PLAYLISTS,
- ScopeNames.WITH_THUMBNAILS
- ]).findOne(query)
- }
-
- static loadByUUID (uuid: string): Promise<MVideoThumbnail> {
- const options = {
- where: {
- uuid
- }
- }
-
- return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(options)
- }
-
- static loadByUrl (url: string, transaction?: Transaction): Promise<MVideoThumbnail> {
- const query: FindOptions = {
- where: {
- url
- },
- transaction
- }
-
- return VideoModel.scope(ScopeNames.WITH_THUMBNAILS).findOne(query)
- }
-
static loadByUrlImmutableAttributes (url: string, transaction?: Transaction): Promise<MVideoImmutable> {
const fun = () => {
const query: FindOptions = {
})
}
- static loadByUrlAndPopulateAccount (url: string, transaction?: Transaction): Promise<MVideoAccountLightBlacklistAllFiles> {
- const query: FindOptions = {
- where: {
- url
- },
- transaction
- }
+ static loadOnlyId (id: number | string, transaction?: Transaction): Promise<MVideoId> {
+ const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize)
- return VideoModel.scope([
- ScopeNames.WITH_ACCOUNT_DETAILS,
- ScopeNames.WITH_WEBTORRENT_FILES,
- ScopeNames.WITH_STREAMING_PLAYLISTS,
- ScopeNames.WITH_THUMBNAILS,
- ScopeNames.WITH_BLACKLISTED
- ]).findOne(query)
+ return queryBuilder.queryVideo({ id, transaction, type: 'id' })
}
- static loadAndPopulateAccountAndServerAndTags (id: number | string, t?: Transaction, userId?: number): Promise<MVideoFullLight> {
- const where = buildWhereIdOrUUID(id)
+ static loadWithFiles (id: number | string, transaction?: Transaction, logging?: boolean): Promise<MVideoWithAllFiles> {
+ const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize)
- const options = {
- order: [ [ 'Tags', 'name', 'ASC' ] ] as any,
- where,
- transaction: t
- }
+ return queryBuilder.queryVideo({ id, transaction, type: 'all-files', logging })
+ }
- const scopes: (string | ScopeOptions)[] = [
- ScopeNames.WITH_TAGS,
- ScopeNames.WITH_BLACKLISTED,
- ScopeNames.WITH_ACCOUNT_DETAILS,
- ScopeNames.WITH_SCHEDULED_UPDATE,
- ScopeNames.WITH_WEBTORRENT_FILES,
- ScopeNames.WITH_STREAMING_PLAYLISTS,
- ScopeNames.WITH_THUMBNAILS,
- ScopeNames.WITH_LIVE
- ]
+ static loadByUrl (url: string, transaction?: Transaction): Promise<MVideoThumbnail> {
+ const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize)
- if (userId) {
- scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] })
- }
+ return queryBuilder.queryVideo({ url, transaction, type: 'thumbnails' })
+ }
+
+ static loadByUrlAndPopulateAccount (url: string, transaction?: Transaction): Promise<MVideoAccountLightBlacklistAllFiles> {
+ const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize)
+
+ return queryBuilder.queryVideo({ url, transaction, type: 'account-blacklist-files' })
+ }
+
+ static loadAndPopulateAccountAndServerAndTags (id: number | string, t?: Transaction, userId?: number): Promise<MVideoFullLight> {
+ const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize)
- return VideoModel
- .scope(scopes)
- .findOne(options)
+ return queryBuilder.queryVideo({ id, transaction: t, type: 'full-light', userId })
}
static loadForGetAPI (parameters: {
id: number | string
- t?: Transaction
+ transaction?: Transaction
userId?: number
}): Promise<MVideoDetails> {
- const { id, t, userId } = parameters
- const where = buildWhereIdOrUUID(id)
-
- const options = {
- order: [ [ 'Tags', 'name', 'ASC' ] ] as any, // FIXME: sequelize typings
- where,
- transaction: t
- }
-
- const scopes: (string | ScopeOptions)[] = [
- ScopeNames.WITH_TAGS,
- ScopeNames.WITH_BLACKLISTED,
- ScopeNames.WITH_ACCOUNT_DETAILS,
- ScopeNames.WITH_SCHEDULED_UPDATE,
- ScopeNames.WITH_THUMBNAILS,
- ScopeNames.WITH_LIVE,
- ScopeNames.WITH_TRACKERS,
- { method: [ ScopeNames.WITH_WEBTORRENT_FILES, true ] },
- { method: [ ScopeNames.WITH_STREAMING_PLAYLISTS, true ] }
- ]
+ const { id, transaction, userId } = parameters
+ const queryBuilder = new VideosModelGetQueryBuilder(VideoModel.sequelize)
- if (userId) {
- scopes.push({ method: [ ScopeNames.WITH_USER_HISTORY, userId ] })
- }
-
- return VideoModel
- .scope(scopes)
- .findOne(options)
+ return queryBuilder.queryVideo({ id, transaction, type: 'api', userId })
}
static async getStats () {
const rawQuery = `UPDATE "video" SET "${field}" = ` +
'(' +
- 'SELECT COUNT(id) FROM "accountVideoRate" WHERE "accountVideoRate"."videoId" = "video"."id" AND type = :rateType' +
+ 'SELECT COUNT(id) FROM "accountVideoRate" WHERE "accountVideoRate"."videoId" = "video"."id" AND type = :rateType' +
') ' +
'WHERE "video"."id" = :videoId'
.then(results => results.length === 1)
}
- static bulkUpdateSupportField (videoChannel: MChannel, t: Transaction) {
+ static bulkUpdateSupportField (ofChannel: MChannel, t: Transaction) {
const options = {
where: {
- channelId: videoChannel.id
+ channelId: ofChannel.id
},
transaction: t
}
- return VideoModel.update({ support: videoChannel.support }, options)
+ return VideoModel.update({ support: ofChannel.support }, options)
}
static getAllIdsFromChannel (videoChannel: MChannelId): Promise<number[]> {
}
}
- static getCategoryLabel (id: number) {
- return VIDEO_CATEGORIES[id] || 'Misc'
- }
-
- static getLicenceLabel (id: number) {
- return VIDEO_LICENCES[id] || 'Unknown'
- }
-
- static getLanguageLabel (id: string) {
- return VIDEO_LANGUAGES[id] || 'Unknown'
- }
-
- static getPrivacyLabel (id: number) {
- return VIDEO_PRIVACIES[id] || 'Unknown'
- }
-
- static getStateLabel (id: number) {
- return VIDEO_STATES[id] || 'Unknown'
- }
-
isBlacklisted () {
return !!this.VideoBlacklist
}
}
getWatchStaticPath () {
- return '/w/' + this.uuid
+ return buildVideoWatchPath({ shortUUID: uuidToShort(this.uuid) })
}
getEmbedStaticPath () {
- return '/videos/embed/' + this.uuid
+ return buildVideoEmbedPath(this)
}
getMiniatureStaticPath () {
.concat(toAdd)
}
- removeFile (videoFile: MVideoFile, isRedundancy = false) {
+ removeFileAndTorrent (videoFile: MVideoFile, isRedundancy = false) {
const filePath = getVideoFilePath(this, videoFile, isRedundancy)
- return remove(filePath)
- .catch(err => logger.warn('Cannot delete file %s.', filePath, { err }))
+
+ const promises: Promise<any>[] = [ remove(filePath) ]
+ if (!isRedundancy) promises.push(videoFile.removeTorrent())
+
+ return Promise.all(promises)
}
async removeStreamingPlaylistFiles (streamingPlaylist: MStreamingPlaylist, isRedundancy = false) {
projects / github / Chocobozzz / PeerTube.git / blobdiff