azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-03-21 23:41:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move extraction logic

Browse Source
This commit is contained in:
Jake 2014-11-29 10:55:51 -06:00
parent 2cc7b455af
commit caf7c731da
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/helpers.js
View File

@ -36,12 +36,22 @@ function store_images(uuid, details, callback) {
var facepath = __dirname + '/../' + config.faces_dir + hash + ".png"; var facepath = __dirname + '/../' + config.faces_dir + hash + ".png";
var helmpath = __dirname + '/../' + config.helms_dir + hash + ".png"; var helmpath = __dirname + '/../' + config.helms_dir + hash + ".png";
// download skin, extract face/helm // download skin, extract face/helm
networking.skin_file(skin_url, facepath, helmpath, function(err) { networking.skin_file(skin_url, facepath, helmpath, function(err, img) {
if (err) { if (err) {
callback(err, null); callback(err, null);
} else { } else {
cache.save_hash(uuid, hash); skins.extract_face(img, facepath, function(err) {
callback(null, hash); if (err) {
callback(err);
} else {
logging.log(facepath + " face extracted");
skins.extract_helm(facepath, img, helmpath, function(err) {
logging.log(helmpath + " helm extracted.");
cache.save_hash(uuid, hash);
callback(err, hash);
});
}
});
} }
}); });
} }

14
modules/networking.js
View File

@ -116,17 +116,7 @@ exp.skin_file = function(url, facename, helmname, callback) {
if (!error && response.statusCode == 200) { if (!error && response.statusCode == 200) {
// skin downloaded successfully // skin downloaded successfully
logging.log(url + " skin downloaded"); logging.log(url + " skin downloaded");
skins.extract_face(body, facename, function(err) { callback(error, body);
if (err) {
callback(err);
} else {
logging.log(facename + " face extracted");
skins.extract_helm(facename, body, helmname, function(err) {
logging.log(helmname + " helm extracted.");
callback(err);
});
}
});
} else { } else {
if (error) { if (error) {
logging.error("Error downloading '" + url + "': " + error); logging.error("Error downloading '" + url + "': " + error);
@ -143,7 +133,7 @@ exp.skin_file = function(url, facename, helmname, callback) {
logging.error(body); logging.error(body);
error = "unknown error"; // Error needs to be set, otherwise null in callback error = "unknown error"; // Error needs to be set, otherwise null in callback
} }
callback(error); callback(error, null);
} }
}); });
}; };