diff --git a/libs/basic.js b/libs/basic.js index 1c427714..a12d8a69 100644 --- a/libs/basic.js +++ b/libs/basic.js @@ -215,18 +215,18 @@ module.exports = function(s,config){ break; case'delete': if(!e){return false;} - fs.unlink(e,(err)=>{ + fs.rm(e,(err)=>{ if(err){ s.debugLog(err) - } - if(s.isWin){ - exec('rd /s /q "' + e + '"',{detached: true},function(err){ - if(callback)callback(err) - }) - }else{ - exec('rm -rf '+e,{detached: true},function(err){ - if(callback)callback(err) - }) + if(s.isWin){ + exec('rd /s /q "' + e + '"',{detached: true},function(err){ + if(callback)callback(err) + }) + }else{ + exec('rm -rf '+e,{detached: true},function(err){ + if(callback)callback(err) + }) + } } }) break; diff --git a/libs/dropInEvents.js b/libs/dropInEvents.js index 7273746d..a1d4c3bf 100644 --- a/libs/dropInEvents.js +++ b/libs/dropInEvents.js @@ -39,7 +39,7 @@ module.exports = function(s,config,lang,app,io){ var filename = getFileNameFromPath(filePath) if(search(filename,'.jpg') || search(filename,'.jpeg')){ var snapPath = s.dir.streams + ke + '/' + mid + '/s.jpg' - fs.unlink(snapPath,function(err){ + fs.rm(snapPath,function(err){ fs.createReadStream(filePath).pipe(fs.createWriteStream(snapPath)) triggerEvent({ id: mid, diff --git a/libs/ffmpeg.js b/libs/ffmpeg.js index 70f78442..6cd38840 100644 --- a/libs/ffmpeg.js +++ b/libs/ffmpeg.js @@ -59,7 +59,7 @@ module.exports = async (s,config,lang,onFinish) => { //clean the string of spatial impurities and split for spawn() const ffmpegCommandParsed = splitForFFPMEG(ffmpegCommandString) try{ - fs.unlinkSync(e.sdir + 'cmd.txt') + fs.rmSync(e.sdir + 'cmd.txt') }catch(err){ } diff --git a/libs/monitor.js b/libs/monitor.js index ce42509b..cba83f5e 100644 --- a/libs/monitor.js +++ b/libs/monitor.js @@ -191,7 +191,7 @@ module.exports = function(s,config,lang){ screenShot: buffer, isStaticFile: false }) - fs.unlink(temporaryImageFile,function(){}) + fs.rm(temporaryImageFile,function(){}) }else{ resolve({ screenShot: null, diff --git a/libs/monitor/utils.js b/libs/monitor/utils.js index bccd5cec..90ee72f5 100644 --- a/libs/monitor/utils.js +++ b/libs/monitor/utils.js @@ -151,7 +151,7 @@ module.exports = (s,config,lang) => { } const completeRequest = () => { fs.readFile(temporaryImageFile,(err,imageBuffer) => { - fs.unlink(temporaryImageFile,(err) => { + fs.rm(temporaryImageFile,(err) => { if(err){ s.debugLog(err) } diff --git a/libs/user/utils.js b/libs/user/utils.js index f1e486e3..fe6b617e 100644 --- a/libs/user/utils.js +++ b/libs/user/utils.js @@ -150,7 +150,6 @@ module.exports = (s,config,lang) => { var completedCheck = 0 if(files){ files.forEach(function(file){ - var dir = s.getFileBinDirectory(file) s.debugLog(`deleting FileBin File`,`${file}`,dir) var fileLocationMid = `${dir}` + file.name diff --git a/libs/videos.js b/libs/videos.js index 4249311e..3cf8d5df 100644 --- a/libs/videos.js +++ b/libs/videos.js @@ -251,12 +251,7 @@ module.exports = function(s,config,lang){ s.systemLog(lang['File Delete Error'] + ' : '+e.ke+' : '+' : '+e.id,err) } }) - fs.unlink(e.dir+filename,function(err){ - fs.stat(e.dir+filename,function(err){ - if(!err){ - s.file('delete',e.dir+filename) - } - }) + fs.rm(e.dir+filename,function(err){ resolve() }) }) @@ -309,7 +304,7 @@ module.exports = function(s,config,lang){ }else{ s.setDiskUsedForGroup(video.ke,-(video.size / 1048576)) } - fs.unlink(video.dir + filename,function(err){ + fs.rm(video.dir + filename,function(err){ fs.stat(video.dir + filename,function(err){ if(!err){ s.file('delete',video.dir + filename) diff --git a/libs/webServerSuperPaths.js b/libs/webServerSuperPaths.js index e8698036..b49bd260 100644 --- a/libs/webServerSuperPaths.js +++ b/libs/webServerSuperPaths.js @@ -483,7 +483,7 @@ module.exports = function(s,config,lang,app){ } }) fs.chmod(s.dir.videos+account.ke,0o777,function(err){ - fs.unlink(s.dir.videos+account.ke,function(err){}) + fs.rmdir(s.dir.videos+account.ke,function(err){}) }) } if(s.getPostData(req,'deleteEvents',false) == '1'){ diff --git a/plugins/face/faceManagerCustomAutoLoadLibrary/index.js b/plugins/face/faceManagerCustomAutoLoadLibrary/index.js index bbe12e28..c8a990c0 100644 --- a/plugins/face/faceManagerCustomAutoLoadLibrary/index.js +++ b/plugins/face/faceManagerCustomAutoLoadLibrary/index.js @@ -58,8 +58,7 @@ module.exports = function(s,config,lang,app,io){ } const deletePath = (deletionPath,callback) => { if(fs.existsSync(deletionPath)){ - fs.unlink(deletionPath,() => { - s.file('delete',deletionPath) + fs.rm(deletionPath,() => { if(callback)callback() }) }else{ @@ -155,8 +154,7 @@ module.exports = function(s,config,lang,app,io){ if(fileExists){ fs.readFile(oldImagePath,(err,data) => { fs.writeFile(newImagePath,data,() => { - fs.unlink(oldImagePath,() => { - s.file('delete',oldImagePath) + fs.rm(oldImagePath,() => { if(req.query.websocketResponse){ sendDataToConnectedSuperUsers({ f:'faceManagerImageDeleted', diff --git a/plugins/face/shinobi-face.js b/plugins/face/shinobi-face.js index b8f6aaac..b5c5757d 100644 --- a/plugins/face/shinobi-face.js +++ b/plugins/face/shinobi-face.js @@ -227,7 +227,7 @@ var addAwaitStatements = async function(){ if(!err){ detectStuff(buffer) } - fs.unlink(frameLocation,function(){ + fs.rm(frameLocation,function(){ }) }) diff --git a/plugins/platerecognizer/shinobi-platerecognizer.js b/plugins/platerecognizer/shinobi-platerecognizer.js index 1eca234a..22189c2c 100644 --- a/plugins/platerecognizer/shinobi-platerecognizer.js +++ b/plugins/platerecognizer/shinobi-platerecognizer.js @@ -96,7 +96,7 @@ function platerecognizerRequest(d,frameBuffer){ console.log(body) } resolve(predictions); - fs.unlink(filePath,function(){ + fs.rm(filePath,function(){ }) }) diff --git a/plugins/yolo/shinobi-yolo.js b/plugins/yolo/shinobi-yolo.js index d40cd1dc..e5b9e864 100644 --- a/plugins/yolo/shinobi-yolo.js +++ b/plugins/yolo/shinobi-yolo.js @@ -76,7 +76,7 @@ s.detectObject = async function(buffer,d,tx,frameLocation,callback){ frame: frame }) } - fs.unlink(frame,function(){ + fs.rm(frame,function(){ }) }catch(err){