Jake před 10 roky
rodič
revize
dbd66f88a5
3 změnil soubory, kde provedl 11 přidání a 6 odebrání
  1. 1 1
      modules/cache.js
  2. 8 2
      modules/helpers.js
  3. 2 3
      modules/renders.js

+ 1 - 1
modules/cache.js

@@ -16,7 +16,7 @@ function connect_redis() {
   }
   redis.on("ready", function() {
     logging.log("Redis connection established.");
-    if(process.env.HEROKU) {
+    if(process.env.HEROKU || true) {
       logging.log("Running on heroku, flushing redis");
       redis.flushall();
     }

+ 8 - 2
modules/helpers.js

@@ -174,6 +174,11 @@ exp.get_skin = function(uuid, callback) {
   });
 };
 
+function get_type(helm, body) {
+  var text = body ? "body" : "head"
+  return helm ? text+"helm" : text
+}
+
 // handles creations of skin renders
 // callback contanis error, hash, image buffer
 exp.get_render = function(uuid, scale, helm, body, callback) {
@@ -184,9 +189,10 @@ exp.get_render = function(uuid, scale, helm, body, callback) {
         callback(err, -1, hash, null);
         return;
       }
-      var renderpath = __dirname + "/../" + config.renders_dir + hash + "-" + scale + ".png"; 
+      console.log("TYPE: " + get_type(helm, body))
+      var renderpath = __dirname + "/../" + config.renders_dir + hash + "-" + scale + "-" + "-" + get_type(helm, body) + ".png"; 
       if (fs.existsSync(renderpath)) {
-        renders.open_render(hash, scale, function(err, img) {
+        renders.open_render(renderpath, function(err, img) {
           callback(err, 1, hash, img);
         });
         return;

+ 2 - 3
modules/renders.js

@@ -4,7 +4,6 @@
 
 var helpers = require('./helpers');
 var logging = require('./logging');
-var config = require('./config');
 var fs = require('fs');
 
 var exp = {};
@@ -120,8 +119,8 @@ exp.draw_model = function(uuid, img, scale, helm, body, callback) {
   image.src = img;
 }
 
-exp.open_render = function(hash, scale, callback) {
-  fs.readFile(__dirname + "/../" + config.renders_dir + hash + "-" + scale + ".png", function (err, buf) {
+exp.open_render = function(renderpath, callback) {
+  fs.readFile(renderpath, function (err, buf) {
     if (err) {
       logging.error("error while opening skin file: " + err);
     }