From cdf2e6f8c8c4208e267ed4e355d8c5fc85f34b4b Mon Sep 17 00:00:00 2001 From: Moe Date: Sun, 3 Mar 2019 09:52:23 -0800 Subject: [PATCH] remove `videoTime` logging for events, use basic search method of power video --- libs/events.js | 3 --- libs/monitor.js | 7 ------- web/libs/js/dash2.socketio.js | 16 ++++------------ 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/libs/events.js b/libs/events.js index af796a52..1c8e2961 100644 --- a/libs/events.js +++ b/libs/events.js @@ -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']) diff --git a/libs/monitor.js b/libs/monitor.js index 39b97570..ec7cde4d 100644 --- a/libs/monitor.js +++ b/libs/monitor.js @@ -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; diff --git a/web/libs/js/dash2.socketio.js b/web/libs/js/dash2.socketio.js index c8f10c6b..4a4161d6 100644 --- a/web/libs/js/dash2.socketio.js +++ b/web/libs/js/dash2.socketio.js @@ -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){