瀏覽代碼

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
jomo 10 年之前
父節點
當前提交
b84a65fd8e

+ 5 - 4
lib/cache.js

@@ -1,6 +1,7 @@
 var logging = require("./logging");
 var logging = require("./logging");
 var node_redis = require("redis");
 var node_redis = require("redis");
 var config = require("./config");
 var config = require("./config");
+var path = require("path");
 var url = require("url");
 var url = require("url");
 var fs = require("fs");
 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
 // the helms file is ignored because we only need 1 file to read/write from
 function update_file_date(rid, skin_hash) {
 function update_file_date(rid, skin_hash) {
   if (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) {
       if (exists) {
         var date = new Date();
         var date = new Date();
-        fs.utimes(path, date, date, function(err) {
+        fs.utimes(face_path, date, date, function(err) {
           if (err) {
           if (err) {
             logging.error(rid, "Error:", err.stack);
             logging.error(rid, "Error:", err.stack);
           }
           }
         });
         });
       } else {
       } 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");
       }
       }
     });
     });
   }
   }

+ 0 - 0
public/favicon.ico → lib/public/favicon.ico


+ 0 - 0
public/favicon.png → lib/public/favicon.png


+ 0 - 0
public/images/akliz.png → lib/public/images/akliz.png


+ 0 - 0
public/images/alex.png → lib/public/images/alex.png


+ 0 - 0
public/images/alex_skin.png → lib/public/images/alex_skin.png


+ 0 - 0
public/images/steve.png → lib/public/images/steve.png


+ 0 - 0
public/images/steve_skin.png → lib/public/images/steve_skin.png


+ 0 - 0
public/images/twitter.png → lib/public/images/twitter.png


+ 0 - 0
public/logo.png → lib/public/logo.png


+ 0 - 0
public/stylesheets/style.css → lib/public/stylesheets/style.css


+ 5 - 5
routes/avatars.js → 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 = {
 var human_status = {
   0: "none",
   0: "none",

+ 4 - 4
routes/capes.js → 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 = {
 var human_status = {
   0: "none",
   0: "none",

+ 1 - 1
routes/index.js → lib/routes/index.js

@@ -1,4 +1,4 @@
-var config = require("../lib/config");
+var config = require("../config");
 var path = require("path");
 var path = require("path");
 var jade = require("jade");
 var jade = require("jade");
 
 

+ 6 - 6
routes/renders.js → 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 fs = require("fs");
 
 
 var human_status = {
 var human_status = {

+ 6 - 5
routes/skins.js → 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");
 var lwip = require("lwip");
 
 
 // GET skin request
 // GET skin request
@@ -40,7 +41,7 @@ module.exports = function(req, res) {
       res.end();
       res.end();
     } else {
     } else {
       def = def || skins.default_skin(userId);
       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
         // FIXME: err is not handled
         image.toBuffer("png", function(buf_err, buffer) {
         image.toBuffer("png", function(buf_err, buffer) {
           // FIXME: buf_err is not handled
           // FIXME: buf_err is not handled

+ 2 - 2
server.js → lib/server.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 #!/usr/bin/env node
-var logging = require("./lib/logging");
+var logging = require("./logging");
 var querystring = require("querystring");
 var querystring = require("querystring");
-var config = require("./lib/config");
+var config = require("./config");
 var http = require("http");
 var http = require("http");
 var mime = require("mime");
 var mime = require("mime");
 var path = require("path");
 var path = require("path");

+ 0 - 0
views/index.jade → lib/views/index.jade


+ 0 - 0
views/layout.jade → lib/views/layout.jade


+ 1 - 1
package.json

@@ -22,7 +22,7 @@
   ],
   ],
   "scripts": {
   "scripts": {
     "postinstall": "cp 'lib/config.example.js' 'lib/config.js'",
     "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": "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"
     "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"
   },
   },

+ 1 - 1
test/test.js

@@ -6,7 +6,7 @@ var logging = require("../lib/logging");
 var config = require("../lib/config");
 var config = require("../lib/config");
 var skins = require("../lib/skins");
 var skins = require("../lib/skins");
 var cache = require("../lib/cache");
 var cache = require("../lib/cache");
-var server = require("../server");
+var server = require("../lib/server");
 var cleaner = require("../lib/cleaner");
 var cleaner = require("../lib/cleaner");
 var request = require("request");
 var request = require("request");
 
 

+ 4 - 4
lib/www.js → 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");
 var cluster = require("cluster");
 
 
 if (cluster.isMaster) {
 if (cluster.isMaster) {
@@ -17,5 +17,5 @@ if (cluster.isMaster) {
 
 
   setInterval(cleaner.run, config.cleaning_interval * 1000);
   setInterval(cleaner.run, config.cleaning_interval * 1000);
 } else {
 } else {
-  require("../server.js").boot();
+  require("./lib/server.js").boot();
 }
 }