azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-03-22 07:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle several unhandled errors - this is becoming a mess and we should really use a package to clean this up - closes #113

Browse Source
This commit is contained in:
Jake 2015-06-25 13:26:27 -05:00
parent 1f4e5430b7
commit e9071b123c
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/skins.js
View File

@ -39,8 +39,10 @@ exp.extract_helm = function(rid, facefile, buffer, outname, callback) {
callback(open_err); callback(open_err);
} else { } else {
face_img.toBuffer("png", { compression: "none" }, function(buf_err, face_buffer) { face_img.toBuffer("png", { compression: "none" }, function(buf_err, face_buffer) {
// FIXME: buf_err is not handled if (buf_err) {
skin_img.crop(40, 8, 47, 15, function(crop_err, helm_img) { callback(buf_err);
} else {
skin_img.crop(40, 8, 47, 15, function(crop_err, helm_img) {
if (crop_err) { if (crop_err) {
callback(crop_err); callback(crop_err);
} else { } else {
@ -53,14 +55,17 @@ exp.extract_helm = function(rid, facefile, buffer, outname, callback) {
callback(null); callback(null);
} else { } else {
face_helm_img.toBuffer("png", {compression: "none"}, function(buf_err2, face_helm_buffer) { face_helm_img.toBuffer("png", {compression: "none"}, function(buf_err2, face_helm_buffer) {
// FIXME: buf_err2 is not handled if (buf_err2) {
if (face_helm_buffer.toString() !== face_buffer.toString()) { callback(buf_err2)
face_helm_img.writeFile(outname, function(write_err) {
callback(write_err);
});
} else { } else {
logging.log(rid, "helm img == face img, not storing!"); if (face_helm_buffer.toString() !== face_buffer.toString()) {
callback(null); face_helm_img.writeFile(outname, function(write_err) {
callback(write_err);
});
} else {
logging.log(rid, "helm img == face img, not storing!");
callback(null);
}
} }
}); });
} }
@ -68,6 +73,7 @@ exp.extract_helm = function(rid, facefile, buffer, outname, callback) {
}); });
} }
}); });
}
}); });
} }
}); });
@ -85,8 +91,11 @@ exp.resize_img = function(inname, size, callback) {
image.batch() image.batch()
.resize(size, size, "nearest-neighbor") // nearest-neighbor doesn't blur .resize(size, size, "nearest-neighbor") // nearest-neighbor doesn't blur
.toBuffer("png", function(buf_err, buffer) { .toBuffer("png", function(buf_err, buffer) {
// FIXME: buf_err is not handled if (buf_err) {
callback(null, buffer); callback(buf_err, null);
} else {
callback(null, buffer);
}
}); });
} }
}); });