mirror of
https://github.com/Chocobozzz/PeerTube.git
synced 2025-10-04 02:09:37 +02:00
Move to promises
Closes https://github.com/Chocobozzz/PeerTube/issues/74
This commit is contained in:
parent
5fe7e89831
commit
6fcd19ba73
88 changed files with 1980 additions and 2505 deletions
|
@ -1,8 +1,7 @@
|
|||
import { parallel } from 'async'
|
||||
import * as express from 'express'
|
||||
import * as fs from 'fs'
|
||||
import { join } from 'path'
|
||||
import * as validator from 'validator'
|
||||
import * as Promise from 'bluebird'
|
||||
|
||||
import { database as db } from '../initializers/database'
|
||||
import {
|
||||
|
@ -11,7 +10,7 @@ import {
|
|||
STATIC_PATHS,
|
||||
STATIC_MAX_AGE
|
||||
} from '../initializers'
|
||||
import { root } from '../helpers'
|
||||
import { root, readFileBufferPromise } from '../helpers'
|
||||
import { VideoInstance } from '../models'
|
||||
|
||||
const clientsRouter = express.Router()
|
||||
|
@ -95,19 +94,15 @@ function generateWatchHtmlPage (req: express.Request, res: express.Response, nex
|
|||
// Let Angular application handle errors
|
||||
if (!validator.isUUID(videoId, 4)) return res.sendFile(indexPath)
|
||||
|
||||
parallel({
|
||||
file: function (callback) {
|
||||
fs.readFile(indexPath, callback)
|
||||
},
|
||||
Promise.all([
|
||||
readFileBufferPromise(indexPath),
|
||||
db.Video.loadAndPopulateAuthorAndPodAndTags(videoId)
|
||||
])
|
||||
.then(([ file, video ]) => {
|
||||
file = file as Buffer
|
||||
video = video as VideoInstance
|
||||
|
||||
video: function (callback) {
|
||||
db.Video.loadAndPopulateAuthorAndPodAndTags(videoId, callback)
|
||||
}
|
||||
}, function (err: Error, result: { file: Buffer, video: VideoInstance }) {
|
||||
if (err) return next(err)
|
||||
|
||||
const html = result.file.toString()
|
||||
const video = result.video
|
||||
const html = file.toString()
|
||||
|
||||
// Let Angular application handle errors
|
||||
if (!video) return res.sendFile(indexPath)
|
||||
|
@ -115,4 +110,5 @@ function generateWatchHtmlPage (req: express.Request, res: express.Response, nex
|
|||
const htmlStringPageWithTags = addOpenGraphTags(html, video)
|
||||
res.set('Content-Type', 'text/html; charset=UTF-8').send(htmlStringPageWithTags)
|
||||
})
|
||||
.catch(err => next(err))
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue