From 7bb99aff6337ee30a74a71f587c9a58eb5d24cb3 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@nebulon.de>
Date: Tue, 8 Sep 2015 15:05:13 +0200
Subject: Use 222 status code to indicate folder listing and use stdout only
 for data

---
 cli/actions.js | 37 +++++++++++++++++++++++++++++--------
 cli/surfer.js  |  2 +-
 2 files changed, 30 insertions(+), 9 deletions(-)

(limited to 'cli')

diff --git a/cli/actions.js b/cli/actions.js
index bdfc066..119b2ba 100644
--- 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 15a88b3..ad37917 100755
--- 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);
 
-- 
cgit v1.2.3