From 6746459c8d3525246daa46c74161e131f5cb4b55 Mon Sep 17 00:00:00 2001 From: jomo Date: Sun, 30 Aug 2015 03:57:29 +0200 Subject: [PATCH] delete cape images when cleaning --- lib/cleaner.js | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/lib/cleaner.js b/lib/cleaner.js index 443f2ba..26f0122 100644 --- a/lib/cleaner.js +++ b/lib/cleaner.js @@ -39,7 +39,7 @@ function should_clean_disk(callback) { prefixMultiplier: "KiB", isDisplayPrefixMultiplier: false, precision: 2 - }, function (err, response) { + }, function(err, response) { if (err) { callback(err, false); } else { @@ -71,28 +71,39 @@ exp.run = function() { logging.error(err); } else if (clean) { logging.warn("DiskCleaner: Disk limit reached! Cleaning images now"); + var skinsdir = config.directories.skins; + var capesdir = config.directories.capes; var facesdir = config.directories.faces; - var helmdir = config.directories.helms; - var renderdir = config.directories.renders; - var skindir = config.directories.skins; - fs.readdir(facesdir, function (readerr, files) { + var helmsdir = config.directories.helms; + var rendersdir = config.directories.renders; + fs.readdir(skinsdir, function(readerr, files) { if (!readerr) { for (var i = 0, l = Math.min(files.length, config.cleaner.amount); i < l; i++) { var filename = files[i]; if (filename[0] !== ".") { fs.unlink(path.join(facesdir, filename), nil); - fs.unlink(path.join(helmdir, filename), nil); - fs.unlink(path.join(skindir, filename), nil); + fs.unlink(path.join(helmsdir, filename), nil); + fs.unlink(path.join(skinsdir, filename), nil); } } } }); - fs.readdir(renderdir, function (readerr, files) { + fs.readdir(rendersdir, function(readerr, files) { if (!readerr) { for (var j = 0, l = Math.min(files.length, config.cleaner.amount); j < l; j++) { var filename = files[j]; if (filename[0] !== ".") { - fs.unlink(renderdir + filename, nil); + fs.unlink(rendersdir + filename, nil); + } + } + } + }); + fs.readdir(capesdir, function(readerr, files) { + if (!readerr) { + for (var j = 0, l = Math.min(files.length, config.cleaner.amount); j < l; j++) { + var filename = files[j]; + if (filename[0] !== ".") { + fs.unlink(capesdir + filename, nil); } } }