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

diff --git a/app.js b/app.js
index d1619a0823fed70c32585497b9c6fe14c44b1ebb..90b46fb010fce2bcf82a440a6219a9c41d991005 100755 (executable)
--- a/app.js
+++ b/app.js
@@ -15,6 +15,7 @@ var express = require('express'),
     cookieParser = require('cookie-parser'),
     lastMile = require('connect-lastmile'),
     multipart = require('./src/multipart'),
+    mkdirp = require('mkdirp'),
     auth = require('./src/auth.js'),
     files = require('./src/files.js')(path.resolve(__dirname, process.argv[2] || 'files'));
 
@@ -49,6 +50,9 @@ var server = app.listen(3000, function () {
     var host = server.address().address;
     var port = server.address().port;
 
+    var basePath = path.resolve(__dirname, process.argv[2] || 'files');
+    mkdirp.sync(basePath);
+
     console.log('Surfer listening at http://%s:%s', host, port);
-    console.log('Using base path', path.resolve(__dirname, process.argv[2] || 'files'));
+    console.log('Using base path', basePath);
 });
\ No newline at end of file

diff --git a/cli/actions.js b/cli/actions.js
index bdfc066b0cde2194dd02fb9b1f217e74c083ae58..119b2babd3cb5ba703ee97f2b72e3efe743b880e 100644 (file)
--- a/cli/actions.js
+++ b/cli/actions.js
@@ -10,6 +10,7 @@ var superagent = require('superagent'),
     readlineSync = require('readline-sync'),
     async = require('async'),
     fs = require('fs'),
+    request = require('request'),
     url = require('url'),
     path = require('path');
 
@@ -27,7 +28,7 @@ function checkConfig() {
 
     gQuery = { username: config.username(), password: config.password() };
 
-    console.log('Using server %s', config.server().yellow);
+    console.error('Using server %s', config.server().yellow);
 }
 
 function collectFiles(filesOrFolders) {
@@ -110,20 +111,40 @@ function put(filePath, otherFilePaths, options) {
 function get(filePath) {
     checkConfig();
 
-    superagent.get(config.server() + API + filePath).query(gQuery).end(function (error, result) {
-        if (error && error.status === 401) return console.log('Login failed');
-        if (error && error.status === 404) return console.log('No such file or directory');
-        if (error) return console.log('Failed', result ? result.body : error);
+    // if no argument provided, fetch root
+    filePath = filePath || '/';
+
+    request.get(config.server() + API + filePath, { qs: gQuery }, function (error, result, body) {
+        if (error) return console.error(error);
+        if (result.statusCode === 401) return console.log('Login failed');
+        if (result.statusCode === 404) return console.log('No such file or directory');
 
-        if (result.body && result.body.entries) {
+        // 222 indicates directory listing
+        if (result.statusCode === 222) {
             console.log('Files:');
-            result.body.entries.forEach(function (entry) {
+            JSON.parse(body).entries.forEach(function (entry) {
                 console.log('\t %s', entry);
             });
         } else {
-            console.log(result.text);
+            console.log(body);
         }
     });
+    // var req = superagent.get(config.server() + API + filePath);
+    // req.query(gQuery);
+    // req.end(function (error, result) {
+    //     if (error && error.status === 401) return console.log('Login failed');
+    //     if (error && error.status === 404) return console.log('No such file or directory');
+    //     if (error) return console.log('Failed', result ? result.body : error);
+
+    //     if (result.body && result.body.entries) {
+    //         console.log('Files:');
+    //         result.body.entries.forEach(function (entry) {
+    //             console.log('\t %s', entry);
+    //         });
+    //     } else {
+    //         req.pipe(process.stdout);
+    //     }
+    // });
 }
 
 function del(filePath) {

diff --git a/cli/surfer.js b/cli/surfer.js
index 15a88b39d602ca0f0446577050a7e7cc0bf54a0e..ad37917d3eb74793c3be1016a63e6aece89cdf30 100755 (executable)
--- a/cli/surfer.js
+++ b/cli/surfer.js
@@ -19,7 +19,7 @@ program.command('put <file> [files...]')
     .description('Put a file')
     .action(actions.put);
 
-program.command('get')
+program.command('get [file]')
     .description('Get a file or directory')
     .action(actions.get);
 

diff --git a/package.json b/package.json
index 266b77fa2abd8a1eee69951744b437dde0ee80cf..7981d9e04614ef38d2a7b70c030446b4b80d90fc 100644 (file)
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "passport": "^0.2.2",
     "passport-ldapjs": "^1.0.2",
     "readline-sync": "^1.2.19",
+    "request": "^2.61.0",
     "safetydance": "0.0.16",
     "superagent": "^1.2.0",
     "underscore": "^1.8.3"

diff --git a/src/files.js b/src/files.js
index 3b28d3ff31d6e3fd6378338001df8c9bd34f9dd9..d12782d8c001f5fceefe1b151b1214ce3f13dd94 100644 (file)
--- a/src/files.js
+++ b/src/files.js
@@ -54,7 +54,7 @@ function copyFile(source, target, cb) {
 }
 
 function getAbsolutePath(filePath) {
-    var absoluteFilePath = path.resolve(gBasePath, filePath);
+    var absoluteFilePath = path.resolve(path.join(gBasePath, filePath));
 
     if (absoluteFilePath.indexOf(gBasePath) !== 0) return null;
     return absoluteFilePath;
@@ -71,7 +71,7 @@ function get(req, res, next) {
         debug('get', absoluteFilePath);
 
         if (result.isFile()) return res.sendFile(absoluteFilePath);
-        if (result.isDirectory()) return res.status(200).send({ entries: fs.readdirSync(absoluteFilePath) });
+        if (result.isDirectory()) return res.status(222).send({ entries: fs.readdirSync(absoluteFilePath) });
 
         return next(new HttpError(500, 'unsupported type'));
     });