ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow noLimit queries on videos, events, and timelapse frames

montage-api
Moe 2021-12-17 09:50:35 -08:00
parent adc3d6bbac
commit 12e7a921b2
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/database/utils.js
View File

@ -218,6 +218,7 @@ module.exports = function(s,config){
whereQuery.push(['filename','=',options.filename]) whereQuery.push(['filename','=',options.filename])
frameLimit = "1"; frameLimit = "1";
} }
if(noLimit)frameLimit = '0';
options.orderBy = options.orderBy ? options.orderBy : ['time','desc'] options.orderBy = options.orderBy ? options.orderBy : ['time','desc']
if(options.count)options.groupBy = options.groupBy ? options.groupBy : options.orderBy[0] if(options.count)options.groupBy = options.groupBy ? options.groupBy : options.orderBy[0]
knexQuery({ knexQuery({
@ -227,7 +228,7 @@ module.exports = function(s,config){
where: whereQuery, where: whereQuery,
orderBy: options.orderBy, orderBy: options.orderBy,
groupBy: options.groupBy, groupBy: options.groupBy,
limit: noLimit ? undefined : frameLimit || '500' limit: frameLimit || '500'
},(err,r) => { },(err,r) => {
if(err){ if(err){
callback({ callback({
@ -338,7 +339,7 @@ module.exports = function(s,config){
endDate: endTime, endDate: endTime,
startOperator: startTimeOperator, startOperator: startTimeOperator,
endOperator: endTimeOperator, endOperator: endTimeOperator,
limit: options.limit, limit: options.noLimit === '1' ? '0' : options.limit,
archived: archived, archived: archived,
rowType: rowName, rowType: rowName,
endIsStartTo: endIsStartTo endIsStartTo: endIsStartTo

2
libs/timelapse.js
View File

@ -202,8 +202,8 @@ module.exports = function(s,config,lang,app,io){
endDate: req.query.end, endDate: req.query.end,
startOperator: req.query.startOperator, startOperator: req.query.startOperator,
endOperator: req.query.endOperator, endOperator: req.query.endOperator,
limit: req.query.limit,
noLimit: req.query.noLimit, noLimit: req.query.noLimit,
limit: req.query.limit,
archived: req.query.archived, archived: req.query.archived,
rowType: 'frames', rowType: 'frames',
endIsStartTo: true endIsStartTo: true

2
libs/webServerPaths.js
View File

@ -949,6 +949,7 @@ module.exports = function(s,config,lang,app,io){
endTime: req.query.end, endTime: req.query.end,
startTimeOperator: req.query.startOperator, startTimeOperator: req.query.startOperator,
endTimeOperator: req.query.endOperator, endTimeOperator: req.query.endOperator,
noLimit: req.query.noLimit,
limit: req.query.limit, limit: req.query.limit,
archived: req.query.archived, archived: req.query.archived,
endIsStartTo: !!req.query.endIsStartTo, endIsStartTo: !!req.query.endIsStartTo,
@ -1021,6 +1022,7 @@ module.exports = function(s,config,lang,app,io){
endTime: req.query.end, endTime: req.query.end,
startTimeOperator: req.query.startOperator, startTimeOperator: req.query.startOperator,
endTimeOperator: req.query.endOperator, endTimeOperator: req.query.endOperator,
noLimit: req.query.noLimit,
limit: req.query.limit, limit: req.query.limit,
endIsStartTo: true, endIsStartTo: true,
parseRowDetails: true, parseRowDetails: true,