From c4284999596b85ba0f5ce0b94f8fd1351b1bb26c Mon Sep 17 00:00:00 2001
From: Jake <jake0oo0andminecraft@gmail.com>
Date: Mon, 26 Jan 2015 22:31:35 -0600
Subject: [PATCH] Finish merging

---
 modules/helpers.js    | 8 ++++----
 modules/networking.js | 2 +-
 modules/skins.js      | 2 +-
 test/bulk.sh          | 6 +-----
 test/test.js          | 8 --------
 views/index.jade      | 4 ----
 6 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/modules/helpers.js b/modules/helpers.js
index d72b0d5..484f1bb 100644
--- a/modules/helpers.js
+++ b/modules/helpers.js
@@ -41,7 +41,7 @@ function store_skin(uuid, profile, details, callback) {
                     callback(err, null);
                   } else {
                     logging.log(uuid + " face extracted");
-                    skins.extract_helm(facepath, img, helmpath, function(err) {
+                    skins.extract_helm(uuid, facepath, img, helmpath, function(err) {
                       logging.log(uuid + " helm extracted");
                       logging.debug(helmpath);
                       callback(err, hash);
@@ -241,7 +241,7 @@ exp.get_skin = function(uuid, callback) {
           callback(err, hash, img);
         });
       } else {
-        networking.save_skin(uuid, hash, skinpath, function(err, img) {
+        networking.save_texture(uuid, hash, skinpath, function(err, img) {
           callback(err, hash, img);
         });
       }
@@ -303,7 +303,7 @@ exp.get_skin = function(uuid, callback) {
     fs.exists(skinpath, function(exists) {
       if (exists) {
         logging.log("skin already exists, not downloading");
-        skins.open_skin(skinpath, function(err, img) {
+        skins.open_skin(uuid, skinpath, function(err, img) {
           callback(err, hash, img);
         });
       } else {
@@ -328,7 +328,7 @@ exp.get_cape = function(uuid, callback) {
     fs.exists(capepath, function(exists) {
       if (exists) {
         logging.log("cape already exists, not downloading");
-        skins.open_skin(capepath, function(err, img) {
+        skins.open_skin(uuid, capepath, function(err, img) {
           callback(err, hash, img);
         });
       } else {
diff --git a/modules/networking.js b/modules/networking.js
index 9354f00..fe2f9bb 100644
--- a/modules/networking.js
+++ b/modules/networking.js
@@ -41,7 +41,7 @@ exp.extract_cape_url = function(profile) {
 // specified. +callback+ contains the body, response,
 // and error buffer. get_from helper method is available
 exp.get_from_options = function(url, options, callback) {
-  request.get({
+  request({
     url: url,
     headers: {
       "User-Agent": "https://crafatar.com"
diff --git a/modules/skins.js b/modules/skins.js
index 664e7e7..ab7b42b 100644
--- a/modules/skins.js
+++ b/modules/skins.js
@@ -96,7 +96,7 @@ exp.default_skin = function(uuid) {
 // helper method for opening a skin file from +skinpath+
 // callback contains error, image buffer
 exp.open_skin = function(uuid, skinpath, callback) {
-  fs.readFile(skinpath, function (err, buf) {
+  fs.readFile(skinpath, function(err, buf) {
     if (err) {
       logging.error(uuid + " error while opening skin file: " + err);
     }
diff --git a/test/bulk.sh b/test/bulk.sh
index 0076254..bbbac09 100755
--- a/test/bulk.sh
+++ b/test/bulk.sh
@@ -14,8 +14,4 @@ for uuid in `cat "$dir/uuids.txt"`; do
     helm="&helm"
   fi
   curl -sSL -o /dev/null -w "%{url_effective} %{http_code} %{time_total}s\\n" "http://$host/avatars/$uuid?size=$size$helm"
-<<<<<<< HEAD
-done
-=======
-done
->>>>>>> Network rewrite/major cleanup, major caching changes, etc
+done
\ No newline at end of file
diff --git a/test/test.js b/test/test.js
index 8268b96..369d476 100644
--- a/test/test.js
+++ b/test/test.js
@@ -145,11 +145,7 @@ describe("Crafatar", function() {
     it("should time out on skin download", function(done) {
       var original_timeout = config.http_timeout;
       config.http_timeout = 1;
-<<<<<<< HEAD
       networking.get_skin("http://textures.minecraft.net/texture/477be35554684c28bdeee4cf11c591d3c88afb77e0b98da893fd7bc318c65184", uuid, function(err, img) {
-=======
-      networking.get_from("http://textures.minecraft.net/texture/477be35554684c28bdeee4cf11c591d3c88afb77e0b98da893fd7bc318c65184", function(img, response, err) {
->>>>>>> Network rewrite/major cleanup, major caching changes, etc
         assert.strictEqual(err.code, "ETIMEDOUT");
         config.http_timeout = original_timeout;
         done();
@@ -157,11 +153,7 @@ describe("Crafatar", function() {
     });
     it("should not find the skin", function(done) {
       assert.doesNotThrow(function() {
-<<<<<<< HEAD
-        networking.get_skin("http://textures.minecraft.net/texture/this-does-not-exist", uuid, function(err, img) {
-=======
         networking.get_from("http://textures.minecraft.net/texture/this-does-not-exist", function(img, response, err) {
->>>>>>> Network rewrite/major cleanup, major caching changes, etc
           assert.strictEqual(err, null); // no error here, but it shouldn't throw exceptions
           done();
         });
diff --git a/views/index.jade b/views/index.jade
index e876773..d13f4db 100644
--- a/views/index.jade
+++ b/views/index.jade
@@ -371,8 +371,4 @@ block content
   img.preload(src="/avatars/020242a17b9441799eff511eea1221da?size=64&helm", alt="preloaded image")
   img.preload(src="/avatars/9769ecf6331448f3ace67ae06cec64a3?size=64&helm", alt="preloaded image")
   img.preload(src="/avatars/f8cdb6839e9043eea81939f85d9c5d69?size=64&helm", alt="preloaded image")
-<<<<<<< HEAD
   img.preload(src="/skins/jeb_", alt="preloaded image")
-=======
-  img.preload(src="/skins/jeb_", alt="preloaded image")
->>>>>>> Network rewrite/major cleanup, major caching changes, etc