Swap out those syncs

This commit is contained in:
Connor Peet 2015-01-07 15:19:06 -05:00
parent 3473b3bb00
commit 3daefcf0cf
2 changed files with 99 additions and 84 deletions

View File

@ -71,26 +71,31 @@ exp.run = function() {
var helmdir = __dirname + "/../" + config.helms_dir;
var renderdir = __dirname + "/../" + config.renders_dir;
var skindir = __dirname + "/../" + config.skins_dir;
var files = fs.readdirSync(facesdir);
for (var i = 0; i < Math.min(files.length, config.cleaning_amount); i++) {
fs.readdir(facesdir, function (err, files) {
for (var i = 0, l = Math.min(files.length, config.cleaning_amount); i < l; i++) {
var filename = files[i];
if (filename[0] != ".") {
fs.unlink(facesdir + filename, function(){});
fs.unlink(helmdir + filename, function(){});
fs.unlink(skindir + filename, function(){});
if (filename[0] !== ".") {
fs.unlink(facesdir + filename, nil);
fs.unlink(helmdir + filename, nil);
fs.unlink(skindir + filename, nil);
}
}
files = fs.readdirSync(renderdir);
for (var j = 0; j < Math.min(files.length, config.cleaning_amount); j++) {
});
fs.readdir(renderdir, function (err, files) {
for (var j = 0, l = Math.min(files.length, config.cleaning_amount); j < l; j++) {
var filename = files[j];
if (filename[0] != ".") {
fs.unlink(renderdir + filename, function(){});
if (filename[0] !== ".") {
fs.unlink(renderdir + filename, nil);
}
}
});
} else {
logging.log("DiskCleaner: Nothing to clean");
}
});
};
function nil () {}
module.exports = exp;

View File

@ -37,7 +37,8 @@ function store_images(uuid, details, callback) {
var facepath = __dirname + "/../" + config.faces_dir + hash + ".png";
var helmpath = __dirname + "/../" + config.helms_dir + hash + ".png";
if (fs.existsSync(facepath)) {
fs.exists(facepath, function (exists) {
if (exists) {
logging.log(uuid + " Avatar already exists, not downloading");
cache.save_hash(uuid, hash);
callback(null, hash);
@ -65,6 +66,7 @@ function store_images(uuid, details, callback) {
}
});
}
});
}
} else {
// profile found, but has no skin
@ -137,9 +139,12 @@ exp.get_avatar = function(uuid, helm, size, callback) {
var facepath = __dirname + "/../" + config.faces_dir + hash + ".png";
var helmpath = __dirname + "/../" + config.helms_dir + hash + ".png";
var filepath = facepath;
if (helm && fs.existsSync(helmpath)) {
fs.exists(helmpath, function (exists) {
if (helm && exists) {
filepath = helmpath;
}
skins.resize_img(filepath, size, function(img_err, result) {
if (img_err) {
callback(img_err, -1, null, hash);
@ -149,6 +154,7 @@ exp.get_avatar = function(uuid, helm, size, callback) {
callback(err, (err ? -1 : status), result, hash);
}
});
});
} else {
// hash is null when uuid has no skin
callback(err, status, null, null);
@ -162,16 +168,18 @@ exp.get_skin = function(uuid, callback) {
logging.log(uuid + " skin request");
exp.get_image_hash(uuid, function(err, status, hash) {
var skinpath = __dirname + "/../" + config.skins_dir + hash + ".png";
if (fs.existsSync(skinpath)) {
fs.exists(skinpath, function (exists) {
if (exists) {
logging.log("skin already exists, not downloading");
skins.open_skin(skinpath, function(err, img) {
callback(err, hash, img);
});
return;
}
} else {
networking.save_skin(uuid, hash, skinpath, function(err, img) {
callback(err, hash, img);
});
}
});
});
};
@ -190,7 +198,8 @@ exp.get_render = function(uuid, scale, helm, body, callback) {
return;
}
var renderpath = __dirname + "/../" + config.renders_dir + hash + "-" + scale + "-" + get_type(helm, body) + ".png";
if (fs.existsSync(renderpath)) {
fs.exists(renderpath, function (exists) {
if (exists) {
renders.open_render(renderpath, function(err, img) {
callback(err, 1, hash, img);
});
@ -215,6 +224,7 @@ exp.get_render = function(uuid, scale, helm, body, callback) {
}
});
});
});
};
module.exports = exp;