interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Optimize videos list API endpoint

This commit is contained in:
Chocobozzz 2021-02-05 17:08:47 +01:00 committed by Chocobozzz
parent 9162476fe9
commit 81b46cbc34
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/models/video/video.ts
View File

@ -1658,17 +1658,18 @@ export class VideoModel extends Model {
'createdAt', 'createdAt',
'updatedAt' 'updatedAt'
] ]
const buildOpts = { raw: true }
function buildActor (rowActor: any) { function buildActor (rowActor: any) {
const avatarModel = rowActor.Avatar.id !== null const avatarModel = rowActor.Avatar.id !== null
? new AvatarModel(pick(rowActor.Avatar, avatarKeys)) ? new AvatarModel(pick(rowActor.Avatar, avatarKeys), buildOpts)
: null : null
const serverModel = rowActor.Server.id !== null const serverModel = rowActor.Server.id !== null
? new ServerModel(pick(rowActor.Server, serverKeys)) ? new ServerModel(pick(rowActor.Server, serverKeys), buildOpts)
: null : null
const actorModel = new ActorModel(pick(rowActor, actorKeys)) const actorModel = new ActorModel(pick(rowActor, actorKeys), buildOpts)
actorModel.Avatar = avatarModel actorModel.Avatar = avatarModel
actorModel.Server = serverModel actorModel.Server = serverModel
@ -1679,11 +1680,11 @@ export class VideoModel extends Model {
if (!videosMemo[row.id]) { if (!videosMemo[row.id]) {
// Build Channel // Build Channel
const channel = row.VideoChannel const channel = row.VideoChannel
const channelModel = new VideoChannelModel(pick(channel, [ 'id', 'name', 'description', 'actorId' ])) const channelModel = new VideoChannelModel(pick(channel, [ 'id', 'name', 'description', 'actorId' ]), buildOpts)
channelModel.Actor = buildActor(channel.Actor) channelModel.Actor = buildActor(channel.Actor)
const account = row.VideoChannel.Account const account = row.VideoChannel.Account
const accountModel = new AccountModel(pick(account, [ 'id', 'name' ])) const accountModel = new AccountModel(pick(account, [ 'id', 'name' ]), buildOpts)
accountModel.Actor = buildActor(account.Actor) accountModel.Actor = buildActor(account.Actor)
channelModel.Account = accountModel channelModel.Account = accountModel
@ -1704,28 +1705,28 @@ export class VideoModel extends Model {
const videoModel = videosMemo[row.id] const videoModel = videosMemo[row.id]
if (row.userVideoHistory?.id && !historyDone.has(row.userVideoHistory.id)) { if (row.userVideoHistory?.id && !historyDone.has(row.userVideoHistory.id)) {
const historyModel = new UserVideoHistoryModel(pick(row.userVideoHistory, [ 'id', 'currentTime' ])) const historyModel = new UserVideoHistoryModel(pick(row.userVideoHistory, [ 'id', 'currentTime' ]), buildOpts)
videoModel.UserVideoHistories.push(historyModel) videoModel.UserVideoHistories.push(historyModel)
historyDone.add(row.userVideoHistory.id) historyDone.add(row.userVideoHistory.id)
} }
if (row.Thumbnails?.id && !thumbnailsDone.has(row.Thumbnails.id)) { if (row.Thumbnails?.id && !thumbnailsDone.has(row.Thumbnails.id)) {
const thumbnailModel = new ThumbnailModel(pick(row.Thumbnails, [ 'id', 'type', 'filename' ])) const thumbnailModel = new ThumbnailModel(pick(row.Thumbnails, [ 'id', 'type', 'filename' ]), buildOpts)
videoModel.Thumbnails.push(thumbnailModel) videoModel.Thumbnails.push(thumbnailModel)
thumbnailsDone.add(row.Thumbnails.id) thumbnailsDone.add(row.Thumbnails.id)
} }
if (row.VideoFiles?.id && !videoFilesDone.has(row.VideoFiles.id)) { if (row.VideoFiles?.id && !videoFilesDone.has(row.VideoFiles.id)) {
const videoFileModel = new VideoFileModel(pick(row.VideoFiles, videoFileKeys)) const videoFileModel = new VideoFileModel(pick(row.VideoFiles, videoFileKeys), buildOpts)
videoModel.VideoFiles.push(videoFileModel) videoModel.VideoFiles.push(videoFileModel)
videoFilesDone.add(row.VideoFiles.id) videoFilesDone.add(row.VideoFiles.id)
} }
if (row.VideoStreamingPlaylists?.id && !videoStreamingPlaylistMemo[row.VideoStreamingPlaylists.id]) { if (row.VideoStreamingPlaylists?.id && !videoStreamingPlaylistMemo[row.VideoStreamingPlaylists.id]) {
const streamingPlaylist = new VideoStreamingPlaylistModel(pick(row.VideoStreamingPlaylists, videoStreamingPlaylistKeys)) const streamingPlaylist = new VideoStreamingPlaylistModel(pick(row.VideoStreamingPlaylists, videoStreamingPlaylistKeys), buildOpts)
streamingPlaylist.VideoFiles = [] streamingPlaylist.VideoFiles = []
videoModel.VideoStreamingPlaylists.push(streamingPlaylist) videoModel.VideoStreamingPlaylists.push(streamingPlaylist)
@ -1736,7 +1737,7 @@ export class VideoModel extends Model {
if (row.VideoStreamingPlaylists?.VideoFiles?.id && !videoFilesDone.has(row.VideoStreamingPlaylists.VideoFiles.id)) { if (row.VideoStreamingPlaylists?.VideoFiles?.id && !videoFilesDone.has(row.VideoStreamingPlaylists.VideoFiles.id)) {
const streamingPlaylist = videoStreamingPlaylistMemo[row.VideoStreamingPlaylists.id] const streamingPlaylist = videoStreamingPlaylistMemo[row.VideoStreamingPlaylists.id]
const videoFileModel = new VideoFileModel(pick(row.VideoStreamingPlaylists.VideoFiles, videoFileKeys)) const videoFileModel = new VideoFileModel(pick(row.VideoStreamingPlaylists.VideoFiles, videoFileKeys), buildOpts)
streamingPlaylist.VideoFiles.push(videoFileModel) streamingPlaylist.VideoFiles.push(videoFileModel)
videoFilesDone.add(row.VideoStreamingPlaylists.VideoFiles.id) videoFilesDone.add(row.VideoStreamingPlaylists.VideoFiles.id)