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

fix some syntax errors

cron-as-worker-process
Moe 2022-06-28 18:43:53 -07:00
parent 026ee4d6a2
commit 371085a3ba
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cron.js
View File

@ -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({

5
web/assets/js/bs5.videosTable.js
View File

@ -74,8 +74,8 @@ $(document).ready(function(e){
return {
monitorName: `<b>${loadedMonitors[file.mid]?.name || file.mid}</b>`,
time: `
${file.start ? `<div><b>${lang.Started}</b> ${formattedTime(file.details.start, 'DD-MM-YYYY hh:mm:ss AA')}</div>` : ''}
${file.end ? `<div><b>${lang.Ended}</b> ${formattedTime(file.details.end, 'DD-MM-YYYY hh:mm:ss AA')}</div>` : ''}
<div><b>${lang.Started}</b> ${formattedTime(file.start, 'DD-MM-YYYY hh:mm:ss AA')}</div>
<div><b>${lang.Ended}</b> ${formattedTime(file.end, 'DD-MM-YYYY hh:mm:ss AA')}</div>
`,
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()