import * as Bluebird from 'bluebird'
-import { map, maxBy, truncate } from 'lodash'
+import { map, maxBy } from 'lodash'
import * as magnetUtil from 'magnet-uri'
import * as parseTorrent from 'parse-torrent'
import { join } from 'path'
} from 'sequelize-typescript'
import { VideoPrivacy, VideoResolution } from '../../../shared'
import { VideoTorrentObject } from '../../../shared/models/activitypub/objects'
-import { Video, VideoDetails } from '../../../shared/models/videos'
+import { Video, VideoDetails, VideoFile } from '../../../shared/models/videos'
+import { VideoFilter } from '../../../shared/models/videos/video-query.type'
import { activityPubCollection } from '../../helpers/activitypub'
-import { createTorrentPromise, renamePromise, statPromise, unlinkPromise, writeFilePromise } from '../../helpers/core-utils'
+import {
+ createTorrentPromise, peertubeTruncate, renamePromise, statPromise, unlinkPromise,
+ writeFilePromise
+} from '../../helpers/core-utils'
import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
import { isBooleanValid } from '../../helpers/custom-validators/misc'
import {
isVideoLanguageValid,
isVideoLicenceValid,
isVideoNameValid,
- isVideoPrivacyValid, isVideoSupportValid
+ isVideoPrivacyValid,
+ isVideoSupportValid
} from '../../helpers/custom-validators/videos'
-import { generateImageFromVideoFile, getVideoFileHeight, transcode } from '../../helpers/ffmpeg-utils'
+import { generateImageFromVideoFile, getVideoFileResolution, transcode } from '../../helpers/ffmpeg-utils'
import { logger } from '../../helpers/logger'
import { getServerActor } from '../../helpers/utils'
import {
}
@Scopes({
- [ScopeNames.AVAILABLE_FOR_LIST]: (actorId: number) => ({
- where: {
- id: {
- [Sequelize.Op.notIn]: Sequelize.literal(
- '(SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")'
- ),
- [ Sequelize.Op.in ]: Sequelize.literal(
- '(' +
+ [ScopeNames.AVAILABLE_FOR_LIST]: (actorId: number, hideNSFW: boolean, filter?: VideoFilter, withFiles?: boolean) => {
+ const query: IFindOptions<VideoModel> = {
+ where: {
+ id: {
+ [Sequelize.Op.notIn]: Sequelize.literal(
+ '(SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")'
+ ),
+ [ 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) +
'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) +
- ')'
- )
+ ')'
+ )
+ },
+ privacy: VideoPrivacy.PUBLIC
},
- privacy: VideoPrivacy.PUBLIC
- },
- include: [
- {
- attributes: [ 'name', 'description' ],
- model: VideoChannelModel.unscoped(),
- required: true,
- include: [
- {
- attributes: [ 'name' ],
- model: AccountModel.unscoped(),
- required: true,
- include: [
- {
- attributes: [ 'serverId' ],
- model: ActorModel.unscoped(),
- required: true,
- include: [
- {
- attributes: [ 'host' ],
- model: ServerModel.unscoped()
- }
- ]
- }
- ]
- }
- ]
- }
- ]
- }),
+ 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
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+
+ if (withFiles === true) {
+ query.include.push({
+ model: VideoFileModel.unscoped(),
+ required: true
+ })
+ }
+
+ // Hide nsfw videos?
+ if (hideNSFW === true) {
+ query.where['nsfw'] = false
+ }
+
+ return query
+ },
[ScopeNames.WITH_ACCOUNT_DETAILS]: {
include: [
{
[ScopeNames.WITH_FILES]: {
include: [
{
- model: () => VideoFileModel,
+ model: () => VideoFileModel.unscoped(),
required: true
}
]
[ScopeNames.WITH_SHARES]: {
include: [
{
- model: () => VideoShareModel,
- include: [ () => ActorModel ]
+ model: () => VideoShareModel.unscoped()
}
]
},
include: [
{
model: () => AccountVideoRateModel,
- include: [ () => AccountModel ]
+ include: [
+ {
+ model: () => AccountModel.unscoped(),
+ required: true,
+ include: [
+ {
+ attributes: [ 'url' ],
+ model: () => ActorModel.unscoped()
+ }
+ ]
+ }
+ ]
}
]
},
[ScopeNames.WITH_COMMENTS]: {
include: [
{
- model: () => VideoCommentModel
+ model: () => VideoCommentModel.unscoped()
}
]
}
@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'))
@UpdatedAt
updatedAt: Date
+ @AllowNull(false)
+ @Default(Sequelize.NOW)
+ @Column
+ publishedAt: Date
+
@ForeignKey(() => VideoChannelModel)
@Column
channelId: number
return 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 after destroy hook.', instance.uuid, { err })
})
}
})
}
- static listUserVideosForApi (userId: number, start: number, count: number, sort: string) {
- const query = {
+ static listAccountVideosForApi (accountId: number, start: number, count: number, sort: string, hideNSFW: boolean, withFiles = false) {
+ const query: IFindOptions<VideoModel> = {
offset: start,
limit: count,
order: getSort(sort),
{
model: AccountModel,
where: {
- userId
+ id: accountId
},
required: true
}
]
}
+ if (withFiles === true) {
+ query.include.push({
+ model: VideoFileModel.unscoped(),
+ required: true
+ })
+ }
+
+ 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) {
+ static async listForApi (start: number, count: number, sort: string, hideNSFW: boolean, filter?: VideoFilter, withFiles = false) {
const query = {
offset: start,
limit: count,
}
const serverActor = await getServerActor()
-
- return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST, serverActor.id ] })
+ return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST, serverActor.id, hideNSFW, filter, withFiles ] })
.findAndCountAll(query)
.then(({ rows, count }) => {
return {
})
}
- static async searchAndPopulateAccountAndServerAndTags (value: string, start: number, count: number, sort: string) {
+ static async searchAndPopulateAccountAndServer (value: string, start: number, count: number, sort: string, hideNSFW: boolean) {
const query: IFindOptions<VideoModel> = {
offset: start,
limit: count,
order: getSort(sort),
where: {
- name: {
- [Sequelize.Op.iLike]: '%' + value + '%'
- }
+ [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 + '%'
+ })
+ }
+ ]
}
}
const serverActor = await getServerActor()
- return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST, serverActor.id ] })
- .findAndCountAll(query).then(({ rows, count }) => {
+ return VideoModel.scope({ method: [ ScopeNames.AVAILABLE_FOR_LIST, serverActor.id, hideNSFW ] })
+ .findAndCountAll(query)
+ .then(({ rows, count }) => {
return {
data: rows,
total: count
.findOne(options)
}
+ static async getStats () {
+ const totalLocalVideos = await VideoModel.count({
+ where: {
+ remote: false
+ }
+ })
+ const totalVideos = await VideoModel.count()
+
+ let totalLocalVideoViews = await VideoModel.sum('views', {
+ where: {
+ remote: false
+ }
+ })
+ // Sequelize could return null...
+ if (!totalLocalVideoViews) totalLocalVideoViews = 0
+
+ return {
+ totalLocalVideos,
+ totalLocalVideoViews,
+ totalVideos
+ }
+ }
+
+ private static buildActorWhereWithFilter (filter?: VideoFilter) {
+ if (filter && filter === 'local') {
+ return {
+ serverId: null
+ }
+ }
+
+ return {}
+ }
+
+ private static getCategoryLabel (id: number) {
+ let categoryLabel = VIDEO_CATEGORIES[id]
+ if (!categoryLabel) categoryLabel = 'Misc'
+
+ return categoryLabel
+ }
+
+ private static getLicenceLabel (id: number) {
+ let licenceLabel = VIDEO_LICENCES[id]
+ if (!licenceLabel) licenceLabel = 'Unknown'
+
+ return licenceLabel
+ }
+
+ private static getLanguageLabel (id: string) {
+ let languageLabel = VIDEO_LANGUAGES[id]
+ console.log(VIDEO_LANGUAGES)
+ console.log(id)
+ if (!languageLabel) languageLabel = 'Unknown'
+
+ return languageLabel
+ }
+
+ private static getPrivacyLabel (id: number) {
+ let privacyLabel = VIDEO_PRIVACIES[id]
+ if (!privacyLabel) privacyLabel = 'Unknown'
+
+ return privacyLabel
+ }
+
getOriginalFile () {
if (Array.isArray(this.VideoFiles) === false) return undefined
}
createPreview (videoFile: VideoFileModel) {
- const imageSize = PREVIEWS_SIZE.width + 'x' + PREVIEWS_SIZE.height
-
return generateImageFromVideoFile(
this.getVideoFilePath(videoFile),
CONFIG.STORAGE.PREVIEWS_DIR,
this.getPreviewName(),
- imageSize
+ PREVIEWS_SIZE
)
}
createThumbnail (videoFile: VideoFileModel) {
- const imageSize = THUMBNAILS_SIZE.width + 'x' + THUMBNAILS_SIZE.height
-
return generateImageFromVideoFile(
this.getVideoFilePath(videoFile),
CONFIG.STORAGE.THUMBNAILS_DIR,
this.getThumbnailName(),
- imageSize
+ THUMBNAILS_SIZE
)
}
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' ]
}
toFormattedJSON (): Video {
- let serverHost
-
- if (this.VideoChannel.Account.Actor.Server) {
- serverHost = this.VideoChannel.Account.Actor.Server.host
- } else {
- // It means it's our video
- serverHost = CONFIG.WEBSERVER.HOST
- }
+ const formattedAccount = this.VideoChannel.Account.toFormattedJSON()
return {
id: this.id,
uuid: this.uuid,
name: this.name,
- category: this.category,
- categoryLabel: this.getCategoryLabel(),
- licence: this.licence,
- licenceLabel: this.getLicenceLabel(),
- language: this.language,
- languageLabel: this.getLanguageLabel(),
+ category: {
+ id: this.category,
+ label: VideoModel.getCategoryLabel(this.category)
+ },
+ licence: {
+ id: this.licence,
+ label: VideoModel.getLicenceLabel(this.licence)
+ },
+ language: {
+ id: this.language,
+ label: VideoModel.getLanguageLabel(this.language)
+ },
+ privacy: {
+ id: this.privacy,
+ label: VideoModel.getPrivacyLabel(this.privacy)
+ },
nsfw: this.nsfw,
description: this.getTruncatedDescription(),
- serverHost,
isLocal: this.isOwned(),
- accountName: this.VideoChannel.Account.name,
duration: this.duration,
views: this.views,
likes: this.likes,
previewPath: this.getPreviewPath(),
embedPath: this.getEmbedPath(),
createdAt: this.createdAt,
- updatedAt: this.updatedAt
+ updatedAt: this.updatedAt,
+ publishedAt: this.publishedAt,
+ account: {
+ name: formattedAccount.name,
+ displayName: formattedAccount.displayName,
+ url: formattedAccount.url,
+ host: formattedAccount.host,
+ avatar: formattedAccount.avatar
+ }
}
}
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 detailsJson = {
- privacyLabel,
- privacy: this.privacy,
support: this.support,
descriptionPath: this.getDescriptionPath(),
channel: this.VideoChannel.toFormattedJSON(),
account: this.VideoChannel.Account.toFormattedJSON(),
- tags: map<TagModel, string>(this.Tags, 'name'),
+ tags: map(this.Tags, 'name'),
commentsEnabled: this.commentsEnabled,
files: []
}
// Format and sort video files
+ detailsJson.files = this.getFormattedVideoFilesJSON()
+
+ return Object.assign(formattedJson, detailsJson)
+ }
+
+ getFormattedVideoFilesJSON (): VideoFile[] {
const { baseUrlHttp, baseUrlWs } = this.getBaseUrls()
- detailsJson.files = this.VideoFiles
- .map(videoFile => {
- let resolutionLabel = videoFile.resolution + 'p'
- return {
- resolution: videoFile.resolution,
- resolutionLabel,
- magnetUri: this.generateMagnetUri(videoFile, baseUrlHttp, baseUrlWs),
- size: videoFile.size,
- torrentUrl: this.getTorrentUrl(videoFile, baseUrlHttp),
- fileUrl: this.getVideoFileUrl(videoFile, baseUrlHttp)
- }
- })
- .sort((a, b) => {
- if (a.resolution < b.resolution) return 1
- if (a.resolution === b.resolution) return 0
- return -1
- })
+ return this.VideoFiles
+ .map(videoFile => {
+ let resolutionLabel = videoFile.resolution + 'p'
- return Object.assign(formattedJson, detailsJson)
+ return {
+ resolution: {
+ id: videoFile.resolution,
+ label: resolutionLabel
+ },
+ magnetUri: this.generateMagnetUri(videoFile, baseUrlHttp, baseUrlWs),
+ size: videoFile.size,
+ torrentUrl: this.getTorrentUrl(videoFile, baseUrlHttp),
+ fileUrl: this.getVideoFileUrl(videoFile, baseUrlHttp)
+ } as VideoFile
+ })
+ .sort((a, b) => {
+ if (a.resolution.id < b.resolution.id) return 1
+ if (a.resolution.id === b.resolution.id) return 0
+ return -1
+ })
}
toActivityPubObject (): VideoTorrentObject {
let language
if (this.language) {
language = {
- identifier: this.language + '',
- name: this.getLanguageLabel()
+ identifier: this.language,
+ name: VideoModel.getLanguageLabel(this.language)
}
}
if (this.category) {
category = {
identifier: this.category + '',
- name: this.getCategoryLabel()
+ name: VideoModel.getCategoryLabel(this.category)
}
}
if (this.licence) {
licence = {
identifier: this.licence + '',
- name: this.getLicenceLabel()
+ name: VideoModel.getLicenceLabel(this.licence)
}
}
views: this.views,
sensitive: this.nsfw,
commentsEnabled: this.commentsEnabled,
- published: this.createdAt.toISOString(),
+ published: this.publishedAt.toISOString(),
updated: this.updatedAt.toISOString(),
mediaType: 'text/markdown',
content: this.getTruncatedDescription(),
shares: sharesObject,
comments: commentsObject,
attributedTo: [
- {
- type: 'Group',
- id: this.VideoChannel.Actor.url
- },
{
type: 'Person',
id: this.VideoChannel.Account.Actor.url
+ },
+ {
+ type: 'Group',
+ id: this.VideoChannel.Actor.url
}
]
}
getTruncatedDescription () {
if (!this.description) return null
- const options = {
- length: CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max
- }
-
- return truncate(this.description, options)
+ const maxLength = CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max
+ return peertubeTruncate(this.description, maxLength)
}
- optimizeOriginalVideofile = async function () {
+ async optimizeOriginalVideofile () {
const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
const newExtname = '.mp4'
const inputVideoFile = this.getOriginalFile()
outputPath: videoOutputPath
}
- try {
- // Could be very long!
- await transcode(transcodeOptions)
+ // Could be very long!
+ await transcode(transcodeOptions)
+ try {
await unlinkPromise(videoInputPath)
// Important to do this before getVideoFilename() to take in account the new file extension
} catch (err) {
// Auto destruction...
- this.destroy().catch(err => logger.error('Cannot destruct video after transcoding failure.', err))
+ this.destroy().catch(err => logger.error('Cannot destruct video after transcoding failure.', { err }))
throw err
}
}
- transcodeOriginalVideofile = async function (resolution: VideoResolution) {
+ async transcodeOriginalVideofile (resolution: VideoResolution, isPortraitMode: boolean) {
const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
const extname = '.mp4'
const transcodeOptions = {
inputPath: videoInputPath,
outputPath: videoOutputPath,
- resolution
+ resolution,
+ isPortraitMode
}
await transcode(transcodeOptions)
this.VideoFiles.push(newVideoFile)
}
- getOriginalFileHeight () {
+ getOriginalFileResolution () {
const originalFilePath = this.getVideoFilePath(this.getOriginalFile())
- return getVideoFileHeight(originalFilePath)
+ return getVideoFileResolution(originalFilePath)
}
getDescriptionPath () {
return `/api/${API_VERSION}/videos/${this.uuid}/description`
}
- getCategoryLabel () {
- let categoryLabel = VIDEO_CATEGORIES[this.category]
- if (!categoryLabel) categoryLabel = 'Misc'
-
- return categoryLabel
- }
-
- getLicenceLabel () {
- let licenceLabel = VIDEO_LICENCES[this.licence]
- if (!licenceLabel) licenceLabel = 'Unknown'
-
- return licenceLabel
- }
-
- getLanguageLabel () {
- let languageLabel = VIDEO_LANGUAGES[this.language]
- if (!languageLabel) languageLabel = 'Unknown'
-
- return languageLabel
- }
-
removeThumbnail () {
const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName())
return unlinkPromise(thumbnailPath)
projects / github / Chocobozzz / PeerTube.git / blobdiff