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

allow comma delimited searchQuery

master
Moe 2024-10-24 16:30:30 -07:00
parent 0331a70555
commit 384752a422
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/video/utils.js
View File

@ -246,14 +246,19 @@ module.exports = (s,config,lang) => {
searchQuery,
monitorRestrictions
}){
const theSearches = searchQuery.split(',').map(query => ['objects','LIKE',`%${query}%`]);
const lastIndex = theSearches.length - 1;
theSearches.forEach(function(item, n){
if(n !== 0)theSearches[n] = ['or', ...item];
});
const initialEventQuery = [
['ke','=',groupKey],
['objects','LIKE',`%${searchQuery}%`],
]
];
if(monitorId)initialEventQuery.push(['mid','=',monitorId]);
if(startTime)initialEventQuery.push(['time','>',startTime]);
if(endTime)initialEventQuery.push(['end','<',endTime]);
if(monitorRestrictions)initialEventQuery.push(monitorRestrictions);
if(monitorRestrictions.length > 0)initialEventQuery.push(monitorRestrictions);
initialEventQuery.push([...theSearches]);
const videoSelectResponse = await s.knexQueryPromise({
action: "select",
columns: "*",
@ -856,9 +861,9 @@ module.exports = (s,config,lang) => {
});
ffmpegProcess.on('close', (code) => {
if (code === 0) {
if(code === 0){
resolve(buffer);
} else {
}else{
reject(new Error(`FFmpeg process exited with code ${code}`));
}
});