mirror of
https://github.com/azures04/crafatar.git
synced 2026-03-21 23:41:18 +01:00
unify quotes again
This commit is contained in:
parent
e7cec3556a
commit
0ce77ac110
16
app.js
16
app.js
@ -4,10 +4,10 @@ var logger = require("morgan");
|
|||||||
var cookieParser = require("cookie-parser");
|
var cookieParser = require("cookie-parser");
|
||||||
var bodyParser = require("body-parser");
|
var bodyParser = require("body-parser");
|
||||||
|
|
||||||
var routes = require('./routes/index');
|
var routes = require("./routes/index");
|
||||||
var avatars = require('./routes/avatars');
|
var avatars = require("./routes/avatars");
|
||||||
var skins = require('./routes/skins');
|
var skins = require("./routes/skins");
|
||||||
var renders = require('./routes/renders');
|
var renders = require("./routes/renders");
|
||||||
|
|
||||||
var app = express();
|
var app = express();
|
||||||
|
|
||||||
@ -21,10 +21,10 @@ app.use(bodyParser.urlencoded({ extended: false }));
|
|||||||
app.use(cookieParser());
|
app.use(cookieParser());
|
||||||
app.use(express.static(path.join(__dirname, "public")));
|
app.use(express.static(path.join(__dirname, "public")));
|
||||||
|
|
||||||
app.use('/', routes);
|
app.use("/", routes);
|
||||||
app.use('/avatars', avatars);
|
app.use("/avatars", avatars);
|
||||||
app.use('/skins', skins);
|
app.use("/skins", skins);
|
||||||
app.use('/renders', renders);
|
app.use("/renders", renders);
|
||||||
|
|
||||||
// catch 404 and forward to error handler
|
// catch 404 and forward to error handler
|
||||||
app.use(function(req, res, next) {
|
app.use(function(req, res, next) {
|
||||||
|
|||||||
@ -32,7 +32,7 @@ function should_clean_redis(callback) {
|
|||||||
function should_clean_disk(callback) {
|
function should_clean_disk(callback) {
|
||||||
df({
|
df({
|
||||||
file: __dirname + "/../" + config.faces_dir,
|
file: __dirname + "/../" + config.faces_dir,
|
||||||
prefixMultiplier: 'KiB',
|
prefixMultiplier: "KiB",
|
||||||
isDisplayPrefixMultiplier: false,
|
isDisplayPrefixMultiplier: false,
|
||||||
precision: 2
|
precision: 2
|
||||||
}, function (err, response) {
|
}, function (err, response) {
|
||||||
|
|||||||
@ -9,10 +9,10 @@ var config = {
|
|||||||
cleaning_redis_limit: 24576, // max allowed used KB on redis to trigger redis flush
|
cleaning_redis_limit: 24576, // max allowed used KB on redis to trigger redis flush
|
||||||
cleaning_amount: 50000, // amount of avatar (and their helm) files to clean
|
cleaning_amount: 50000, // amount of avatar (and their helm) files to clean
|
||||||
http_timeout: 1000, // ms until connection to mojang is dropped
|
http_timeout: 1000, // ms until connection to mojang is dropped
|
||||||
faces_dir: 'skins/faces/', // directory where faces are kept. should have trailing '/'
|
faces_dir: "skins/faces/", // directory where faces are kept. should have trailing "/"
|
||||||
helms_dir: 'skins/helms/', // directory where helms are kept. should have trailing '/'
|
helms_dir: "skins/helms/", // directory where helms are kept. should have trailing "/"
|
||||||
skins_dir: 'skins/skins/', // directory where skins are kept. should have trailing '/'
|
skins_dir: "skins/skins/", // directory where skins are kept. should have trailing "/"
|
||||||
renders_dir: 'skins/renders/', // Directory where rendered skins are kept. should have trailing '/'
|
renders_dir: "skins/renders/", // Directory where rendered skins are kept. should have trailing "/"
|
||||||
debug_enabled: false, // enables logging.debug
|
debug_enabled: false, // enables logging.debug
|
||||||
min_scale: 1, // for renders
|
min_scale: 1, // for renders
|
||||||
max_scale: 10, // for renders; too big values might lead to slow response time or DoS
|
max_scale: 10, // for renders; too big values might lead to slow response time or DoS
|
||||||
|
|||||||
@ -207,7 +207,7 @@ exp.get_render = function(uuid, scale, helm, body, callback) {
|
|||||||
} else if (!img) {
|
} else if (!img) {
|
||||||
callback(null, 0, hash, null);
|
callback(null, 0, hash, null);
|
||||||
} else {
|
} else {
|
||||||
fs.writeFile(renderpath, img, 'binary', function(err){
|
fs.writeFile(renderpath, img, "binary", function(err){
|
||||||
if (err) {
|
if (err) {
|
||||||
logging.log(err);
|
logging.log(err);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -149,7 +149,7 @@ exp.save_skin = function(uuid, hash, outpath, callback) {
|
|||||||
logging.error("error while downloading skin");
|
logging.error("error while downloading skin");
|
||||||
callback(err, null);
|
callback(err, null);
|
||||||
} else {
|
} else {
|
||||||
fs.writeFile(outpath, img, 'binary', function(err){
|
fs.writeFile(outpath, img, "binary", function(err){
|
||||||
if (err) {
|
if (err) {
|
||||||
logging.log(err);
|
logging.log(err);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,10 +2,10 @@
|
|||||||
// https://github.com/confuser/serverless-mc-skin-viewer
|
// https://github.com/confuser/serverless-mc-skin-viewer
|
||||||
// Permission to use & distribute https://github.com/confuser/serverless-mc-skin-viewer/blob/master/LICENSE
|
// Permission to use & distribute https://github.com/confuser/serverless-mc-skin-viewer/blob/master/LICENSE
|
||||||
|
|
||||||
var helpers = require('./helpers');
|
var helpers = require("./helpers");
|
||||||
var logging = require('./logging');
|
var logging = require("./logging");
|
||||||
var fs = require('fs');
|
var fs = require("fs");
|
||||||
var Canvas = require('canvas');
|
var Canvas = require("canvas");
|
||||||
var Image = Canvas.Image;
|
var Image = Canvas.Image;
|
||||||
var exp = {};
|
var exp = {};
|
||||||
|
|
||||||
@ -144,8 +144,8 @@ exp.draw_model = function(uuid, img, scale, helm, body, callback) {
|
|||||||
var height = original_height * scale;
|
var height = original_height * scale;
|
||||||
var model_canvas = new Canvas(20 * scale, (body ? 44.8 : 17.6) * scale);
|
var model_canvas = new Canvas(20 * scale, (body ? 44.8 : 17.6) * scale);
|
||||||
var skin_canvas = new Canvas(width, height);
|
var skin_canvas = new Canvas(width, height);
|
||||||
var model_ctx = model_canvas.getContext('2d');
|
var model_ctx = model_canvas.getContext("2d");
|
||||||
var skin_ctx = skin_canvas.getContext('2d');
|
var skin_ctx = skin_canvas.getContext("2d");
|
||||||
|
|
||||||
skin_ctx.drawImage(image,0,0,64,original_height);
|
skin_ctx.drawImage(image,0,0,64,original_height);
|
||||||
//Scale it
|
//Scale it
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
var router = require('express').Router();
|
var router = require("express").Router();
|
||||||
var logging = require('../modules/logging');
|
var logging = require("../modules/logging");
|
||||||
var helpers = require('../modules/helpers');
|
var helpers = require("../modules/helpers");
|
||||||
var config = require('../modules/config');
|
var config = require("../modules/config");
|
||||||
var skins = require('../modules/skins');
|
var skins = require("../modules/skins");
|
||||||
var renders = require('../modules/renders');
|
var renders = require("../modules/renders");
|
||||||
var fs = require('fs');
|
var fs = require("fs");
|
||||||
|
|
||||||
var human_status = {
|
var human_status = {
|
||||||
0: "none",
|
0: "none",
|
||||||
@ -18,7 +18,7 @@ var human_status = {
|
|||||||
|
|
||||||
// The Type logic should be two separate GET
|
// The Type logic should be two separate GET
|
||||||
// functions once response methods are extracted
|
// functions once response methods are extracted
|
||||||
router.get('/:type/:uuid.:ext?', function(req, res) {
|
router.get("/:type/:uuid.:ext?", function(req, res) {
|
||||||
var raw_type = req.params.type;
|
var raw_type = req.params.type;
|
||||||
|
|
||||||
// Check valid type for now
|
// Check valid type for now
|
||||||
@ -31,7 +31,7 @@ router.get('/:type/:uuid.:ext?', function(req, res) {
|
|||||||
var uuid = req.params.uuid;
|
var uuid = req.params.uuid;
|
||||||
var def = req.query.default;
|
var def = req.query.default;
|
||||||
var scale = parseInt(req.query.scale) || config.default_scale;
|
var scale = parseInt(req.query.scale) || config.default_scale;
|
||||||
var helm = req.query.hasOwnProperty('helm');
|
var helm = req.query.hasOwnProperty("helm");
|
||||||
var start = new Date();
|
var start = new Date();
|
||||||
var etag = null;
|
var etag = null;
|
||||||
|
|
||||||
@ -83,11 +83,11 @@ router.get('/:type/:uuid.:ext?', function(req, res) {
|
|||||||
function handle_default(http_status, img_status) {
|
function handle_default(http_status, img_status) {
|
||||||
if (def && def != "steve" && def != "alex") {
|
if (def && def != "steve" && def != "alex") {
|
||||||
res.writeHead(301, {
|
res.writeHead(301, {
|
||||||
'Cache-Control': 'max-age=' + config.browser_cache_time + ', public',
|
"Cache-Control": "max-age=" + config.browser_cache_time + ", public",
|
||||||
'Response-Time': new Date() - start,
|
"Response-Time": new Date() - start,
|
||||||
'X-Storage-Type': human_status[img_status],
|
"X-Storage-Type": human_status[img_status],
|
||||||
'Access-Control-Allow-Origin': '*',
|
"Access-Control-Allow-Origin": "*",
|
||||||
'Location': def
|
"Location": def
|
||||||
});
|
});
|
||||||
res.end();
|
res.end();
|
||||||
} else {
|
} else {
|
||||||
@ -110,12 +110,12 @@ router.get('/:type/:uuid.:ext?', function(req, res) {
|
|||||||
|
|
||||||
function sendimage(http_status, img_status, image) {
|
function sendimage(http_status, img_status, image) {
|
||||||
res.writeHead(http_status, {
|
res.writeHead(http_status, {
|
||||||
'Content-Type': 'image/png',
|
"Content-Type": "image/png",
|
||||||
'Cache-Control': 'max-age=' + config.browser_cache_time + ', public',
|
"Cache-Control": "max-age=" + config.browser_cache_time + ", public",
|
||||||
'Response-Time': new Date() - start,
|
"Response-Time": new Date() - start,
|
||||||
'X-Storage-Type': human_status[img_status],
|
"X-Storage-Type": human_status[img_status],
|
||||||
'Access-Control-Allow-Origin': '*',
|
"Access-Control-Allow-Origin": "*",
|
||||||
'Etag': '"' + etag + '"'
|
"Etag": '"' + etag + '"'
|
||||||
});
|
});
|
||||||
res.end(http_status == 304 ? null : image);
|
res.end(http_status == 304 ? null : image);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user