Skip to content

Commit 337f4e8

Browse files
lambda-zhangsolderzzc
authored andcommitted
remove all unused images and dirs
1 parent ac878df commit 337f4e8

2 files changed

Lines changed: 26 additions & 6 deletions

File tree

src/detector/face_motions.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function get_device_group_id(cb){
4848
}
4949
function remove_face_motion_images(cameraId,trackerId){
5050
var saving_path = 'face_motion/'+trackerId+'/'
51-
makegif.removeUnusedImageDir(saving_path)
51+
makegif.removeUnusedImageDir(saving_path, 'face_motion/')
5252
}
5353
function do_generate_gif_and_upload(cameraId,trackerId,whole_file,name_sorting,cb){
5454

@@ -112,7 +112,7 @@ function do_generate_gif_and_upload(cameraId,trackerId,whole_file,name_sorting,c
112112
send_face_motion_event_to_event_server(group_id,uuid,'activity',cameraId,url)
113113
}
114114
}
115-
//makegif.removeUnusedImageDir(saving_path);
115+
//makegif.removeUnusedImageDir(saving_path, 'face_motion/');
116116
})
117117
})
118118
})

src/detector/makegif.js

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ function generateGif(type,dir,name_sorting,cb){
5555
});
5656
}
5757

58-
function deleteFolderRecursive(path) {
59-
if(!REMOVE_IMG_UPLOADED)
60-
return;
61-
58+
function _deleteFolderRecursive(path) {
6259
if( fs.existsSync(path) ) {
6360
fs.readdirSync(path).forEach(function(file) {
6461
var curPath = path + "/" + file;
@@ -72,6 +69,29 @@ function deleteFolderRecursive(path) {
7269
}
7370
};
7471

72+
73+
function deleteFolderRecursive(path, face_motion_path) {
74+
if(!REMOVE_IMG_UPLOADED)
75+
return;
76+
77+
// remove current unused images
78+
_deleteFolderRecursive(path)
79+
80+
// remove all unused images and dirs
81+
if( fs.existsSync(face_motion_path) ) {
82+
fs.readdirSync(face_motion_path).forEach(function(dir) {
83+
var curPath = face_motion_path + "/" + dir;
84+
var dirstat = fs.statSync(curPath)
85+
if (dirstat && dirstat.ctime) {
86+
var tsdir = new Date(dirstat.ctime).getTime()
87+
if ((tsdir + 10*60*1000) < new Date().getTime() && fs.statSync(curPath).isDirectory()) {
88+
_deleteFolderRecursive(face_motion_path + '/' + dir)
89+
}
90+
}
91+
});
92+
}
93+
};
94+
7595
module.exports = {
7696
generateGif : generateGif,
7797
removeUnusedImageDir: deleteFolderRecursive

0 commit comments

Comments
 (0)