Use 222 status code to indicate folder listing and use stdout only for data

[perso/Immae/Projets/Nodejs/Surfer.git] / src / files.js

diff --git a/src/files.js b/src/files.js
index 3812d21d063327cbeb726d1f26eeacc1c6794e32..d12782d8c001f5fceefe1b151b1214ce3f13dd94 100644 (file)
--- a/src/files.js
+++ b/src/files.js
@@ -2,19 +2,23 @@
 
 var fs = require('fs'),
     path = require('path'),
-    ejs = require('ejs'),
-    rimraf = require('rimraf'),
+    rm = require('del'),
+    debug = require('debug')('files'),
     mkdirp = require('mkdirp'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess;
 
-exports = module.exports = {
-    get: get,
-    put: put,
-    del: del
-};
+var gBasePath;
+
+exports = module.exports = function (basePath) {
+    gBasePath = basePath;
 
-var FILE_BASE = path.resolve(__dirname, '../files');
+    return {
+        get: get,
+        put: put,
+        del: del
+    };
+};
 
 // http://stackoverflow.com/questions/11293857/fastest-way-to-copy-file-in-node-js
 function copyFile(source, target, cb) {
@@ -49,14 +53,10 @@ function copyFile(source, target, cb) {
     });
 }
 
-function render(view, options) {
-    return ejs.render(fs.readFileSync(view, 'utf8'), options);
-}
-
 function getAbsolutePath(filePath) {
-    var absoluteFilePath = path.resolve(FILE_BASE, filePath);
+    var absoluteFilePath = path.resolve(path.join(gBasePath, filePath));
 
-    if (absoluteFilePath.indexOf(FILE_BASE) !== 0) return null;
+    if (absoluteFilePath.indexOf(gBasePath) !== 0) return null;
     return absoluteFilePath;
 }
 
@@ -68,10 +68,10 @@ function get(req, res, next) {
     fs.stat(absoluteFilePath, function (error, result) {
         if (error) return next(new HttpError(404, error));
 
-        console.log('get', absoluteFilePath);
+        debug('get', absoluteFilePath);
 
-        if (result.isFile()) return res.sendfile(absoluteFilePath);
-        if (result.isDirectory()) return res.status(200).send({ entries: fs.readdirSync(absoluteFilePath) });
+        if (result.isFile()) return res.sendFile(absoluteFilePath);
+        if (result.isDirectory()) return res.status(222).send({ entries: fs.readdirSync(absoluteFilePath) });
 
         return next(new HttpError(500, 'unsupported type'));
     });
@@ -88,7 +88,7 @@ function put(req, res, next) {
     fs.stat(absoluteFilePath, function (error, result) {
         if (error && error.code !== 'ENOENT') return next(new HttpError(500, error));
 
-        console.log('put', absoluteFilePath, req.files.file);
+        debug('put', absoluteFilePath, req.files.file);
 
         if (result && result.isDirectory()) return next(new HttpError(409, 'cannot put on directories'));
         if (!result || result.isFile()) {
@@ -106,14 +106,14 @@ function del(req, res, next) {
     var filePath = req.params[0];
     var absoluteFilePath = getAbsolutePath(filePath);
     if (!absoluteFilePath) return next(new HttpError(404, 'Not found'));
-    if (absoluteFilePath.slice(FILE_BASE.length) === '') return next(new HttpError(403, 'Forbidden'));
+    if (absoluteFilePath.slice(gBasePath.length) === '') return next(new HttpError(403, 'Forbidden'));
 
     fs.stat(absoluteFilePath, function (error, result) {
         if (error) return next(new HttpError(404, error));
 
-        rimraf(absoluteFilePath, function (error) {
+        rm(absoluteFilePath, function (error, result) {
             if (error) return next(new HttpError(500, 'Unable to remove'));
-            next(new HttpSuccess(200, {}));
+            next(new HttpSuccess(200, { entries: result }));
         });
     });
 }