diff --git a/cron.js b/cron.js index 7e49e3cd..02614779 100644 --- a/cron.js +++ b/cron.js @@ -113,7 +113,7 @@ const getTimelapseFrameDirectory = function(e){ try{e.details=JSON.parse(e.details)}catch(err){} } if(e.details&&e.details.dir&&e.details.dir!==''){ - return s.checkCorrectPathEnding(e.details.dir)+e.ke+'/'+e.id+'_timelapse/' + return checkCorrectPathEnding(e.details.dir)+e.ke+'/'+e.id+'_timelapse/' }else{ return videoDirectory + e.ke + '/' + e.id + '_timelapse/' } @@ -423,7 +423,7 @@ const deleteOldTimelapseFrames = async function(v){ const folderPath = foldersDeletedFrom[i]; const folderIsEmpty = (await fs.promises.readdir(folderPath)).filter(file => file.indexOf('.jpg') > -1).length === 0; if(folderIsEmpty){ - await fs.promises.rmdir(folderPath, { recursive: true }) + await fs.promises.rmdir(folderPath, { recursive: true, force: true }) } } const deleteResponse = await knexQueryPromise({ diff --git a/web/assets/js/bs5.videosTable.js b/web/assets/js/bs5.videosTable.js index 865d08de..4db680c4 100644 --- a/web/assets/js/bs5.videosTable.js +++ b/web/assets/js/bs5.videosTable.js @@ -74,8 +74,8 @@ $(document).ready(function(e){ return { monitorName: `${loadedMonitors[file.mid]?.name || file.mid}`, time: ` - ${file.start ? `
${lang.Started} ${formattedTime(file.details.start, 'DD-MM-YYYY hh:mm:ss AA')}
` : ''} - ${file.end ? `
${lang.Ended} ${formattedTime(file.details.end, 'DD-MM-YYYY hh:mm:ss AA')}
` : ''} +
${lang.Started} ${formattedTime(file.start, 'DD-MM-YYYY hh:mm:ss AA')}
+
${lang.Ended} ${formattedTime(file.end, 'DD-MM-YYYY hh:mm:ss AA')}
`, size: convertKbToHumanSize(file.size), buttons: ` @@ -95,7 +95,6 @@ $(document).ready(function(e){ e.preventDefault() var monitorId = getRowsMonitorId(this) openTab(`videosTableView`,{},null,null,null,() => { - console.log(monitorId) drawMonitorListToSelector(monitorsList) monitorsList.val(monitorId) drawVideosTableViewElements()