X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fmodels%2Fvideo%2Fvideo.ts;h=59c378efaa2f2ace4922596f6d08ab49c734f07c;hb=749c7247ae9042a74d132afda0c7eefab66a0428;hp=fe8c30655a31b1333f0529d0c6329b86ddbbe13f;hpb=0f320037e689b2778959c12ddd4ce790f6e4ae4f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video.ts b/server/models/video/video.ts index fe8c30655..59c378efa 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -2,10 +2,9 @@ import * as Bluebird from 'bluebird' import { map, maxBy } from 'lodash' import * as magnetUtil from 'magnet-uri' import * as parseTorrent from 'parse-torrent' -import { join } from 'path' +import { extname, join } from 'path' import * as Sequelize from 'sequelize' import { - AfterDestroy, AllowNull, BeforeDestroy, BelongsTo, @@ -26,13 +25,17 @@ import { Table, UpdatedAt } from 'sequelize-typescript' -import { VideoPrivacy, VideoResolution } from '../../../shared' +import { VideoPrivacy, VideoResolution, VideoState } from '../../../shared' import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' import { Video, VideoDetails, VideoFile } from '../../../shared/models/videos' import { VideoFilter } from '../../../shared/models/videos/video-query.type' -import { activityPubCollection } from '../../helpers/activitypub' import { - createTorrentPromise, peertubeTruncate, renamePromise, statPromise, unlinkPromise, + copyFilePromise, + createTorrentPromise, + peertubeTruncate, + renamePromise, + statPromise, + unlinkPromise, writeFilePromise } from '../../helpers/core-utils' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' @@ -44,7 +47,7 @@ import { isVideoLanguageValid, isVideoLicenceValid, isVideoNameValid, - isVideoPrivacyValid, + isVideoPrivacyValid, isVideoStateValid, isVideoSupportValid } from '../../helpers/custom-validators/videos' import { generateImageFromVideoFile, getVideoFileResolution, transcode } from '../../helpers/ffmpeg-utils' @@ -56,12 +59,14 @@ import { CONSTRAINTS_FIELDS, PREVIEWS_SIZE, REMOTE_SCHEME, + STATIC_DOWNLOAD_PATHS, STATIC_PATHS, THUMBNAILS_SIZE, VIDEO_CATEGORIES, + VIDEO_EXT_MIMETYPE, VIDEO_LANGUAGES, VIDEO_LICENCES, - VIDEO_PRIVACIES + VIDEO_PRIVACIES, VIDEO_STATES } from '../../initializers' import { getVideoCommentsActivityPubUrl, @@ -88,10 +93,7 @@ enum ScopeNames { AVAILABLE_FOR_LIST = 'AVAILABLE_FOR_LIST', WITH_ACCOUNT_DETAILS = 'WITH_ACCOUNT_DETAILS', WITH_TAGS = 'WITH_TAGS', - WITH_FILES = 'WITH_FILES', - WITH_SHARES = 'WITH_SHARES', - WITH_RATES = 'WITH_RATES', - WITH_COMMENTS = 'WITH_COMMENTS' + WITH_FILES = 'WITH_FILES' } @Scopes({ @@ -178,7 +180,20 @@ enum ScopeNames { ')' ) }, - privacy: VideoPrivacy.PUBLIC + // Always list public videos + privacy: VideoPrivacy.PUBLIC, + // Always list published videos, or videos that are being transcoded but on which we don't want to wait for transcoding + [ Sequelize.Op.or ]: [ + { + state: VideoState.PUBLISHED + }, + { + [ Sequelize.Op.and ]: { + state: VideoState.TO_TRANSCODE, + waitTranscoding: false + } + } + ] }, include: [ videoChannelInclude ] } @@ -267,39 +282,6 @@ enum ScopeNames { required: true } ] - }, - [ScopeNames.WITH_SHARES]: { - include: [ - { - model: () => VideoShareModel.unscoped() - } - ] - }, - [ScopeNames.WITH_RATES]: { - include: [ - { - model: () => AccountVideoRateModel, - include: [ - { - model: () => AccountModel.unscoped(), - required: true, - include: [ - { - attributes: [ 'url' ], - model: () => ActorModel.unscoped() - } - ] - } - ] - } - ] - }, - [ScopeNames.WITH_COMMENTS]: { - include: [ - { - model: () => VideoCommentModel.unscoped() - } - ] } }) @Table({ @@ -327,7 +309,7 @@ enum ScopeNames { fields: [ 'channelId' ] }, { - fields: [ 'id', 'privacy' ] + fields: [ 'id', 'privacy', 'state', 'waitTranscoding' ] }, { fields: [ 'url'], @@ -427,6 +409,16 @@ export class VideoModel extends Model { @Column commentsEnabled: boolean + @AllowNull(false) + @Column + waitTranscoding: boolean + + @AllowNull(false) + @Default(null) + @Is('VideoState', value => throwIfNotValid(value, isVideoStateValid, 'state')) + @Column + state: VideoState + @CreatedAt createdAt: Date @@ -596,6 +588,7 @@ export class VideoModel extends Model { attributes: [ 'id', 'url' ], model: VideoShareModel.unscoped(), required: false, + // We only want videos shared by this actor where: { [Sequelize.Op.and]: [ { @@ -625,48 +618,19 @@ export class VideoModel extends Model { required: true, include: [ { - attributes: [ 'id', 'url' ], + attributes: [ 'id', 'url', 'followersUrl' ], model: ActorModel.unscoped(), required: true } ] }, { - attributes: [ 'id', 'url' ], + attributes: [ 'id', 'url', 'followersUrl' ], model: ActorModel.unscoped(), required: true } ] }, - { - attributes: [ 'type' ], - model: AccountVideoRateModel, - required: false, - include: [ - { - attributes: [ 'id' ], - model: AccountModel.unscoped(), - include: [ - { - attributes: [ 'url' ], - model: ActorModel.unscoped(), - include: [ - { - attributes: [ 'host' ], - model: ServerModel, - required: false - } - ] - } - ] - } - ] - }, - { - attributes: [ 'url' ], - model: VideoCommentModel, - required: false - }, VideoFileModel, TagModel ] @@ -691,7 +655,7 @@ export class VideoModel extends Model { }) } - static listAccountVideosForApi (accountId: number, start: number, count: number, sort: string, hideNSFW: boolean, withFiles = false) { + static listUserVideosForApi (accountId: number, start: number, count: number, sort: string, hideNSFW: boolean, withFiles = false) { const query: IFindOptions = { offset: start, limit: count, @@ -878,12 +842,13 @@ export class VideoModel extends Model { .findOne(options) } - static loadByUUIDAndPopulateAccountAndServerAndTags (uuid: string) { + static loadByUUIDAndPopulateAccountAndServerAndTags (uuid: string, t?: Sequelize.Transaction) { const options = { order: [ [ 'Tags', 'name', 'ASC' ] ], where: { uuid - } + }, + transaction: t } return VideoModel @@ -891,26 +856,6 @@ export class VideoModel extends Model { .findOne(options) } - static loadAndPopulateAll (id: number) { - const options = { - order: [ [ 'Tags', 'name', 'ASC' ] ], - where: { - id - } - } - - return VideoModel - .scope([ - ScopeNames.WITH_RATES, - ScopeNames.WITH_SHARES, - ScopeNames.WITH_TAGS, - ScopeNames.WITH_FILES, - ScopeNames.WITH_ACCOUNT_DETAILS, - ScopeNames.WITH_COMMENTS - ]) - .findOne(options) - } - static async getStats () { const totalLocalVideos = await VideoModel.count({ where: { @@ -945,31 +890,23 @@ export class VideoModel extends Model { } private static getCategoryLabel (id: number) { - let categoryLabel = VIDEO_CATEGORIES[id] - if (!categoryLabel) categoryLabel = 'Misc' - - return categoryLabel + return VIDEO_CATEGORIES[id] || 'Misc' } private static getLicenceLabel (id: number) { - let licenceLabel = VIDEO_LICENCES[id] - if (!licenceLabel) licenceLabel = 'Unknown' - - return licenceLabel + return VIDEO_LICENCES[id] || 'Unknown' } private static getLanguageLabel (id: string) { - let languageLabel = VIDEO_LANGUAGES[id] - if (!languageLabel) languageLabel = 'Unknown' - - return languageLabel + return VIDEO_LANGUAGES[id] || 'Unknown' } private static getPrivacyLabel (id: number) { - let privacyLabel = VIDEO_PRIVACIES[id] - if (!privacyLabel) privacyLabel = 'Unknown' + return VIDEO_PRIVACIES[id] || 'Unknown' + } - return privacyLabel + private static getStateLabel (id: number) { + return VIDEO_STATES[id] || 'Unknown' } getOriginalFile () { @@ -1021,6 +958,10 @@ export class VideoModel extends Model { ) } + getTorrentFilePath (videoFile: VideoFileModel) { + return join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile)) + } + getVideoFilePath (videoFile: VideoFileModel) { return join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile)) } @@ -1062,11 +1003,16 @@ export class VideoModel extends Model { return join(STATIC_PATHS.PREVIEWS, this.getPreviewName()) } - toFormattedJSON (): Video { + toFormattedJSON (options?: { + additionalAttributes: { + state: boolean, + waitTranscoding: boolean + } + }): Video { const formattedAccount = this.VideoChannel.Account.toFormattedJSON() const formattedVideoChannel = this.VideoChannel.toFormattedJSON() - return { + const videoObject: Video = { id: this.id, uuid: this.uuid, name: this.name, @@ -1118,6 +1064,19 @@ export class VideoModel extends Model { avatar: formattedVideoChannel.avatar } } + + if (options) { + if (options.additionalAttributes.state) { + videoObject.state = { + id: this.state, + label: VideoModel.getStateLabel(this.state) + } + } + + if (options.additionalAttributes.waitTranscoding) videoObject.waitTranscoding = this.waitTranscoding + } + + return videoObject } toFormattedDetailsJSON (): VideoDetails { @@ -1130,6 +1089,11 @@ export class VideoModel extends Model { account: this.VideoChannel.Account.toFormattedJSON(), tags: map(this.Tags, 'name'), commentsEnabled: this.commentsEnabled, + waitTranscoding: this.waitTranscoding, + state: { + id: this.state, + label: VideoModel.getStateLabel(this.state) + }, files: [] } @@ -1154,7 +1118,9 @@ export class VideoModel extends Model { magnetUri: this.generateMagnetUri(videoFile, baseUrlHttp, baseUrlWs), size: videoFile.size, torrentUrl: this.getTorrentUrl(videoFile, baseUrlHttp), - fileUrl: this.getVideoFileUrl(videoFile, baseUrlHttp) + torrentDownloadUrl: this.getTorrentDownloadUrl(videoFile, baseUrlHttp), + fileUrl: this.getVideoFileUrl(videoFile, baseUrlHttp), + fileDownloadUrl: this.getVideoFileDownloadUrl(videoFile, baseUrlHttp) } as VideoFile }) .sort((a, b) => { @@ -1197,30 +1163,11 @@ export class VideoModel extends Model { } } - let likesObject - let dislikesObject - - if (Array.isArray(this.AccountVideoRates)) { - const res = this.toRatesActivityPubObjects() - likesObject = res.likesObject - dislikesObject = res.dislikesObject - } - - let sharesObject - if (Array.isArray(this.VideoShares)) { - sharesObject = this.toAnnouncesActivityPubObject() - } - - let commentsObject - if (Array.isArray(this.VideoComments)) { - commentsObject = this.toCommentsActivityPubObject() - } - const url = [] for (const file of this.VideoFiles) { url.push({ type: 'Link', - mimeType: 'video/' + file.extname.replace('.', ''), + mimeType: VIDEO_EXT_MIMETYPE[file.extname], href: this.getVideoFileUrl(file, baseUrlHttp), width: file.resolution, size: file.size @@ -1260,6 +1207,8 @@ export class VideoModel extends Model { language, views: this.views, sensitive: this.nsfw, + waitTranscoding: this.waitTranscoding, + state: this.state, commentsEnabled: this.commentsEnabled, published: this.publishedAt.toISOString(), updated: this.updatedAt.toISOString(), @@ -1274,10 +1223,10 @@ export class VideoModel extends Model { height: THUMBNAILS_SIZE.height }, url, - likes: likesObject, - dislikes: dislikesObject, - shares: sharesObject, - comments: commentsObject, + likes: getVideoLikesActivityPubUrl(this), + dislikes: getVideoDislikesActivityPubUrl(this), + shares: getVideoSharesActivityPubUrl(this), + comments: getVideoCommentsActivityPubUrl(this), attributedTo: [ { type: 'Person', @@ -1291,44 +1240,6 @@ export class VideoModel extends Model { } } - toAnnouncesActivityPubObject () { - const shares: string[] = [] - - for (const videoShare of this.VideoShares) { - shares.push(videoShare.url) - } - - return activityPubCollection(getVideoSharesActivityPubUrl(this), shares) - } - - toCommentsActivityPubObject () { - const comments: string[] = [] - - for (const videoComment of this.VideoComments) { - comments.push(videoComment.url) - } - - return activityPubCollection(getVideoCommentsActivityPubUrl(this), comments) - } - - toRatesActivityPubObjects () { - const likes: string[] = [] - const dislikes: string[] = [] - - for (const rate of this.AccountVideoRates) { - if (rate.type === 'like') { - likes.push(rate.Account.Actor.url) - } else if (rate.type === 'dislike') { - dislikes.push(rate.Account.Actor.url) - } - } - - const likesObject = activityPubCollection(getVideoLikesActivityPubUrl(this), likes) - const dislikesObject = activityPubCollection(getVideoDislikesActivityPubUrl(this), dislikes) - - return { likesObject, dislikesObject } - } - getTruncatedDescription () { if (!this.description) return null @@ -1408,6 +1319,40 @@ export class VideoModel extends Model { this.VideoFiles.push(newVideoFile) } + async importVideoFile (inputFilePath: string) { + let updatedVideoFile = new VideoFileModel({ + resolution: (await getVideoFileResolution(inputFilePath)).videoFileResolution, + extname: extname(inputFilePath), + size: (await statPromise(inputFilePath)).size, + videoId: this.id + }) + + const currentVideoFile = this.VideoFiles.find(videoFile => videoFile.resolution === updatedVideoFile.resolution) + + if (currentVideoFile) { + // Remove old file and old torrent + await this.removeFile(currentVideoFile) + await this.removeTorrent(currentVideoFile) + // Remove the old video file from the array + this.VideoFiles = this.VideoFiles.filter(f => f !== currentVideoFile) + + // Update the database + currentVideoFile.set('extname', updatedVideoFile.extname) + currentVideoFile.set('size', updatedVideoFile.size) + + updatedVideoFile = currentVideoFile + } + + const outputPath = this.getVideoFilePath(updatedVideoFile) + await copyFilePromise(inputFilePath, outputPath) + + await this.createTorrentAndSetInfoHash(updatedVideoFile) + + await updatedVideoFile.save() + + this.VideoFiles.push(updatedVideoFile) + } + getOriginalFileResolution () { const originalFilePath = this.getVideoFilePath(this.getOriginalFile()) @@ -1466,10 +1411,18 @@ export class VideoModel extends Model { return baseUrlHttp + STATIC_PATHS.TORRENTS + this.getTorrentFileName(videoFile) } + private getTorrentDownloadUrl (videoFile: VideoFileModel, baseUrlHttp: string) { + return baseUrlHttp + STATIC_DOWNLOAD_PATHS.TORRENTS + this.getTorrentFileName(videoFile) + } + private getVideoFileUrl (videoFile: VideoFileModel, baseUrlHttp: string) { return baseUrlHttp + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile) } + private getVideoFileDownloadUrl (videoFile: VideoFileModel, baseUrlHttp: string) { + return baseUrlHttp + STATIC_DOWNLOAD_PATHS.VIDEOS + this.getVideoFilename(videoFile) + } + private generateMagnetUri (videoFile: VideoFileModel, baseUrlHttp: string, baseUrlWs: string) { const xs = this.getTorrentUrl(videoFile, baseUrlHttp) const announce = [ baseUrlWs + '/tracker/socket', baseUrlHttp + '/tracker/announce' ]