Added additional time logging.

jobs/jobsListMedia.ts

@@ -9,6 +9,7 @@ import { PathToRoFolder } from "../util/pathGenerators";
 import { FolderPaths } from "../util/serverInit";
 
 export async function JobsListMedia(req: Request, res: Response) {
+  console.time("JobsListMedia");
   const jobid: string = (req.body.jobid || "").trim();
   await fs.ensureDir(PathToRoFolder(jobid));
   logger.debug("Listing media for job: " + PathToRoFolder(jobid));
@@ -72,7 +73,7 @@ export async function JobsListMedia(req: Request, res: Response) {
         })
       );
     }
-
+    console.timeEnd("JobsListMedia");
     res.json(ret);
   } catch (error) {
     logger.error("Error listing job media.", { jobid, error });

jobs/jobsUploadMedia.ts

@@ -14,7 +14,12 @@ export const JobMediaUploadMulter = multer({
       const jobid: string = (req.body.jobid || "").trim();
       const DestinationFolder: string = PathToRoFolder(jobid);
       fs.ensureDirSync(DestinationFolder);
-      cb(null, DestinationFolder);
+      cb(
+        jobid === "" || jobid === null
+          ? new Error("Job ID not specified.")
+          : null,
+        DestinationFolder
+      );
     },
     filename: function (req, file, cb) {
       logger.debug("Uploading file: ", {
@@ -26,16 +31,18 @@ export const JobMediaUploadMulter = multer({
 });
 
 export async function jobsUploadMedia(req: Request, res: Response) {
+  console.time("jobsUploadMedia");
   const jobid: string = (req.body.jobid || "").trim();
 
   try {
-    if (!req.files) {
-      res.send({
+    if (!req.files || (req.files as Express.Multer.File[]).length === 0) {
+      logger.warn("Upload contained no files.");
+      res.status(400).send({
         status: false,
         message: "No file uploaded",
       });
     } else {
-      logger.log(
+      logger.debug(
         "Creating thumbnails for newly uploaded media",
         (req.files as Express.Multer.File[]).map((f) => f.filename)
       );
@@ -48,7 +55,12 @@ export async function jobsUploadMedia(req: Request, res: Response) {
 
       await Promise.all(thumbnailGenerationQueue);
 
-      JobsListMedia(req, res);
+      console.timeEnd("jobsUploadMedia");
+      if (req.body.skip_thumbnail) {
+        res.sendStatus(200);
+      } else {
+        JobsListMedia(req, res);
+      }
     }
   } catch (error) {
     logger.error("Error uploading job media.", { jobid, error: error });