X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Futils.js;h=9f4b145825758c304c4ef1aeb18402d16f90e364;hb=b981a525c37d226b3fa59287a6ce338f54583d0c;hp=9d4d51c46197dc6e35a8bce2bff7de3c75d968e2;hpb=cbe2f7c34822b1bd3b1f8c691f79f0c29cf21f07;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/utils.js b/server/helpers/utils.js index 9d4d51c46..9f4b14582 100644 --- a/server/helpers/utils.js +++ b/server/helpers/utils.js @@ -5,8 +5,15 @@ const crypto = require('crypto') const logger = require('./logger') const utils = { - cleanForExit: cleanForExit, - generateRandomString: generateRandomString + badRequest, + cleanForExit, + generateRandomString, + isTestInstance, + getFormatedObjects +} + +function badRequest (req, res, next) { + res.type('json').status(400).end() } function generateRandomString (size, callback) { @@ -17,9 +24,26 @@ function generateRandomString (size, callback) { }) } -function cleanForExit (webtorrent_process) { +function cleanForExit (webtorrentProcess) { logger.info('Gracefully exiting.') - process.kill(-webtorrent_process.pid) + process.kill(-webtorrentProcess.pid) +} + +function isTestInstance () { + return (process.env.NODE_ENV === 'test') +} + +function getFormatedObjects (objects, objectsTotal) { + const formatedObjects = [] + + objects.forEach(function (object) { + formatedObjects.push(object.toFormatedJSON()) + }) + + return { + total: objectsTotal, + data: formatedObjects + } } // ---------------------------------------------------------------------------