maxImages set to null when no limit instead of -1

config-default.json

@@ -17,5 +17,5 @@
 	"testSkipOrthophotos": false,
 	"testSkipDems": false,
 	"token": "",
-	"maxImages": -1
+	"maxImages": ""
 }

config.js

@@ -91,7 +91,7 @@ config.testSkipOrthophotos = argv.test_skip_orthophotos || fromConfigFile("testS
 config.testSkipDems = argv.test_skip_dems || fromConfigFile("testSkipDems", false);
 config.powercycle = argv.powercycle || fromConfigFile("powercycle", false);
 config.token = argv.token || fromConfigFile("token", "");
-config.maxImages = argv.max_images || fromConfigFile("maxImages", "");
+config.maxImages = parseInt(argv.max_images || fromConfigFile("maxImages", "")) || null;
 config.callback = argv.callback || fromConfigFile("callback", "");
 config.s3Endpoint = argv.s3_endpoint || fromConfigFile("s3Endpoint", "")
 config.s3AccessKey = argv.s3_access_key || fromConfigFile("s3AccessKey", process.env.AWS_ACCESS_KEY_ID || "")

docs/index.adoc

@@ -69,7 +69,7 @@ _optional_|Amount of RAM available in bytes|integer
 |*cpuCores* +
 _optional_|Number of CPU cores (virtual)|integer
 |*maxImages* +
-_optional_|Maximum number of images allowed for new tasks|integer
+_optional_|Maximum number of images allowed for new tasks or null if there's no limit.|integer
 |*maxParallelTasks* +
 _optional_|Maximum number of tasks that can be processed simultaneously|integer
 |*odmVersion* +

index.js

@@ -160,7 +160,7 @@ app.post('/task/new', authCheck, addRequestId, upload.array('images'), (req, res
     };
 
     if ((!req.files || req.files.length === 0) && !req.body.zipurl) die("Need at least 1 file or a zip file url.");
-    else if (config.maxImages > 0 && req.files && req.files.length > config.maxImages) die(`${req.files.length} images uploaded, but this node can only process up to ${config.maxImages}.`);
+    else if (config.maxImages && req.files && req.files.length > config.maxImages) die(`${req.files.length} images uploaded, but this node can only process up to ${config.maxImages}.`);
 
     else {
         let destPath = path.join(Directories.data, req.id);
@@ -232,7 +232,7 @@ app.post('/task/new', authCheck, addRequestId, upload.array('images'), (req, res
                                         })
                                         .on('close', () => {
                                             // Verify max images limit
-                                            if (config.maxImages > 0 && filesCount > config.maxImages) cb(`${filesCount} images uploaded, but this node can only process up to ${config.maxImages}.`);
+                                            if (config.maxImages && filesCount > config.maxImages) cb(`${filesCount} images uploaded, but this node can only process up to ${config.maxImages}.`);
                                             else cb();
                                         })
                                         .on('error', cb);
@@ -659,7 +659,7 @@ app.get('/options', authCheck, (req, res) => {
  *               description: Number of CPU cores (virtual)
  *             maxImages:
  *               type: integer
- *               description: Maximum number of images allowed for new tasks
+ *               description: Maximum number of images allowed for new tasks or null if there's no limit.
  *             maxParallelTasks:
  *               type: integer
  *               description: Maximum number of tasks that can be processed simultaneously