Add user video list hooks

[github/Chocobozzz/PeerTube.git] / server / controllers / api / jobs.ts

diff --git a/server/controllers/api/jobs.ts b/server/controllers/api/jobs.ts
index c19596dde2c5518c2048616c38721afab19e1d4b..e14ea25758e2f286696aad302144923d1cb9dada 100644 (file)
--- a/server/controllers/api/jobs.ts
+++ b/server/controllers/api/jobs.ts
@@ -1,7 +1,8 @@
 import * as express from 'express'
 import { ResultList } from '../../../shared'
-import { Job, JobType, JobState } from '../../../shared/models'
+import { Job, JobState, JobType } from '../../../shared/models'
 import { UserRight } from '../../../shared/models/users'
+import { isArray } from '../../helpers/custom-validators/misc'
 import { JobQueue } from '../../lib/job-queue'
 import {
   asyncMiddleware,
@@ -13,18 +14,17 @@ import {
 } from '../../middlewares'
 import { paginationValidator } from '../../middlewares/validators'
 import { listJobsValidator } from '../../middlewares/validators/jobs'
-import { isArray } from '../../helpers/custom-validators/misc'
 
 const jobsRouter = express.Router()
 
-jobsRouter.get('/:state',
+jobsRouter.get('/:state?',
   authenticate,
   ensureUserHasRight(UserRight.MANAGE_JOBS),
   paginationValidator,
   jobsSortValidator,
   setDefaultSort,
   setDefaultPagination,
-  asyncMiddleware(listJobsValidator),
+  listJobsValidator,
   asyncMiddleware(listJobs)
 )
 
@@ -36,22 +36,38 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function listJobs (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const state: JobState = req.params.state
+async function listJobs (req: express.Request, res: express.Response) {
+  const state = req.params.state as JobState
   const asc = req.query.sort === 'createdAt'
+  const jobType = req.query.jobType
 
-  const jobs = await JobQueue.Instance.listForApi(state, req.query.start, req.query.count, asc)
-  const total = await JobQueue.Instance.count(state)
+  const jobs = await JobQueue.Instance.listForApi({
+    state,
+    start: req.query.start,
+    count: req.query.count,
+    asc,
+    jobType
+  })
+  const total = await JobQueue.Instance.count(state, jobType)
 
-  const result: ResultList<any> = {
+  const result: ResultList<Job> = {
     total,
-    data: jobs.map(j => formatJob(j, state))
+    data: state
+      ? jobs.map(j => formatJob(j, state))
+      : await Promise.all(jobs.map(j => formatJobWithUnknownState(j)))
   }
+
   return res.json(result)
 }
 
+async function formatJobWithUnknownState (job: any) {
+  return formatJob(job, await job.getState())
+}
+
 function formatJob (job: any, state: JobState): Job {
-  const error = isArray(job.stacktrace) && job.stacktrace.length !== 0 ? job.stacktrace[0] : null
+  const error = isArray(job.stacktrace) && job.stacktrace.length !== 0
+    ? job.stacktrace[0]
+    : null
 
   return {
     id: job.id,