yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-06 03:50:26 +02:00
Code Issues Releases Wiki Activity

Speed up overviews route

Browse source
This commit is contained in:
Chocobozzz 2018-09-14 11:52:23 +02:00
parent 2b62cccd75
commit 7348b1fd84
No known key found for this signature in database
GPG key ID: 583A612D890159BE
7 changed files with 80 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

26
server/controllers/api/overviews.ts
View file

@ -4,8 +4,9 @@ import { VideoModel } from '../../models/video/video'
import { asyncMiddleware } from '../../middlewares'
import { TagModel } from '../../models/video/tag'
import { VideosOverview } from '../../../shared/models/overviews'
import { OVERVIEWS, ROUTE_CACHE_LIFETIME } from '../../initializers'
import { MEMOIZE_TTL, OVERVIEWS, ROUTE_CACHE_LIFETIME } from '../../initializers'
import { cacheRoute } from '../../middlewares/cache'
import * as memoizee from 'memoizee'
const overviewsRouter = express.Router()
@ -23,10 +24,17 @@ export { overviewsRouter }
// This endpoint could be quite long, but we cache it
async function getVideosOverview (req: express.Request, res: express.Response) {
const attributes = await buildSamples()
const [ categories, channels, tags ] = await Promise.all([
Promise.all(attributes.categories.map(c => getVideosByCategory(c, res))),
Promise.all(attributes.channels.map(c => getVideosByChannel(c, res))),
Promise.all(attributes.tags.map(t => getVideosByTag(t, res)))
])
const result: VideosOverview = {
categories: await Promise.all(attributes.categories.map(c => getVideosByCategory(c, res))),
channels: await Promise.all(attributes.channels.map(c => getVideosByChannel(c, res))),
tags: await Promise.all(attributes.tags.map(t => getVideosByTag(t, res)))
categories,
channels,
tags
}
// Cleanup our object
@ -37,7 +45,7 @@ async function getVideosOverview (req: express.Request, res: express.Response) {
return res.json(result)
}
async function buildSamples () {
const buildSamples = memoizee(async function () {
const [ categories, channels, tags ] = await Promise.all([
VideoModel.getRandomFieldSamples('category', OVERVIEWS.VIDEOS.SAMPLE_THRESHOLD, OVERVIEWS.VIDEOS.SAMPLES_COUNT),
VideoModel.getRandomFieldSamples('channelId', OVERVIEWS.VIDEOS.SAMPLE_THRESHOLD ,OVERVIEWS.VIDEOS.SAMPLES_COUNT),
@ -45,7 +53,7 @@ async function buildSamples () {
])
return { categories, channels, tags }
}
}, { maxAge: MEMOIZE_TTL.OVERVIEWS_SAMPLE })
async function getVideosByTag (tag: string, res: express.Response) {
const videos = await getVideos(res, { tagsOneOf: [ tag ] })
@ -84,14 +92,16 @@ async function getVideos (
res: express.Response,
where: { videoChannelId?: number, tagsOneOf?: string[], categoryOneOf?: number[] }
) {
const { data } = await VideoModel.listForApi(Object.assign({
const query = Object.assign({
start: 0,
count: 10,
sort: '-createdAt',
includeLocalVideos: true,
nsfw: buildNSFWFilter(res),
withFiles: false
}, where))
}, where)
const { data } = await VideoModel.listForApi(query, false)
return data.map(d => d.toFormattedJSON())
}