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

Manually merge !465 with some changes

axis-lock
Moe 2023-05-20 18:25:28 -07:00
parent d084745f43
commit ffb511bd15
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libs/basic.js
View File

@ -207,28 +207,28 @@ module.exports = function(s,config){
}
return url
}
s.file = function(x,e,callback){
s.file = async function(x,e,callback){
if(!e){e={}};
switch(x){
case'size':
return fs.statSync(e.filename)["size"];
break;
case'delete':
if(!e){return false;}
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 (!e) { return false; }
try{
return await fs.promises.rm(e, { force: true })
}catch(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)
})
}
})
}
break;
case'deleteFolder':
if(!e){return false;}

8
libs/timelapse.js
View File

@ -163,11 +163,11 @@ module.exports = function(s,config,lang,app,io){
limit: 1
},async function(){
s.setDiskUsedForGroup(e.ke,-(r.size / 1048576),'timelapseFrames')
s.file('delete',e.fileLocation)
const fileDirectory = getFileDirectory(folderPath);
const folderIsEmpty = (await fs.promises.readdir(folderPath)).filter(file => file.indexOf('.jpg') > -1).length === 0;
await s.file('delete', e.fileLocation);
const fileDirectory = getFileDirectory(e.fileLocation);
const folderIsEmpty = (await fs.promises.readdir(fileDirectory)).filter(file => file.indexOf('.jpg') > -1).length === 0;
if(folderIsEmpty){
await fs.rm(folderPath, { recursive: true })
await fs.rm(fileDirectory, { recursive: true })
}
})
}else{