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

Merge branch 'unlink-to-rm' into 'dev' 

Change use cases of fs.unlink with fs.rm

See merge request Shinobi-Systems/Shinobi!406
fix-permissions
Moe 2022-11-16 21:10:26 +00:00
parent c25aec5f7b 335cf7398e
commit e5569f4b44
12 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/basic.js
View File

@ -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;

2
libs/dropInEvents.js
View File

@ -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,

2
libs/ffmpeg.js
View File

@ -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){
}

2
libs/monitor.js
View File

@ -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,

2
libs/monitor/utils.js
View File

@ -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)
}

1
libs/user/utils.js
View File

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

9
libs/videos.js
View File

@ -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)

2
libs/webServerSuperPaths.js
View File

@ -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'){

6
plugins/face/faceManagerCustomAutoLoadLibrary/index.js
View File

@ -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',

2
plugins/face/shinobi-face.js
View File

@ -227,7 +227,7 @@ var addAwaitStatements = async function(){
if(!err){
detectStuff(buffer)
}
fs.unlink(frameLocation,function(){
fs.rm(frameLocation,function(){
})
})

2
plugins/platerecognizer/shinobi-platerecognizer.js
View File

@ -96,7 +96,7 @@ function platerecognizerRequest(d,frameBuffer){
console.log(body)
}
resolve(predictions);
fs.unlink(filePath,function(){
fs.rm(filePath,function(){
})
})

2
plugins/yolo/shinobi-yolo.js
View File

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