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

add loadedEventsInMemory container

fix-timezone-by-ui
Moe 2022-10-16 12:12:28 -07:00
parent a47458795f
commit b250e8a7d5
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/assets/js/bs5.videos.js
View File

@ -1,4 +1,5 @@
var loadedVideosInMemory = {}
var loadedEventsInMemory = {}
var loadedFramesMemory = {}
var loadedFramesMemoryTimeout = {}
var loadedFramesLock = {}
@ -435,9 +436,16 @@ function drawVideoRowsToList(targetElement,rows){
})
liveStamp()
}
function loadVideoData(video){
delete(video.f)
loadedVideosInMemory[`${video.mid}${video.time}`] = video
function loadVideosData(newVideos){
$.each(newVideos,function(n,video){
delete(video.f)
loadedVideosInMemory[`${video.mid}${video.time}`] = video
})
}
function loadEventsData(videoEvents){
videoEvents.forEach((anEvent) => {
loadedEventsInMemory[`${anEvent.mid}${anEvent.time}`] = anEvent
})
}
function getVideos(options,callback){
return new Promise((resolve,reject) => {
@ -474,11 +482,11 @@ function getVideos(options,callback){
})
$.getJSON(`${getApiPrefix(`timelapse`)}${monitorId ? `/${monitorId}` : ''}?${requestQueries.concat([`noLimit=1`]).join('&')}`,function(timelapseFrames){
$.getJSON(`${getApiPrefix(`events`)}${monitorId ? `/${monitorId}` : ''}?${requestQueries.concat([`limit=${limit}`]).join('&')}`,function(eventData){
var newVideos = applyDataListToVideos(videos,eventData.events || eventData)
var theEvents = eventData.events || eventData;
var newVideos = applyDataListToVideos(videos,theEvents)
newVideos = applyTimelapseFramesListToVideos(newVideos,timelapseFrames.frames || timelapseFrames,'timelapseFrames',true)
$.each(newVideos,function(n,video){
loadVideoData(video)
})
loadEventsData(theEvents)
loadVideosData(newVideos)
if(callback)callback({videos: newVideos, frames: timelapseFrames});
resolve({videos: newVideos, frames: timelapseFrames})
})