From b84a65fd8e7faf7d2c558a1d78d22f1b18e4fbce Mon Sep 17 00:00:00 2001 From: jomo Date: Mon, 6 Apr 2015 03:06:38 +0200 Subject: [PATCH] restructure directories www.js is our 'main' file, it's now at the project's root instead of server.js routes, views, assets are now in lib, too --- lib/cache.js | 9 +++++---- {public => lib/public}/favicon.ico | Bin {public => lib/public}/favicon.png | Bin {public => lib/public}/images/akliz.png | Bin {public => lib/public}/images/alex.png | Bin {public => lib/public}/images/alex_skin.png | Bin {public => lib/public}/images/steve.png | Bin {public => lib/public}/images/steve_skin.png | Bin {public => lib/public}/images/twitter.png | Bin {public => lib/public}/logo.png | Bin {public => lib/public}/stylesheets/style.css | 0 {routes => lib/routes}/avatars.js | 10 +++++----- {routes => lib/routes}/capes.js | 8 ++++---- {routes => lib/routes}/index.js | 2 +- {routes => lib/routes}/renders.js | 12 ++++++------ {routes => lib/routes}/skins.js | 11 ++++++----- server.js => lib/server.js | 4 ++-- {views => lib/views}/index.jade | 0 {views => lib/views}/layout.jade | 0 package.json | 2 +- test/test.js | 2 +- lib/www.js => www.js | 8 ++++---- 22 files changed, 35 insertions(+), 33 deletions(-) rename {public => lib/public}/favicon.ico (100%) rename {public => lib/public}/favicon.png (100%) rename {public => lib/public}/images/akliz.png (100%) rename {public => lib/public}/images/alex.png (100%) rename {public => lib/public}/images/alex_skin.png (100%) rename {public => lib/public}/images/steve.png (100%) rename {public => lib/public}/images/steve_skin.png (100%) rename {public => lib/public}/images/twitter.png (100%) rename {public => lib/public}/logo.png (100%) rename {public => lib/public}/stylesheets/style.css (100%) rename {routes => lib/routes}/avatars.js (94%) rename {routes => lib/routes}/capes.js (93%) rename {routes => lib/routes}/index.js (91%) rename {routes => lib/routes}/renders.js (94%) rename {routes => lib/routes}/skins.js (89%) rename server.js => lib/server.js (97%) rename {views => lib/views}/index.jade (100%) rename {views => lib/views}/layout.jade (100%) rename lib/www.js => www.js (74%) diff --git a/lib/cache.js b/lib/cache.js index 4b2eb96..53b90e0 100644 --- a/lib/cache.js +++ b/lib/cache.js @@ -1,6 +1,7 @@ var logging = require("./logging"); var node_redis = require("redis"); var config = require("./config"); +var path = require("path"); var url = require("url"); var fs = require("fs"); @@ -39,17 +40,17 @@ function connect_redis() { // the helms file is ignored because we only need 1 file to read/write from function update_file_date(rid, skin_hash) { if (skin_hash) { - var path = config.faces_dir + skin_hash + ".png"; - fs.exists(path, function(exists) { + var face_path = path.join(__dirname, "..", config.faces_dir, skin_hash + ".png"); + fs.exists(face_path, function(exists) { if (exists) { var date = new Date(); - fs.utimes(path, date, date, function(err) { + fs.utimes(face_path, date, date, function(err) { if (err) { logging.error(rid, "Error:", err.stack); } }); } else { - logging.error(rid, "tried to update", path + " date, but it does not exist"); + logging.error(rid, "tried to update", face_path + " date, but it does not exist"); } }); } diff --git a/public/favicon.ico b/lib/public/favicon.ico similarity index 100% rename from public/favicon.ico rename to lib/public/favicon.ico diff --git a/public/favicon.png b/lib/public/favicon.png similarity index 100% rename from public/favicon.png rename to lib/public/favicon.png diff --git a/public/images/akliz.png b/lib/public/images/akliz.png similarity index 100% rename from public/images/akliz.png rename to lib/public/images/akliz.png diff --git a/public/images/alex.png b/lib/public/images/alex.png similarity index 100% rename from public/images/alex.png rename to lib/public/images/alex.png diff --git a/public/images/alex_skin.png b/lib/public/images/alex_skin.png similarity index 100% rename from public/images/alex_skin.png rename to lib/public/images/alex_skin.png diff --git a/public/images/steve.png b/lib/public/images/steve.png similarity index 100% rename from public/images/steve.png rename to lib/public/images/steve.png diff --git a/public/images/steve_skin.png b/lib/public/images/steve_skin.png similarity index 100% rename from public/images/steve_skin.png rename to lib/public/images/steve_skin.png diff --git a/public/images/twitter.png b/lib/public/images/twitter.png similarity index 100% rename from public/images/twitter.png rename to lib/public/images/twitter.png diff --git a/public/logo.png b/lib/public/logo.png similarity index 100% rename from public/logo.png rename to lib/public/logo.png diff --git a/public/stylesheets/style.css b/lib/public/stylesheets/style.css similarity index 100% rename from public/stylesheets/style.css rename to lib/public/stylesheets/style.css diff --git a/routes/avatars.js b/lib/routes/avatars.js similarity index 94% rename from routes/avatars.js rename to lib/routes/avatars.js index 301b862..316cd8d 100644 --- a/routes/avatars.js +++ b/lib/routes/avatars.js @@ -1,8 +1,8 @@ -var logging = require("../lib/logging"); -var helpers = require("../lib/helpers"); -var config = require("../lib/config"); -var skins = require("../lib/skins"); -var cache = require("../lib/cache"); +var logging = require("../logging"); +var helpers = require("../helpers"); +var config = require("../config"); +var skins = require("../skins"); +var cache = require("../cache"); var human_status = { 0: "none", diff --git a/routes/capes.js b/lib/routes/capes.js similarity index 93% rename from routes/capes.js rename to lib/routes/capes.js index 5f745a5..96910e2 100644 --- a/routes/capes.js +++ b/lib/routes/capes.js @@ -1,7 +1,7 @@ -var logging = require("../lib/logging"); -var helpers = require("../lib/helpers"); -var config = require("../lib/config"); -var cache = require("../lib/cache"); +var logging = require("../logging"); +var helpers = require("../helpers"); +var config = require("../config"); +var cache = require("../cache"); var human_status = { 0: "none", diff --git a/routes/index.js b/lib/routes/index.js similarity index 91% rename from routes/index.js rename to lib/routes/index.js index c17cd3f..3a2498a 100644 --- a/routes/index.js +++ b/lib/routes/index.js @@ -1,4 +1,4 @@ -var config = require("../lib/config"); +var config = require("../config"); var path = require("path"); var jade = require("jade"); diff --git a/routes/renders.js b/lib/routes/renders.js similarity index 94% rename from routes/renders.js rename to lib/routes/renders.js index ccd808a..0008973 100644 --- a/routes/renders.js +++ b/lib/routes/renders.js @@ -1,9 +1,9 @@ -var logging = require("../lib/logging"); -var helpers = require("../lib/helpers"); -var config = require("../lib/config"); -var cache = require("../lib/cache"); -var skins = require("../lib/skins"); -var renders = require("../lib/renders"); +var logging = require("../logging"); +var helpers = require("../helpers"); +var config = require("../config"); +var cache = require("../cache"); +var skins = require("../skins"); +var renders = require("../renders"); var fs = require("fs"); var human_status = { diff --git a/routes/skins.js b/lib/routes/skins.js similarity index 89% rename from routes/skins.js rename to lib/routes/skins.js index 9bc58e7..4b3a384 100644 --- a/routes/skins.js +++ b/lib/routes/skins.js @@ -1,7 +1,8 @@ -var logging = require("../lib/logging"); -var helpers = require("../lib/helpers"); -var config = require("../lib/config"); -var skins = require("../lib/skins"); +var logging = require("../logging"); +var helpers = require("../helpers"); +var config = require("../config"); +var skins = require("../skins"); +var path = require("path"); var lwip = require("lwip"); // GET skin request @@ -40,7 +41,7 @@ module.exports = function(req, res) { res.end(); } else { def = def || skins.default_skin(userId); - lwip.open("public/images/" + def + "_skin.png", function(err, image) { + lwip.open(path.join(__dirname, "..", "public", "images", def + "_skin.png"), function(err, image) { // FIXME: err is not handled image.toBuffer("png", function(buf_err, buffer) { // FIXME: buf_err is not handled diff --git a/server.js b/lib/server.js similarity index 97% rename from server.js rename to lib/server.js index e01a335..2f241fc 100644 --- a/server.js +++ b/lib/server.js @@ -1,7 +1,7 @@ #!/usr/bin/env node -var logging = require("./lib/logging"); +var logging = require("./logging"); var querystring = require("querystring"); -var config = require("./lib/config"); +var config = require("./config"); var http = require("http"); var mime = require("mime"); var path = require("path"); diff --git a/views/index.jade b/lib/views/index.jade similarity index 100% rename from views/index.jade rename to lib/views/index.jade diff --git a/views/layout.jade b/lib/views/layout.jade similarity index 100% rename from views/layout.jade rename to lib/views/layout.jade diff --git a/package.json b/package.json index 3fd8bcf..7473c2a 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ ], "scripts": { "postinstall": "cp 'lib/config.example.js' 'lib/config.js'", - "start": "forever -l logs/log.log -o logs/out.log -e logs/error.log -p ./ -a --minUptime 8000 --spinSleepTime 1500 lib/www.js", + "start": "forever -l logs/log.log -o logs/out.log -e logs/error.log -p ./ -a --minUptime 8000 --spinSleepTime 1500 www.js", "test": "mocha", "test-travis": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage" }, diff --git a/test/test.js b/test/test.js index f2462c7..34f7afc 100644 --- a/test/test.js +++ b/test/test.js @@ -6,7 +6,7 @@ var logging = require("../lib/logging"); var config = require("../lib/config"); var skins = require("../lib/skins"); var cache = require("../lib/cache"); -var server = require("../server"); +var server = require("../lib/server"); var cleaner = require("../lib/cleaner"); var request = require("request"); diff --git a/lib/www.js b/www.js similarity index 74% rename from lib/www.js rename to www.js index 91aa5b4..d633188 100644 --- a/lib/www.js +++ b/www.js @@ -1,6 +1,6 @@ -var logging = require("../lib/logging"); -var cleaner = require("../lib/cleaner"); -var config = require("../lib/config"); +var logging = require("./lib/logging"); +var cleaner = require("./lib/cleaner"); +var config = require("./lib/config"); var cluster = require("cluster"); if (cluster.isMaster) { @@ -17,5 +17,5 @@ if (cluster.isMaster) { setInterval(cleaner.run, config.cleaning_interval * 1000); } else { - require("../server.js").boot(); + require("./lib/server.js").boot(); } \ No newline at end of file