import * as safeBuffer from 'safe-buffer'
const Buffer = safeBuffer.Buffer
-import * as ffmpeg from 'fluent-ffmpeg'
import * as magnetUtil from 'magnet-uri'
-import { map, values } from 'lodash'
+import { map } from 'lodash'
import * as parseTorrent from 'parse-torrent'
import { join } from 'path'
import * as Sequelize from 'sequelize'
import * as Promise from 'bluebird'
+import { maxBy } from 'lodash'
-import { database as db } from '../../initializers/database'
import { TagInstance } from './tag-interface'
import {
logger,
isVideoLanguageValid,
isVideoNSFWValid,
isVideoDescriptionValid,
- isVideoInfoHashValid,
isVideoDurationValid,
readFileBufferPromise,
unlinkPromise,
renamePromise,
writeFilePromise,
- createTorrentPromise
+ createTorrentPromise,
+ statPromise,
+ generateImageFromVideoFile,
+ transcode,
+ getVideoFileHeight
} from '../../helpers'
import {
- CONSTRAINTS_FIELDS,
CONFIG,
REMOTE_SCHEME,
STATIC_PATHS,
VIDEO_LANGUAGES,
THUMBNAILS_SIZE
} from '../../initializers'
-import { JobScheduler, removeVideoToFriends } from '../../lib'
+import { removeVideoToFriends } from '../../lib'
+import { VideoResolution } from '../../../shared'
+import { VideoFileInstance, VideoFileModel } from './video-file-interface'
import { addMethodsToModel, getSort } from '../utils'
import {
} from './video-interface'
let Video: Sequelize.Model<VideoInstance, VideoAttributes>
+let getOriginalFile: VideoMethods.GetOriginalFile
let generateMagnetUri: VideoMethods.GenerateMagnetUri
let getVideoFilename: VideoMethods.GetVideoFilename
let getThumbnailName: VideoMethods.GetThumbnailName
+let getThumbnailPath: VideoMethods.GetThumbnailPath
let getPreviewName: VideoMethods.GetPreviewName
-let getTorrentName: VideoMethods.GetTorrentName
+let getPreviewPath: VideoMethods.GetPreviewPath
+let getTorrentFileName: VideoMethods.GetTorrentFileName
let isOwned: VideoMethods.IsOwned
-let toFormatedJSON: VideoMethods.ToFormatedJSON
+let toFormattedJSON: VideoMethods.ToFormattedJSON
let toAddRemoteJSON: VideoMethods.ToAddRemoteJSON
let toUpdateRemoteJSON: VideoMethods.ToUpdateRemoteJSON
-let transcodeVideofile: VideoMethods.TranscodeVideofile
+let optimizeOriginalVideofile: VideoMethods.OptimizeOriginalVideofile
+let transcodeOriginalVideofile: VideoMethods.TranscodeOriginalVideofile
+let createPreview: VideoMethods.CreatePreview
+let createThumbnail: VideoMethods.CreateThumbnail
+let getVideoFilePath: VideoMethods.GetVideoFilePath
+let createTorrentAndSetInfoHash: VideoMethods.CreateTorrentAndSetInfoHash
+let getOriginalFileHeight: VideoMethods.GetOriginalFileHeight
+let getEmbedPath: VideoMethods.GetEmbedPath
let generateThumbnailFromData: VideoMethods.GenerateThumbnailFromData
-let getDurationFromFile: VideoMethods.GetDurationFromFile
let list: VideoMethods.List
let listForApi: VideoMethods.ListForApi
let loadByHostAndUUID: VideoMethods.LoadByHostAndUUID
let loadAndPopulateAuthorAndPodAndTags: VideoMethods.LoadAndPopulateAuthorAndPodAndTags
let loadByUUIDAndPopulateAuthorAndPodAndTags: VideoMethods.LoadByUUIDAndPopulateAuthorAndPodAndTags
let searchAndPopulateAuthorAndPodAndTags: VideoMethods.SearchAndPopulateAuthorAndPodAndTags
+let removeThumbnail: VideoMethods.RemoveThumbnail
+let removePreview: VideoMethods.RemovePreview
+let removeFile: VideoMethods.RemoveFile
+let removeTorrent: VideoMethods.RemoveTorrent
export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
Video = sequelize.define<VideoInstance, VideoAttributes>('Video',
}
}
},
- extname: {
- type: DataTypes.ENUM(values(CONSTRAINTS_FIELDS.VIDEOS.EXTNAME)),
- allowNull: false
- },
category: {
type: DataTypes.INTEGER,
allowNull: false,
}
}
},
- infoHash: {
- type: DataTypes.STRING,
- allowNull: false,
- validate: {
- infoHashValid: value => {
- const res = isVideoInfoHashValid(value)
- if (res === false) throw new Error('Video info hash is not valid.')
- }
- }
- },
duration: {
type: DataTypes.INTEGER,
allowNull: false,
{
fields: [ 'duration' ]
},
- {
- fields: [ 'infoHash' ]
- },
{
fields: [ 'views' ]
},
}
],
hooks: {
- beforeValidate,
- beforeCreate,
afterDestroy
}
}
associate,
generateThumbnailFromData,
- getDurationFromFile,
list,
listForApi,
listOwnedAndPopulateAuthorAndTags,
listOwnedByAuthor,
load,
- loadByUUID,
- loadByHostAndUUID,
loadAndPopulateAuthor,
loadAndPopulateAuthorAndPodAndTags,
+ loadByHostAndUUID,
+ loadByUUID,
loadByUUIDAndPopulateAuthorAndPodAndTags,
- searchAndPopulateAuthorAndPodAndTags,
- removeFromBlacklist
+ searchAndPopulateAuthorAndPodAndTags
]
const instanceMethods = [
+ createPreview,
+ createThumbnail,
+ createTorrentAndSetInfoHash,
generateMagnetUri,
- getVideoFilename,
- getThumbnailName,
getPreviewName,
- getTorrentName,
+ getPreviewPath,
+ getThumbnailName,
+ getThumbnailPath,
+ getTorrentFileName,
+ getVideoFilename,
+ getVideoFilePath,
+ getOriginalFile,
isOwned,
- toFormatedJSON,
+ removeFile,
+ removePreview,
+ removeThumbnail,
+ removeTorrent,
toAddRemoteJSON,
+ toFormattedJSON,
toUpdateRemoteJSON,
- transcodeVideofile
+ optimizeOriginalVideofile,
+ transcodeOriginalVideofile,
+ getOriginalFileHeight,
+ getEmbedPath
]
addMethodsToModel(Video, classMethods, instanceMethods)
return Video
}
-function beforeValidate (video: VideoInstance) {
- // Put a fake infoHash if it does not exists yet
- if (video.isOwned() && !video.infoHash) {
- // 40 hexa length
- video.infoHash = '0123456789abcdef0123456789abcdef01234567'
- }
-}
-
-function beforeCreate (video: VideoInstance, options: { transaction: Sequelize.Transaction }) {
- if (video.isOwned()) {
- const videoPath = join(CONFIG.STORAGE.VIDEOS_DIR, video.getVideoFilename())
- const tasks = []
-
- tasks.push(
- createTorrentFromVideo(video, videoPath),
- createThumbnail(video, videoPath),
- createPreview(video, videoPath)
- )
+// ------------------------------ METHODS ------------------------------
- if (CONFIG.TRANSCODING.ENABLED === true) {
- // Put uuid because we don't have id auto incremented for now
- const dataInput = {
- videoUUID: video.uuid
- }
+function associate (models) {
+ Video.belongsTo(models.Author, {
+ foreignKey: {
+ name: 'authorId',
+ allowNull: false
+ },
+ onDelete: 'cascade'
+ })
- tasks.push(
- JobScheduler.Instance.createJob(options.transaction, 'videoTranscoder', dataInput)
- )
- }
+ Video.belongsToMany(models.Tag, {
+ foreignKey: 'videoId',
+ through: models.VideoTag,
+ onDelete: 'cascade'
+ })
- return Promise.all(tasks)
- }
+ Video.hasMany(models.VideoAbuse, {
+ foreignKey: {
+ name: 'videoId',
+ allowNull: false
+ },
+ onDelete: 'cascade'
+ })
- return Promise.resolve()
+ Video.hasMany(models.VideoFile, {
+ foreignKey: {
+ name: 'videoId',
+ allowNull: false
+ },
+ onDelete: 'cascade'
+ })
}
-function afterDestroy (video: VideoInstance) {
+function afterDestroy (video: VideoInstance, options: { transaction: Sequelize.Transaction }) {
const tasks = []
tasks.push(
- removeThumbnail(video)
+ video.removeThumbnail()
)
if (video.isOwned()) {
}
tasks.push(
- removeFile(video),
- removeTorrent(video),
- removePreview(video),
- removeVideoToFriends(removeVideoToFriendsParams)
+ video.removePreview(),
+ removeVideoToFriends(removeVideoToFriendsParams, options.transaction)
)
+
+ // Remove physical files and torrents
+ video.VideoFiles.forEach(file => {
+ video.removeFile(file),
+ video.removeTorrent(file)
+ })
}
return Promise.all(tasks)
}
-// ------------------------------ METHODS ------------------------------
+getOriginalFile = function (this: VideoInstance) {
+ if (Array.isArray(this.VideoFiles) === false) return undefined
-function associate (models) {
- Video.belongsTo(models.Author, {
- foreignKey: {
- name: 'authorId',
- allowNull: false
- },
- onDelete: 'cascade'
- })
+ // The original file is the file that have the higher resolution
+ return maxBy(this.VideoFiles, file => file.resolution)
+}
- Video.belongsToMany(models.Tag, {
- foreignKey: 'videoId',
- through: models.VideoTag,
- onDelete: 'cascade'
- })
+getVideoFilename = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ return this.uuid + '-' + videoFile.resolution + videoFile.extname
+}
- Video.hasMany(models.VideoAbuse, {
- foreignKey: {
- name: 'videoId',
- allowNull: false
- },
- onDelete: 'cascade'
- })
+getThumbnailName = function (this: VideoInstance) {
+ // We always have a copy of the thumbnail
+ const extension = '.jpg'
+ return this.uuid + extension
+}
+
+getPreviewName = function (this: VideoInstance) {
+ const extension = '.jpg'
+ return this.uuid + extension
+}
+
+getTorrentFileName = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ const extension = '.torrent'
+ return this.uuid + '-' + videoFile.resolution + extension
+}
+
+isOwned = function (this: VideoInstance) {
+ return this.remote === false
+}
+
+createPreview = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ return generateImageFromVideoFile(
+ this.getVideoFilePath(videoFile),
+ CONFIG.STORAGE.PREVIEWS_DIR,
+ this.getPreviewName()
+ )
+}
+
+createThumbnail = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ const imageSize = THUMBNAILS_SIZE.width + 'x' + THUMBNAILS_SIZE.height
+
+ return generateImageFromVideoFile(
+ this.getVideoFilePath(videoFile),
+ CONFIG.STORAGE.THUMBNAILS_DIR,
+ this.getThumbnailName(),
+ imageSize
+ )
+}
+
+getVideoFilePath = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ return join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile))
+}
+
+createTorrentAndSetInfoHash = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ const options = {
+ announceList: [
+ [ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ]
+ ],
+ urlList: [
+ CONFIG.WEBSERVER.URL + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile)
+ ]
+ }
+
+ return createTorrentPromise(this.getVideoFilePath(videoFile), options)
+ .then(torrent => {
+ const filePath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile))
+ logger.info('Creating torrent %s.', filePath)
+
+ return writeFilePromise(filePath, torrent).then(() => torrent)
+ })
+ .then(torrent => {
+ const parsedTorrent = parseTorrent(torrent)
+
+ videoFile.infoHash = parsedTorrent.infoHash
+ })
}
-generateMagnetUri = function (this: VideoInstance) {
+generateMagnetUri = function (this: VideoInstance, videoFile: VideoFileInstance) {
let baseUrlHttp
let baseUrlWs
baseUrlWs = REMOTE_SCHEME.WS + '://' + this.Author.Pod.host
}
- const xs = baseUrlHttp + STATIC_PATHS.TORRENTS + this.getTorrentName()
+ const xs = baseUrlHttp + STATIC_PATHS.TORRENTS + this.getTorrentFileName(videoFile)
const announce = [ baseUrlWs + '/tracker/socket' ]
- const urlList = [ baseUrlHttp + STATIC_PATHS.WEBSEED + this.getVideoFilename() ]
+ const urlList = [ baseUrlHttp + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile) ]
const magnetHash = {
xs,
announce,
urlList,
- infoHash: this.infoHash,
+ infoHash: videoFile.infoHash,
name: this.name
}
return magnetUtil.encode(magnetHash)
}
-getVideoFilename = function (this: VideoInstance) {
- return this.uuid + this.extname
+getEmbedPath = function (this: VideoInstance) {
+ return '/videos/embed/' + this.uuid
}
-getThumbnailName = function (this: VideoInstance) {
- // We always have a copy of the thumbnail
- const extension = '.jpg'
- return this.uuid + extension
+getThumbnailPath = function (this: VideoInstance) {
+ return join(STATIC_PATHS.THUMBNAILS, this.getThumbnailName())
}
-getPreviewName = function (this: VideoInstance) {
- const extension = '.jpg'
- return this.uuid + extension
-}
-
-getTorrentName = function (this: VideoInstance) {
- const extension = '.torrent'
- return this.uuid + extension
-}
-
-isOwned = function (this: VideoInstance) {
- return this.remote === false
+getPreviewPath = function (this: VideoInstance) {
+ return join(STATIC_PATHS.PREVIEWS, this.getPreviewName())
}
-toFormatedJSON = function (this: VideoInstance) {
+toFormattedJSON = function (this: VideoInstance) {
let podHost
if (this.Author.Pod) {
description: this.description,
podHost,
isLocal: this.isOwned(),
- magnetUri: this.generateMagnetUri(),
author: this.Author.name,
duration: this.duration,
views: this.views,
likes: this.likes,
dislikes: this.dislikes,
tags: map<TagInstance, string>(this.Tags, 'name'),
- thumbnailPath: join(STATIC_PATHS.THUMBNAILS, this.getThumbnailName()),
- previewPath: join(STATIC_PATHS.PREVIEWS, this.getPreviewName()),
+ thumbnailPath: this.getThumbnailPath(),
+ previewPath: this.getPreviewPath(),
+ embedPath: this.getEmbedPath(),
createdAt: this.createdAt,
- updatedAt: this.updatedAt
+ updatedAt: this.updatedAt,
+ files: []
}
+ // Format and sort video files
+ json.files = this.VideoFiles
+ .map(videoFile => {
+ let resolutionLabel = videoFile.resolution + 'p'
+
+ const videoFileJson = {
+ resolution: videoFile.resolution,
+ resolutionLabel,
+ magnetUri: this.generateMagnetUri(videoFile),
+ size: videoFile.size
+ }
+
+ return videoFileJson
+ })
+ .sort((a, b) => {
+ if (a.resolution < b.resolution) return 1
+ if (a.resolution === b.resolution) return 0
+ return -1
+ })
+
return json
}
language: this.language,
nsfw: this.nsfw,
description: this.description,
- infoHash: this.infoHash,
author: this.Author.name,
duration: this.duration,
thumbnailData: thumbnailData.toString('binary'),
tags: map<TagInstance, string>(this.Tags, 'name'),
createdAt: this.createdAt,
updatedAt: this.updatedAt,
- extname: this.extname,
views: this.views,
likes: this.likes,
- dislikes: this.dislikes
+ dislikes: this.dislikes,
+ files: []
}
+ this.VideoFiles.forEach(videoFile => {
+ remoteVideo.files.push({
+ infoHash: videoFile.infoHash,
+ resolution: videoFile.resolution,
+ extname: videoFile.extname,
+ size: videoFile.size
+ })
+ })
+
return remoteVideo
})
}
language: this.language,
nsfw: this.nsfw,
description: this.description,
- infoHash: this.infoHash,
author: this.Author.name,
duration: this.duration,
tags: map<TagInstance, string>(this.Tags, 'name'),
createdAt: this.createdAt,
updatedAt: this.updatedAt,
- extname: this.extname,
views: this.views,
likes: this.likes,
- dislikes: this.dislikes
+ dislikes: this.dislikes,
+ files: []
}
+ this.VideoFiles.forEach(videoFile => {
+ json.files.push({
+ infoHash: videoFile.infoHash,
+ resolution: videoFile.resolution,
+ extname: videoFile.extname,
+ size: videoFile.size
+ })
+ })
+
return json
}
-transcodeVideofile = function (this: VideoInstance) {
- const video = this
-
+optimizeOriginalVideofile = function (this: VideoInstance) {
const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
const newExtname = '.mp4'
- const videoInputPath = join(videosDirectory, video.getVideoFilename())
- const videoOutputPath = join(videosDirectory, video.id + '-transcoded' + newExtname)
-
- return new Promise<void>((res, rej) => {
- ffmpeg(videoInputPath)
- .output(videoOutputPath)
- .videoCodec('libx264')
- .outputOption('-threads ' + CONFIG.TRANSCODING.THREADS)
- .outputOption('-movflags faststart')
- .on('error', rej)
- .on('end', () => {
-
- return unlinkPromise(videoInputPath)
- .then(() => {
- // Important to do this before getVideoFilename() to take in account the new file extension
- video.set('extname', newExtname)
-
- const newVideoPath = join(videosDirectory, video.getVideoFilename())
- return renamePromise(videoOutputPath, newVideoPath)
- })
- .then(() => {
- const newVideoPath = join(videosDirectory, video.getVideoFilename())
- return createTorrentFromVideo(video, newVideoPath)
- })
- .then(() => {
- return video.save()
- })
- .then(() => {
- return res()
- })
- .catch(err => {
- // Autodesctruction...
- video.destroy().catch(err => logger.error('Cannot destruct video after transcoding failure.', err))
-
- return rej(err)
- })
- })
- .run()
+ const inputVideoFile = this.getOriginalFile()
+ const videoInputPath = join(videosDirectory, this.getVideoFilename(inputVideoFile))
+ const videoOutputPath = join(videosDirectory, this.id + '-transcoded' + newExtname)
+
+ const transcodeOptions = {
+ inputPath: videoInputPath,
+ outputPath: videoOutputPath
+ }
+
+ return transcode(transcodeOptions)
+ .then(() => {
+ return unlinkPromise(videoInputPath)
+ })
+ .then(() => {
+ // Important to do this before getVideoFilename() to take in account the new file extension
+ inputVideoFile.set('extname', newExtname)
+
+ return renamePromise(videoOutputPath, this.getVideoFilePath(inputVideoFile))
+ })
+ .then(() => {
+ return statPromise(this.getVideoFilePath(inputVideoFile))
+ })
+ .then(stats => {
+ return inputVideoFile.set('size', stats.size)
+ })
+ .then(() => {
+ return this.createTorrentAndSetInfoHash(inputVideoFile)
+ })
+ .then(() => {
+ return inputVideoFile.save()
+ })
+ .then(() => {
+ return undefined
+ })
+ .catch(err => {
+ // Auto destruction...
+ this.destroy().catch(err => logger.error('Cannot destruct video after transcoding failure.', err))
+
+ throw err
+ })
+}
+
+transcodeOriginalVideofile = function (this: VideoInstance, resolution: VideoResolution) {
+ const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
+ const extname = '.mp4'
+
+ // We are sure it's x264 in mp4 because optimizeOriginalVideofile was already executed
+ const videoInputPath = join(videosDirectory, this.getVideoFilename(this.getOriginalFile()))
+
+ const newVideoFile = (Video['sequelize'].models.VideoFile as VideoFileModel).build({
+ resolution,
+ extname,
+ size: 0,
+ videoId: this.id
})
+ const videoOutputPath = join(videosDirectory, this.getVideoFilename(newVideoFile))
+
+ const transcodeOptions = {
+ inputPath: videoInputPath,
+ outputPath: videoOutputPath,
+ resolution
+ }
+ return transcode(transcodeOptions)
+ .then(() => {
+ return statPromise(videoOutputPath)
+ })
+ .then(stats => {
+ newVideoFile.set('size', stats.size)
+
+ return undefined
+ })
+ .then(() => {
+ return this.createTorrentAndSetInfoHash(newVideoFile)
+ })
+ .then(() => {
+ return newVideoFile.save()
+ })
+ .then(() => {
+ return this.VideoFiles.push(newVideoFile)
+ })
+ .then(() => undefined)
+}
+
+getOriginalFileHeight = function (this: VideoInstance) {
+ const originalFilePath = this.getVideoFilePath(this.getOriginalFile())
+
+ return getVideoFileHeight(originalFilePath)
+}
+
+removeThumbnail = function (this: VideoInstance) {
+ const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName())
+ return unlinkPromise(thumbnailPath)
+}
+
+removePreview = function (this: VideoInstance) {
+ // Same name than video thumbnail
+ return unlinkPromise(CONFIG.STORAGE.PREVIEWS_DIR + this.getPreviewName())
+}
+
+removeFile = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ const filePath = join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile))
+ return unlinkPromise(filePath)
+}
+
+removeTorrent = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ const torrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile))
+ return unlinkPromise(torrentPath)
}
// ------------------------------ STATICS ------------------------------
})
}
-getDurationFromFile = function (videoPath: string) {
- return new Promise<number>((res, rej) => {
- ffmpeg.ffprobe(videoPath, (err, metadata) => {
- if (err) return rej(err)
-
- return res(Math.floor(metadata.format.duration))
- })
- })
-}
-
list = function () {
- return Video.findAll()
+ const query = {
+ include: [ Video['sequelize'].models.VideoFile ]
+ }
+
+ return Video.findAll(query)
}
listForApi = function (start: number, count: number, sort: string) {
- // Exclude Blakclisted videos from the list
+ // Exclude blacklisted videos from the list
const query = {
distinct: true,
offset: start,
model: Video['sequelize'].models.Author,
include: [ { model: Video['sequelize'].models.Pod, required: false } ]
},
-
- Video['sequelize'].models.Tag
+ Video['sequelize'].models.Tag,
+ Video['sequelize'].models.VideoFile
],
where: createBaseVideosWhere()
}
uuid
},
include: [
+ {
+ model: Video['sequelize'].models.VideoFile
+ },
{
model: Video['sequelize'].models.Author,
include: [
where: {
remote: false
},
- include: [ Video['sequelize'].models.Author, Video['sequelize'].models.Tag ]
+ include: [
+ Video['sequelize'].models.VideoFile,
+ Video['sequelize'].models.Author,
+ Video['sequelize'].models.Tag
+ ]
}
return Video.findAll(query)
remote: false
},
include: [
+ {
+ model: Video['sequelize'].models.VideoFile
+ },
{
model: Video['sequelize'].models.Author,
where: {
const query = {
where: {
uuid
- }
+ },
+ include: [ Video['sequelize'].models.VideoFile ]
}
return Video.findOne(query)
}
loadAndPopulateAuthor = function (id: number) {
const options = {
- include: [ Video['sequelize'].models.Author ]
+ include: [ Video['sequelize'].models.VideoFile, Video['sequelize'].models.Author ]
}
return Video.findById(id, options)
model: Video['sequelize'].models.Author,
include: [ { model: Video['sequelize'].models.Pod, required: false } ]
},
- Video['sequelize'].models.Tag
+ Video['sequelize'].models.Tag,
+ Video['sequelize'].models.VideoFile
]
}
model: Video['sequelize'].models.Author,
include: [ { model: Video['sequelize'].models.Pod, required: false } ]
},
- Video['sequelize'].models.Tag
+ Video['sequelize'].models.Tag,
+ Video['sequelize'].models.VideoFile
]
}
model: Video['sequelize'].models.Tag
}
- const query: Sequelize.FindOptions = {
+ const videoFileInclude: Sequelize.IncludeOptions = {
+ model: Video['sequelize'].models.VideoFile
+ }
+
+ const query: Sequelize.FindOptions<VideoAttributes> = {
distinct: true,
where: createBaseVideosWhere(),
offset: start,
// Make an exact search with the magnet
if (field === 'magnetUri') {
- const infoHash = magnetUtil.decode(value).infoHash
- query.where['infoHash'] = infoHash
+ videoFileInclude.where = {
+ infoHash: magnetUtil.decode(value).infoHash
+ }
} else if (field === 'tags') {
const escapedValue = Video['sequelize'].escape('%' + value + '%')
query.where['id'].$in = Video['sequelize'].literal(
}
query.include = [
- authorInclude, tagInclude
+ authorInclude, tagInclude, videoFileInclude
]
return Video.findAndCountAll(query).then(({ rows, count }) => {
}
}
}
-
-function removeThumbnail (video: VideoInstance) {
- const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName())
- return unlinkPromise(thumbnailPath)
-}
-
-function removeFile (video: VideoInstance) {
- const filePath = join(CONFIG.STORAGE.VIDEOS_DIR, video.getVideoFilename())
- return unlinkPromise(filePath)
-}
-
-function removeTorrent (video: VideoInstance) {
- const torrenPath = join(CONFIG.STORAGE.TORRENTS_DIR, video.getTorrentName())
- return unlinkPromise(torrenPath)
-}
-
-function removePreview (video: VideoInstance) {
- // Same name than video thumnail
- return unlinkPromise(CONFIG.STORAGE.PREVIEWS_DIR + video.getPreviewName())
-}
-
-function createTorrentFromVideo (video: VideoInstance, videoPath: string) {
- const options = {
- announceList: [
- [ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ]
- ],
- urlList: [
- CONFIG.WEBSERVER.URL + STATIC_PATHS.WEBSEED + video.getVideoFilename()
- ]
- }
-
- return createTorrentPromise(videoPath, options)
- .then(torrent => {
- const filePath = join(CONFIG.STORAGE.TORRENTS_DIR, video.getTorrentName())
- return writeFilePromise(filePath, torrent).then(() => torrent)
- })
- .then(torrent => {
- const parsedTorrent = parseTorrent(torrent)
- video.set('infoHash', parsedTorrent.infoHash)
- return video.validate()
- })
-}
-
-function createPreview (video: VideoInstance, videoPath: string) {
- return generateImage(video, videoPath, CONFIG.STORAGE.PREVIEWS_DIR, video.getPreviewName(), null)
-}
-
-function createThumbnail (video: VideoInstance, videoPath: string) {
- return generateImage(video, videoPath, CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName(), THUMBNAILS_SIZE)
-}
-
-function generateImage (video: VideoInstance, videoPath: string, folder: string, imageName: string, size: string) {
- const options = {
- filename: imageName,
- count: 1,
- folder
- }
-
- if (size) {
- options['size'] = size
- }
-
- return new Promise<string>((res, rej) => {
- ffmpeg(videoPath)
- .on('error', rej)
- .on('end', () => res(imageName))
- .thumbnail(options)
- })
-}
-
-function removeFromBlacklist (video: VideoInstance) {
- // Find the blacklisted video
- return db.BlacklistedVideo.loadByVideoId(video.id).then(video => {
- // Not found the video, skip
- if (!video) {
- return null
- }
-
- // If we found the video, remove it from the blacklist
- return video.destroy()
- })
-}
projects / github / Chocobozzz / PeerTube.git / blobdiff