import * as safeBuffer from 'safe-buffer'
const Buffer = safeBuffer.Buffer
-import * as createTorrent from 'create-torrent'
import * as ffmpeg from 'fluent-ffmpeg'
-import * as fs from 'fs'
import * as magnetUtil from 'magnet-uri'
-import { map, values } from 'lodash'
-import { parallel, series } from 'async'
+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 { database as db } from '../../initializers/database'
-import { VideoTagInstance } from './video-tag-interface'
+import { TagInstance } from './tag-interface'
import {
logger,
isVideoNameValid,
isVideoLanguageValid,
isVideoNSFWValid,
isVideoDescriptionValid,
- isVideoInfoHashValid,
- isVideoDurationValid
+ isVideoDurationValid,
+ readFileBufferPromise,
+ unlinkPromise,
+ renamePromise,
+ writeFilePromise,
+ createTorrentPromise
} from '../../helpers'
import {
- CONSTRAINTS_FIELDS,
CONFIG,
REMOTE_SCHEME,
STATIC_PATHS,
VIDEO_CATEGORIES,
VIDEO_LICENCES,
VIDEO_LANGUAGES,
- THUMBNAILS_SIZE
+ THUMBNAILS_SIZE,
+ VIDEO_FILE_RESOLUTIONS
} from '../../initializers'
-import { JobScheduler, removeVideoToFriends } from '../../lib'
+import { removeVideoToFriends } from '../../lib'
+import { VideoFileInstance } from './video-file-interface'
import { addMethodsToModel, getSort } from '../utils'
import {
- VideoClass,
VideoInstance,
VideoAttributes,
let getVideoFilename: VideoMethods.GetVideoFilename
let getThumbnailName: VideoMethods.GetThumbnailName
let getPreviewName: VideoMethods.GetPreviewName
-let getTorrentName: VideoMethods.GetTorrentName
+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 createPreview: VideoMethods.CreatePreview
+let createThumbnail: VideoMethods.CreateThumbnail
+let getVideoFilePath: VideoMethods.GetVideoFilePath
+let createTorrentAndSetInfoHash: VideoMethods.CreateTorrentAndSetInfoHash
let generateThumbnailFromData: VideoMethods.GenerateThumbnailFromData
let getDurationFromFile: VideoMethods.GetDurationFromFile
let list: VideoMethods.List
let listForApi: VideoMethods.ListForApi
-let loadByHostAndRemoteId: VideoMethods.LoadByHostAndRemoteId
+let loadByHostAndUUID: VideoMethods.LoadByHostAndUUID
let listOwnedAndPopulateAuthorAndTags: VideoMethods.ListOwnedAndPopulateAuthorAndTags
let listOwnedByAuthor: VideoMethods.ListOwnedByAuthor
let load: VideoMethods.Load
+let loadByUUID: VideoMethods.LoadByUUID
let loadAndPopulateAuthor: VideoMethods.LoadAndPopulateAuthor
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',
{
- id: {
+ uuid: {
type: DataTypes.UUID,
defaultValue: DataTypes.UUIDV4,
- primaryKey: true,
+ allowNull: false,
validate: {
isUUID: 4
}
type: DataTypes.STRING,
allowNull: false,
validate: {
- nameValid: function (value) {
+ nameValid: value => {
const res = isVideoNameValid(value)
if (res === false) throw new Error('Video name is not valid.')
}
}
},
- extname: {
- type: DataTypes.ENUM(values(CONSTRAINTS_FIELDS.VIDEOS.EXTNAME)),
- allowNull: false
- },
- remoteId: {
- type: DataTypes.UUID,
- allowNull: true,
- validate: {
- isUUID: 4
- }
- },
category: {
type: DataTypes.INTEGER,
allowNull: false,
validate: {
- categoryValid: function (value) {
+ categoryValid: value => {
const res = isVideoCategoryValid(value)
if (res === false) throw new Error('Video category is not valid.')
}
allowNull: false,
defaultValue: null,
validate: {
- licenceValid: function (value) {
+ licenceValid: value => {
const res = isVideoLicenceValid(value)
if (res === false) throw new Error('Video licence is not valid.')
}
type: DataTypes.INTEGER,
allowNull: true,
validate: {
- languageValid: function (value) {
+ languageValid: value => {
const res = isVideoLanguageValid(value)
if (res === false) throw new Error('Video language is not valid.')
}
type: DataTypes.BOOLEAN,
allowNull: false,
validate: {
- nsfwValid: function (value) {
+ nsfwValid: value => {
const res = isVideoNSFWValid(value)
if (res === false) throw new Error('Video nsfw attribute is not valid.')
}
type: DataTypes.STRING,
allowNull: false,
validate: {
- descriptionValid: function (value) {
+ descriptionValid: value => {
const res = isVideoDescriptionValid(value)
if (res === false) throw new Error('Video description is not valid.')
}
}
},
- infoHash: {
- type: DataTypes.STRING,
- allowNull: false,
- validate: {
- infoHashValid: function (value) {
- const res = isVideoInfoHashValid(value)
- if (res === false) throw new Error('Video info hash is not valid.')
- }
- }
- },
duration: {
type: DataTypes.INTEGER,
allowNull: false,
validate: {
- durationValid: function (value) {
+ durationValid: value => {
const res = isVideoDurationValid(value)
if (res === false) throw new Error('Video duration is not valid.')
}
min: 0,
isInt: true
}
+ },
+ remote: {
+ type: DataTypes.BOOLEAN,
+ allowNull: false,
+ defaultValue: false
}
},
{
{
fields: [ 'authorId' ]
},
- {
- fields: [ 'remoteId' ]
- },
{
fields: [ 'name' ]
},
{
fields: [ 'duration' ]
},
- {
- fields: [ 'infoHash' ]
- },
{
fields: [ 'views' ]
},
{
fields: [ 'likes' ]
+ },
+ {
+ fields: [ 'uuid' ]
}
],
hooks: {
- beforeValidate,
- beforeCreate,
afterDestroy
}
}
listOwnedAndPopulateAuthorAndTags,
listOwnedByAuthor,
load,
- loadByHostAndRemoteId,
loadAndPopulateAuthor,
loadAndPopulateAuthorAndPodAndTags,
- searchAndPopulateAuthorAndPodAndTags,
- removeFromBlacklist
+ loadByHostAndUUID,
+ loadByUUID,
+ loadByUUIDAndPopulateAuthorAndPodAndTags,
+ searchAndPopulateAuthorAndPodAndTags
]
const instanceMethods = [
+ createPreview,
+ createThumbnail,
+ createTorrentAndSetInfoHash,
generateMagnetUri,
- getVideoFilename,
- getThumbnailName,
getPreviewName,
- getTorrentName,
+ getThumbnailName,
+ getTorrentFileName,
+ getVideoFilename,
+ getVideoFilePath,
isOwned,
- toFormatedJSON,
+ removeFile,
+ removePreview,
+ removeThumbnail,
+ removeTorrent,
toAddRemoteJSON,
+ toFormattedJSON,
toUpdateRemoteJSON,
- transcodeVideofile,
+ transcodeVideofile
]
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 }) {
- return new Promise(function (resolve, reject) {
- const tasks = []
-
- if (video.isOwned()) {
- const videoPath = join(CONFIG.STORAGE.VIDEOS_DIR, video.getVideoFilename())
-
- tasks.push(
- function createVideoTorrent (callback) {
- createTorrentFromVideo(video, videoPath, callback)
- },
-
- function createVideoThumbnail (callback) {
- createThumbnail(video, videoPath, callback)
- },
-
- function createVideoPreview (callback) {
- createPreview(video, videoPath, callback)
- }
- )
-
- if (CONFIG.TRANSCODING.ENABLED === true) {
- tasks.push(
- function createVideoTranscoderJob (callback) {
- const dataInput = {
- id: video.id
- }
-
- JobScheduler.Instance.createJob(options.transaction, 'videoTranscoder', dataInput, callback)
- }
- )
- }
-
- return parallel(tasks, function (err) {
- if (err) return reject(err)
-
- return resolve()
- })
- }
-
- return resolve()
- })
-}
-
-function afterDestroy (video: VideoInstance) {
- return new Promise(function (resolve, reject) {
- const tasks = []
-
- tasks.push(
- function (callback) {
- removeThumbnail(video, callback)
- }
- )
-
- if (video.isOwned()) {
- tasks.push(
- function removeVideoFile (callback) {
- removeFile(video, callback)
- },
-
- function removeVideoTorrent (callback) {
- removeTorrent(video, callback)
- },
-
- function removeVideoPreview (callback) {
- removePreview(video, callback)
- },
-
- function notifyFriends (callback) {
- const params = {
- remoteId: video.id
- }
-
- removeVideoToFriends(params)
-
- return callback()
- }
- )
- }
-
- parallel(tasks, function (err) {
- if (err) return reject(err)
-
- return resolve()
- })
- })
-}
-
// ------------------------------ METHODS ------------------------------
function associate (models) {
},
onDelete: 'cascade'
})
+
+ Video.hasMany(models.VideoFile, {
+ foreignKey: {
+ name: 'videoId',
+ allowNull: false
+ },
+ onDelete: 'cascade'
+ })
}
-generateMagnetUri = function (this: VideoInstance) {
- let baseUrlHttp
- let baseUrlWs
+function afterDestroy (video: VideoInstance) {
+ const tasks = []
- if (this.isOwned()) {
- baseUrlHttp = CONFIG.WEBSERVER.URL
- baseUrlWs = CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
- } else {
- baseUrlHttp = REMOTE_SCHEME.HTTP + '://' + this.Author.Pod.host
- baseUrlWs = REMOTE_SCHEME.WS + '://' + this.Author.Pod.host
- }
+ tasks.push(
+ video.removeThumbnail()
+ )
- const xs = baseUrlHttp + STATIC_PATHS.TORRENTS + this.getTorrentName()
- const announce = [ baseUrlWs + '/tracker/socket' ]
- const urlList = [ baseUrlHttp + STATIC_PATHS.WEBSEED + this.getVideoFilename() ]
+ if (video.isOwned()) {
+ const removeVideoToFriendsParams = {
+ uuid: video.uuid
+ }
- const magnetHash = {
- xs,
- announce,
- urlList,
- infoHash: this.infoHash,
- name: this.name
+ tasks.push(
+ video.removePreview(),
+ removeVideoToFriends(removeVideoToFriendsParams)
+ )
+
+ // TODO: check files is populated
+ video.VideoFiles.forEach(file => {
+ video.removeFile(file),
+ video.removeTorrent(file)
+ })
}
- return magnetUtil.encode(magnetHash)
+ return Promise.all(tasks)
}
-getVideoFilename = function (this: VideoInstance) {
- if (this.isOwned()) return this.id + this.extname
-
- return this.remoteId + this.extname
+getVideoFilename = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ // return this.uuid + '-' + VIDEO_FILE_RESOLUTIONS[videoFile.resolution] + videoFile.extname
+ return this.uuid + videoFile.extname
}
getThumbnailName = function (this: VideoInstance) {
// We always have a copy of the thumbnail
- return this.id + '.jpg'
+ const extension = '.jpg'
+ return this.uuid + extension
}
getPreviewName = function (this: VideoInstance) {
const extension = '.jpg'
+ return this.uuid + extension
+}
- if (this.isOwned()) return this.id + extension
+getTorrentFileName = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ const extension = '.torrent'
+ // return this.uuid + '-' + VIDEO_FILE_RESOLUTIONS[videoFile.resolution] + extension
+ return this.uuid + extension
+}
- return this.remoteId + extension
+isOwned = function (this: VideoInstance) {
+ return this.remote === false
}
-getTorrentName = function (this: VideoInstance) {
- const extension = '.torrent'
+createPreview = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ return generateImage(this, this.getVideoFilePath(videoFile), CONFIG.STORAGE.PREVIEWS_DIR, this.getPreviewName(), null)
+}
- if (this.isOwned()) return this.id + extension
+createThumbnail = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ return generateImage(this, this.getVideoFilePath(videoFile), CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName(), THUMBNAILS_SIZE)
+}
- return this.remoteId + extension
+getVideoFilePath = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ return join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile))
}
-isOwned = function (this: VideoInstance) {
- return this.remoteId === null
+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))
+ return writeFilePromise(filePath, torrent).then(() => torrent)
+ })
+ .then(torrent => {
+ const parsedTorrent = parseTorrent(torrent)
+
+ videoFile.infoHash = parsedTorrent.infoHash
+ })
+}
+
+generateMagnetUri = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ let baseUrlHttp
+ let baseUrlWs
+
+ if (this.isOwned()) {
+ baseUrlHttp = CONFIG.WEBSERVER.URL
+ baseUrlWs = CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
+ } else {
+ baseUrlHttp = REMOTE_SCHEME.HTTP + '://' + this.Author.Pod.host
+ baseUrlWs = REMOTE_SCHEME.WS + '://' + this.Author.Pod.host
+ }
+
+ const xs = baseUrlHttp + STATIC_PATHS.TORRENTS + this.getTorrentFileName(videoFile)
+ const announce = [ baseUrlWs + '/tracker/socket' ]
+ const urlList = [ baseUrlHttp + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile) ]
+
+ const magnetHash = {
+ xs,
+ announce,
+ urlList,
+ infoHash: videoFile.infoHash,
+ name: this.name
+ }
+
+ return magnetUtil.encode(magnetHash)
}
-toFormatedJSON = function (this: VideoInstance) {
+toFormattedJSON = function (this: VideoInstance) {
let podHost
if (this.Author.Pod) {
const json = {
id: this.id,
+ uuid: this.uuid,
name: this.name,
category: this.category,
categoryLabel,
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<VideoTagInstance, string>(this.Tags, 'name'),
+ tags: map<TagInstance, string>(this.Tags, 'name'),
thumbnailPath: join(STATIC_PATHS.THUMBNAILS, this.getThumbnailName()),
+ previewPath: join(STATIC_PATHS.PREVIEWS, this.getPreviewName()),
createdAt: this.createdAt,
- updatedAt: this.updatedAt
+ updatedAt: this.updatedAt,
+ files: []
}
+ this.VideoFiles.forEach(videoFile => {
+ let resolutionLabel = VIDEO_FILE_RESOLUTIONS[videoFile.resolution]
+ if (!resolutionLabel) resolutionLabel = 'Unknown'
+
+ const videoFileJson = {
+ resolution: videoFile.resolution,
+ resolutionLabel,
+ magnetUri: this.generateMagnetUri(videoFile),
+ size: videoFile.size
+ }
+
+ json.files.push(videoFileJson)
+ })
+
return json
}
-toAddRemoteJSON = function (this: VideoInstance, callback: VideoMethods.ToAddRemoteJSONCallback) {
+toAddRemoteJSON = function (this: VideoInstance) {
// Get thumbnail data to send to the other pod
const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName())
- fs.readFile(thumbnailPath, (err, thumbnailData) => {
- if (err) {
- logger.error('Cannot read the thumbnail of the video')
- return callback(err)
- }
+ return readFileBufferPromise(thumbnailPath).then(thumbnailData => {
const remoteVideo = {
+ uuid: this.uuid,
name: this.name,
category: this.category,
licence: this.licence,
language: this.language,
nsfw: this.nsfw,
description: this.description,
- infoHash: this.infoHash,
- remoteId: this.id,
author: this.Author.name,
duration: this.duration,
thumbnailData: thumbnailData.toString('binary'),
- tags: map<VideoTagInstance, string>(this.Tags, 'name'),
+ 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: []
}
- return callback(null, remoteVideo)
+ this.VideoFiles.forEach(videoFile => {
+ remoteVideo.files.push({
+ infoHash: videoFile.infoHash,
+ resolution: videoFile.resolution,
+ extname: videoFile.extname,
+ size: videoFile.size
+ })
+ })
+
+ return remoteVideo
})
}
toUpdateRemoteJSON = function (this: VideoInstance) {
const json = {
+ uuid: this.uuid,
name: this.name,
category: this.category,
licence: this.licence,
language: this.language,
nsfw: this.nsfw,
description: this.description,
- infoHash: this.infoHash,
- remoteId: this.id,
author: this.Author.name,
duration: this.duration,
- tags: map<VideoTagInstance, string>(this.Tags, 'name'),
+ 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, finalCallback: VideoMethods.TranscodeVideofileCallback) {
- const video = this
-
+transcodeVideofile = function (this: VideoInstance, inputVideoFile: VideoFileInstance) {
const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
const newExtname = '.mp4'
- const videoInputPath = join(videosDirectory, video.getVideoFilename())
- const videoOutputPath = join(videosDirectory, video.id + '-transcoded' + newExtname)
-
- ffmpeg(videoInputPath)
- .output(videoOutputPath)
- .videoCodec('libx264')
- .outputOption('-threads ' + CONFIG.TRANSCODING.THREADS)
- .outputOption('-movflags faststart')
- .on('error', finalCallback)
- .on('end', function () {
- series([
- function removeOldFile (callback) {
- fs.unlink(videoInputPath, callback)
- },
-
- function moveNewFile (callback) {
- // Important to do this before getVideoFilename() to take in account the new file extension
- video.set('extname', newExtname)
-
- const newVideoPath = join(videosDirectory, video.getVideoFilename())
- fs.rename(videoOutputPath, newVideoPath, callback)
- },
+ const videoInputPath = join(videosDirectory, this.getVideoFilename(inputVideoFile))
+ const videoOutputPath = join(videosDirectory, this.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
+ inputVideoFile.set('extname', newExtname)
+
+ return renamePromise(videoOutputPath, this.getVideoFilePath(inputVideoFile))
+ })
+ .then(() => {
+ return this.createTorrentAndSetInfoHash(inputVideoFile)
+ })
+ .then(() => {
+ return inputVideoFile.save()
+ })
+ .then(() => {
+ return res()
+ })
+ .catch(err => {
+ // Autodestruction...
+ this.destroy().catch(err => logger.error('Cannot destruct video after transcoding failure.', err))
- function torrent (callback) {
- const newVideoPath = join(videosDirectory, video.getVideoFilename())
- createTorrentFromVideo(video, newVideoPath, callback)
- },
+ return rej(err)
+ })
+ })
+ .run()
+ })
+}
- function videoExtension (callback) {
- video.save().asCallback(callback)
- }
+removeThumbnail = function (this: VideoInstance) {
+ const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName())
+ return unlinkPromise(thumbnailPath)
+}
- ], function (err: Error) {
- if (err) {
- // Autodesctruction...
- video.destroy().asCallback(function (err) {
- if (err) logger.error('Cannot destruct video after transcoding failure.', { error: err })
- })
+removePreview = function (this: VideoInstance) {
+ // Same name than video thumbnail
+ return unlinkPromise(CONFIG.STORAGE.PREVIEWS_DIR + this.getPreviewName())
+}
- return finalCallback(err)
- }
+removeFile = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ const filePath = join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile))
+ return unlinkPromise(filePath)
+}
- return finalCallback(null)
- })
- })
- .run()
+removeTorrent = function (this: VideoInstance, videoFile: VideoFileInstance) {
+ const torrenPath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile))
+ return unlinkPromise(torrenPath)
}
// ------------------------------ STATICS ------------------------------
-generateThumbnailFromData = function (video: VideoInstance, thumbnailData: string, callback: VideoMethods.GenerateThumbnailFromDataCallback) {
+generateThumbnailFromData = function (video: VideoInstance, thumbnailData: string) {
// Creating the thumbnail for a remote video
const thumbnailName = video.getThumbnailName()
const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, thumbnailName)
- fs.writeFile(thumbnailPath, Buffer.from(thumbnailData, 'binary'), function (err) {
- if (err) return callback(err)
-
- return callback(null, thumbnailName)
+ return writeFilePromise(thumbnailPath, Buffer.from(thumbnailData, 'binary')).then(() => {
+ return thumbnailName
})
}
-getDurationFromFile = function (videoPath: string, callback: VideoMethods.GetDurationFromFileCallback) {
- ffmpeg.ffprobe(videoPath, function (err, metadata) {
- if (err) return callback(err)
+getDurationFromFile = function (videoPath: string) {
+ return new Promise<number>((res, rej) => {
+ ffmpeg.ffprobe(videoPath, (err, metadata) => {
+ if (err) return rej(err)
- return callback(null, Math.floor(metadata.format.duration))
+ return res(Math.floor(metadata.format.duration))
+ })
})
}
-list = function (callback: VideoMethods.ListCallback) {
- return Video.findAll().asCallback(callback)
+list = function () {
+ const query = {
+ include: [ Video['sequelize'].models.VideoFile ]
+ }
+
+ return Video.findAll(query)
}
-listForApi = function (start: number, count: number, sort: string, callback: VideoMethods.ListForApiCallback) {
+listForApi = function (start: number, count: number, sort: string) {
// Exclude Blakclisted videos from the list
const query = {
distinct: true,
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()
}
- return Video.findAndCountAll(query).asCallback(function (err, result) {
- if (err) return callback(err)
-
- return callback(null, result.rows, result.count)
+ return Video.findAndCountAll(query).then(({ rows, count }) => {
+ return {
+ data: rows,
+ total: count
+ }
})
}
-loadByHostAndRemoteId = function (fromHost: string, remoteId: string, callback: VideoMethods.LoadByHostAndRemoteIdCallback) {
+loadByHostAndUUID = function (fromHost: string, uuid: string) {
const query = {
where: {
- remoteId: remoteId
+ uuid
},
include: [
+ {
+ model: Video['sequelize'].models.VideoFile
+ },
{
model: Video['sequelize'].models.Author,
include: [
]
}
- return Video.findOne(query).asCallback(callback)
+ return Video.findOne(query)
}
-listOwnedAndPopulateAuthorAndTags = function (callback: VideoMethods.ListOwnedAndPopulateAuthorAndTagsCallback) {
- // If remoteId is null this is *our* video
+listOwnedAndPopulateAuthorAndTags = function () {
const query = {
where: {
- remoteId: null
+ 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).asCallback(callback)
+ return Video.findAll(query)
}
-listOwnedByAuthor = function (author: string, callback: VideoMethods.ListOwnedByAuthorCallback) {
+listOwnedByAuthor = function (author: string) {
const query = {
where: {
- remoteId: null
+ remote: false
},
include: [
+ {
+ model: Video['sequelize'].models.VideoFile
+ },
{
model: Video['sequelize'].models.Author,
where: {
]
}
- return Video.findAll(query).asCallback(callback)
+ return Video.findAll(query)
}
-load = function (id: string, callback: VideoMethods.LoadCallback) {
- return Video.findById(id).asCallback(callback)
+load = function (id: number) {
+ return Video.findById(id)
}
-loadAndPopulateAuthor = function (id: string, callback: VideoMethods.LoadAndPopulateAuthorCallback) {
+loadByUUID = function (uuid: string) {
+ 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).asCallback(callback)
+ return Video.findById(id, options)
}
-loadAndPopulateAuthorAndPodAndTags = function (id: string, callback: VideoMethods.LoadAndPopulateAuthorAndPodAndTagsCallback) {
+loadAndPopulateAuthorAndPodAndTags = function (id: number) {
const options = {
include: [
{
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
]
}
- return Video.findById(id, options).asCallback(callback)
+ return Video.findById(id, options)
}
-searchAndPopulateAuthorAndPodAndTags = function (
- value: string,
- field: string,
- start: number,
- count: number,
- sort: string,
- callback: VideoMethods.SearchAndPopulateAuthorAndPodAndTagsCallback
-) {
- const podInclude: any = {
+loadByUUIDAndPopulateAuthorAndPodAndTags = function (uuid: string) {
+ const options = {
+ where: {
+ uuid
+ },
+ include: [
+ {
+ model: Video['sequelize'].models.Author,
+ include: [ { model: Video['sequelize'].models.Pod, required: false } ]
+ },
+ Video['sequelize'].models.Tag,
+ Video['sequelize'].models.VideoFile
+ ]
+ }
+
+ return Video.findOne(options)
+}
+
+searchAndPopulateAuthorAndPodAndTags = function (value: string, field: string, start: number, count: number, sort: string) {
+ const podInclude: Sequelize.IncludeOptions = {
model: Video['sequelize'].models.Pod,
required: false
}
- const authorInclude: any = {
+ const authorInclude: Sequelize.IncludeOptions = {
model: Video['sequelize'].models.Author,
include: [
podInclude
]
}
- const tagInclude: any = {
+ const tagInclude: Sequelize.IncludeOptions = {
model: Video['sequelize'].models.Tag
}
- const query: any = {
+ const videoFileInclude: Sequelize.IncludeOptions = {
+ model: Video['sequelize'].models.VideoFile
+ }
+
+ const query: Sequelize.FindOptions = {
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(
- '(SELECT "VideoTags"."videoId" FROM "Tags" INNER JOIN "VideoTags" ON "Tags"."id" = "VideoTags"."tagId" WHERE name LIKE ' + escapedValue + ')'
+ query.where['id'].$in = Video['sequelize'].literal(
+ `(SELECT "VideoTags"."videoId"
+ FROM "Tags"
+ INNER JOIN "VideoTags" ON "Tags"."id" = "VideoTags"."tagId"
+ WHERE name ILIKE ${escapedValue}
+ )`
)
} else if (field === 'host') {
// FIXME: Include our pod? (not stored in the database)
podInclude.where = {
host: {
- $like: '%' + value + '%'
+ $iLike: '%' + value + '%'
}
}
podInclude.required = true
} else if (field === 'author') {
authorInclude.where = {
name: {
- $like: '%' + value + '%'
+ $iLike: '%' + value + '%'
}
}
// authorInclude.or = true
} else {
query.where[field] = {
- $like: '%' + value + '%'
+ $iLike: '%' + value + '%'
}
}
query.include = [
- authorInclude, tagInclude
+ authorInclude, tagInclude, videoFileInclude
]
- if (tagInclude.where) {
- // query.include.push([ Video['sequelize'].models.Tag ])
- }
-
- return Video.findAndCountAll(query).asCallback(function (err, result) {
- if (err) return callback(err)
-
- return callback(null, result.rows, result.count)
+ return Video.findAndCountAll(query).then(({ rows, count }) => {
+ return {
+ data: rows,
+ total: count
+ }
})
}
}
}
-function removeThumbnail (video: VideoInstance, callback: (err: Error) => void) {
- const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName())
- fs.unlink(thumbnailPath, callback)
-}
-
-function removeFile (video: VideoInstance, callback: (err: Error) => void) {
- const filePath = join(CONFIG.STORAGE.VIDEOS_DIR, video.getVideoFilename())
- fs.unlink(filePath, callback)
-}
-
-function removeTorrent (video: VideoInstance, callback: (err: Error) => void) {
- const torrenPath = join(CONFIG.STORAGE.TORRENTS_DIR, video.getTorrentName())
- fs.unlink(torrenPath, callback)
-}
-
-function removePreview (video: VideoInstance, callback: (err: Error) => void) {
- // Same name than video thumnail
- fs.unlink(CONFIG.STORAGE.PREVIEWS_DIR + video.getPreviewName(), callback)
-}
-
-function createTorrentFromVideo (video: VideoInstance, videoPath: string, callback: (err: Error) => void) {
+function generateImage (video: VideoInstance, videoPath: string, folder: string, imageName: string, size: string) {
const options = {
- announceList: [
- [ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ]
- ],
- urlList: [
- CONFIG.WEBSERVER.URL + STATIC_PATHS.WEBSEED + video.getVideoFilename()
- ]
- }
-
- createTorrent(videoPath, options, function (err, torrent) {
- if (err) return callback(err)
-
- const filePath = join(CONFIG.STORAGE.TORRENTS_DIR, video.getTorrentName())
- fs.writeFile(filePath, torrent, function (err) {
- if (err) return callback(err)
-
- const parsedTorrent = parseTorrent(torrent)
- video.set('infoHash', parsedTorrent.infoHash)
- video.validate().asCallback(callback)
- })
- })
-}
-
-function createPreview (video: VideoInstance, videoPath: string, callback: (err: Error) => void) {
- generateImage(video, videoPath, CONFIG.STORAGE.PREVIEWS_DIR, video.getPreviewName(), null, callback)
-}
-
-function createThumbnail (video: VideoInstance, videoPath: string, callback: (err: Error) => void) {
- generateImage(video, videoPath, CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName(), THUMBNAILS_SIZE, callback)
-}
-
-type GenerateImageCallback = (err: Error, imageName: string) => void
-function generateImage (video: VideoInstance, videoPath: string, folder: string, imageName: string, size: string, callback?: GenerateImageCallback) {
- const options: any = {
filename: imageName,
count: 1,
folder
}
if (size) {
- options.size = size
+ options['size'] = size
}
- ffmpeg(videoPath)
- .on('error', callback)
- .on('end', function () {
- callback(null, imageName)
- })
- .thumbnail(options)
-}
-
-function removeFromBlacklist (video: VideoInstance, callback: (err: Error) => void) {
- // Find the blacklisted video
- db.BlacklistedVideo.loadByVideoId(video.id, function (err, video) {
- // If an error occured, stop here
- if (err) {
- logger.error('Error when fetching video from blacklist.', { error: err })
- return callback(err)
- }
-
- // If we found the video, remove it from the blacklist
- if (video) {
- video.destroy().asCallback(callback)
- } else {
- // If haven't found it, simply ignore it and do nothing
- return callback(null)
- }
+ return new Promise<string>((res, rej) => {
+ ffmpeg(videoPath)
+ .on('error', rej)
+ .on('end', () => res(imageName))
+ .thumbnail(options)
})
}
projects / github / Chocobozzz / PeerTube.git / blobdiff