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

remove `videoTime` logging for events, use basic search method of power video

merge-requests/63/head
Moe 2019-03-03 09:52:23 -08:00
parent f550cd6e9b
commit cdf2e6f8c8
3 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/events.js
View File

@ -55,9 +55,6 @@ module.exports = function(s,config,lang){
s.onEventTriggerBeforeFilterExtensions.forEach(function(extender){
extender(d,filter)
})
if(s.group[d.ke].mon[d.id].open){
d.details.videoTime = s.group[d.ke].mon[d.id].open;
}
var detailString = JSON.stringify(d.details);
if(!s.group[d.ke]||!s.group[d.ke].mon[d.id]){
return s.systemLog(lang['No Monitor Found, Ignoring Request'])

7
libs/monitor.js
View File

@ -1173,13 +1173,6 @@ module.exports = function(s,config,lang){
//check if ffmpeg is recording
s.group[e.ke].mon[e.id].fswatch = fs.watch(e.dir, {encoding : 'utf8'}, (event, filename) => {
switch(event){
case'rename':
try{
s.group[e.ke].mon[e.id].open = filename.split('.')[0]
}catch(err){
s.debugLog('Failed to split filename : ',filename)
}
break;
case'change':
s.resetRecordingCheck(e)
break;

16
web/libs/js/dash2.socketio.js
View File

@ -652,18 +652,10 @@ $.ccio.globalWebsocket=function(d,user){
var newSetOfEventsWithoutChecked = {};
var eventTime
$.each(eventsToCheck,function(n,v){
try{
if(v.details.videoTime.indexOf('T') > -1){
eventTime = v.details.videoTime.split('T');
}else{
eventTime = v.details.videoTime.split(' ');
}
}catch(err){
if(v.time.indexOf('T') > -1){
eventTime = v.time.split('T');
}else{
eventTime = v.time.split(' ');
}
if(v.time.indexOf('T') > -1){
eventTime = v.time.split('T');
}else{
eventTime = v.time.split(' ');
}
eventTime[1] = eventTime[1].replace(/-/g,':'),eventTime = eventTime.join(' ');
if(eventTime === startTimeFormatted){