Server: we don't need the video name when removing a remote video

[github/Chocobozzz/PeerTube.git] / server / helpers / utils.js

diff --git a/server/helpers/utils.js b/server/helpers/utils.js
index 9d4d51c46197dc6e35a8bce2bff7de3c75d968e2..9f4b145825758c304c4ef1aeb18402d16f90e364 100644 (file)
--- 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
+  }
 }
 
 // ---------------------------------------------------------------------------