From 12e7a921b27ffc7fd6307d1a84efd30cc838b45c Mon Sep 17 00:00:00 2001
From: Moe <github@m03.ca>
Date: Fri, 17 Dec 2021 09:50:35 -0800
Subject: [PATCH] allow noLimit queries on videos, events, and timelapse frames

---
 libs/database/utils.js | 5 +++--
 libs/timelapse.js      | 2 +-
 libs/webServerPaths.js | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libs/database/utils.js b/libs/database/utils.js
index cf3d61f1..ce7ae1a3 100644
--- a/libs/database/utils.js
+++ b/libs/database/utils.js
@@ -218,6 +218,7 @@ module.exports = function(s,config){
            whereQuery.push(['filename','=',options.filename])
            frameLimit = "1";
        }
+       if(noLimit)frameLimit = '0';
        options.orderBy = options.orderBy ? options.orderBy : ['time','desc']
        if(options.count)options.groupBy = options.groupBy ? options.groupBy : options.orderBy[0]
        knexQuery({
@@ -227,7 +228,7 @@ module.exports = function(s,config){
            where: whereQuery,
            orderBy: options.orderBy,
            groupBy: options.groupBy,
-           limit: noLimit ? undefined : frameLimit || '500'
+           limit: frameLimit || '500'
        },(err,r) => {
            if(err){
                callback({
@@ -338,7 +339,7 @@ module.exports = function(s,config){
             endDate: endTime,
             startOperator: startTimeOperator,
             endOperator: endTimeOperator,
-            limit: options.limit,
+            limit: options.noLimit === '1' ? '0' : options.limit,
             archived: archived,
             rowType: rowName,
             endIsStartTo: endIsStartTo
diff --git a/libs/timelapse.js b/libs/timelapse.js
index 0881aec7..5b3d6520 100644
--- a/libs/timelapse.js
+++ b/libs/timelapse.js
@@ -202,8 +202,8 @@ module.exports = function(s,config,lang,app,io){
                 endDate: req.query.end,
                 startOperator: req.query.startOperator,
                 endOperator: req.query.endOperator,
-                limit: req.query.limit,
                 noLimit: req.query.noLimit,
+                limit: req.query.limit,
                 archived: req.query.archived,
                 rowType: 'frames',
                 endIsStartTo: true
diff --git a/libs/webServerPaths.js b/libs/webServerPaths.js
index d1ac933d..1fb2dba3 100644
--- a/libs/webServerPaths.js
+++ b/libs/webServerPaths.js
@@ -949,6 +949,7 @@ module.exports = function(s,config,lang,app,io){
                 endTime: req.query.end,
                 startTimeOperator: req.query.startOperator,
                 endTimeOperator: req.query.endOperator,
+                noLimit: req.query.noLimit,
                 limit: req.query.limit,
                 archived: req.query.archived,
                 endIsStartTo: !!req.query.endIsStartTo,
@@ -1021,6 +1022,7 @@ module.exports = function(s,config,lang,app,io){
                     endTime: req.query.end,
                     startTimeOperator: req.query.startOperator,
                     endTimeOperator: req.query.endOperator,
+                    noLimit: req.query.noLimit,
                     limit: req.query.limit,
                     endIsStartTo: true,
                     parseRowDetails: true,