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

join cape_hash and skin_hash into same variable

Browse Source 
only one of them is used at the same time. we're already passing the +type+ so we know which one it is
This commit is contained in:
jomo 2015-01-28 23:41:15 +01:00
parent 646746325f
commit 73f5b6b182
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/helpers.js
View File

@ -99,11 +99,11 @@ function store_cape(uuid, profile, details, callback) {
// image type should be called back on // image type should be called back on
// +callback+ contains the error buffer and image hash // +callback+ contains the error buffer and image hash
var currently_running = []; var currently_running = [];
function callback_for(uuid, type, err, cape_hash, skin_hash) { function callback_for(uuid, type, err, hash) {
for (var i = 0; i < currently_running.length; i++) { for (var i = 0; i < currently_running.length; i++) {
if (currently_running[i].uuid === uuid && (currently_running[i].type === type || type === null)) { if (currently_running[i].uuid === uuid && (currently_running[i].type === type || type === null)) {
var will_call = currently_running[i]; var will_call = currently_running[i];
will_call.callback(err, will_call.type === 'skin' ? skin_hash : cape_hash); will_call.callback(err, hash);
currently_running.splice(i, 1); // remove from array currently_running.splice(i, 1); // remove from array
i--; i--;
} }
@ -126,14 +126,14 @@ function store_images(uuid, details, type, callback) {
currently_running.push(new_hash); currently_running.push(new_hash);
networking.get_profile((isUUID ? uuid : null), function(err, profile) { networking.get_profile((isUUID ? uuid : null), function(err, profile) {
if (err || (isUUID && !profile)) { if (err || (isUUID && !profile)) {
callback_for(uuid, err, null, null); callback_for(uuid, err, null);
} else { } else {
store_skin(uuid, profile, details, function(err, skin_hash) { store_skin(uuid, profile, details, function(err, skin_hash) {
cache.save_hash(uuid, skin_hash, null); cache.save_hash(uuid, skin_hash, null);
callback_for(uuid, 'skin', err, null, skin_hash); callback_for(uuid, 'skin', err, skin_hash);
store_cape(uuid, profile, details, function(err, cape_hash) { store_cape(uuid, profile, details, function(err, cape_hash) {
cache.save_hash(uuid, skin_hash, cape_hash); cache.save_hash(uuid, skin_hash, cape_hash);
callback_for(uuid, 'cape', err, cape_hash, skin_hash); callback_for(uuid, 'cape', err, cape_hash);
}); });
}); });
} }