mirror of
https://github.com/azures04/crafatar.git
synced 2026-03-21 23:41:18 +01:00
Handle several unhandled errors - this is becoming a mess and we should really use a package to clean this up - closes #113
This commit is contained in:
parent
1f4e5430b7
commit
e9071b123c
15
lib/skins.js
15
lib/skins.js
@ -39,7 +39,9 @@ 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) {
|
||||||
|
callback(buf_err);
|
||||||
|
} else {
|
||||||
skin_img.crop(40, 8, 47, 15, function(crop_err, helm_img) {
|
skin_img.crop(40, 8, 47, 15, function(crop_err, helm_img) {
|
||||||
if (crop_err) {
|
if (crop_err) {
|
||||||
callback(crop_err);
|
callback(crop_err);
|
||||||
@ -53,7 +55,9 @@ 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) {
|
||||||
|
callback(buf_err2)
|
||||||
|
} else {
|
||||||
if (face_helm_buffer.toString() !== face_buffer.toString()) {
|
if (face_helm_buffer.toString() !== face_buffer.toString()) {
|
||||||
face_helm_img.writeFile(outname, function(write_err) {
|
face_helm_img.writeFile(outname, function(write_err) {
|
||||||
callback(write_err);
|
callback(write_err);
|
||||||
@ -62,12 +66,14 @@ exp.extract_helm = function(rid, facefile, buffer, outname, callback) {
|
|||||||
logging.log(rid, "helm img == face img, not storing!");
|
logging.log(rid, "helm img == face img, not storing!");
|
||||||
callback(null);
|
callback(null);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -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(buf_err, null);
|
||||||
|
} else {
|
||||||
callback(null, buffer);
|
callback(null, buffer);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user