Fix uri parsing

[perso/Immae/Projets/Nodejs/Surfer.git] / cli / actions.js

diff --git a/cli/actions.js b/cli/actions.js
index bdfc066b0cde2194dd02fb9b1f217e74c083ae58..6c4631cf341059b38bde836bfd4482dd45e00dcd 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,20 +28,23 @@ 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) {
+function collectFiles(filesOrFolders, options) {
     var tmp = [];
 
     filesOrFolders.forEach(function (filePath) {
+        var baseName = path.basename(filePath);
+        if (!options.all && baseName[0] === '.' && baseName.length > 1) return;
+
         var stat = fs.statSync(filePath);
 
         if (stat.isFile()) {
             tmp.push(filePath);
         } else if (stat.isDirectory()) {
             var files = fs.readdirSync(filePath).map(function (file) { return path.join(filePath, file); });
-            tmp = tmp.concat(collectFiles(files));
+            tmp = tmp.concat(collectFiles(files, options));
         } else {
             console.log('Skipping %s', filePath.cyan);
         }
@@ -51,21 +55,21 @@ function collectFiles(filesOrFolders) {
 
 function login(uri) {
     var tmp = url.parse(uri);
-    if (!tmp.host) tmp = url.parse('https://' + uri);
+    if (!tmp.slashes) tmp = url.parse('https://' + uri);
 
     var server = tmp.protocol + '//' + tmp.host;
 
-    console.log('Using server', server.bold);
+    console.log('Using server', server.cyan);
 
-    var username = readlineSync.question('Username: ', { hideEchoBack: false });
-    var password = readlineSync.question('Password: ', { hideEchoBack: true });
+    var username = readlineSync.question('Username: ');
+    var password = readlineSync.question('Password: ', { noEchoBack: true });
 
     superagent.get(server + API + '/').query({ username: username, password: password }).end(function (error, result) {
         if (error && error.code === 'ENOTFOUND') {
             console.log('No such server %s'.red, server.bold);
             process.exit(1);
         }
-        if (error.code) {
+        if (error && error.code) {
             console.log('Failed to connect to server %s'.red, server.bold, error.code);
             process.exit(1);
         }
@@ -82,21 +86,37 @@ function login(uri) {
 
         gQuery = { username: username, password: password };
 
-        console.log('Ok'.green);
+        console.log('Login successful'.green);
     });
 }
 
 function put(filePath, otherFilePaths, options) {
     checkConfig();
 
-    var files = collectFiles([ filePath ].concat(otherFilePaths));
+    var files = collectFiles([ filePath ].concat(otherFilePaths), options);
 
     async.eachSeries(files, function (file, callback) {
-        var relativeFilePath = path.resolve(file).slice(process.cwd().length + 1);
+        var relativeFilePath;
+
+        if (path.isAbsolute(file)) {
+            relativeFilePath = path.basename(file);
+        } else if (path.resolve(file).indexOf(process.cwd()) === 0) { // relative to current dir
+            relativeFilePath = path.resolve(file).slice(process.cwd().length + 1);
+        } else { // relative but somewhere else
+            relativeFilePath = path.basename(file);
+        }
+
+        var destinationPath = (options.destination ? '/' + options.destination : '') + '/' + relativeFilePath;
+        console.log('Uploading file %s -> %s', relativeFilePath.cyan, destinationPath.cyan);
+
+        superagent.put(config.server() + API + destinationPath).query(gQuery).attach('file', file).end(function (error, result) {
+            if (error) return callback(error);
+            if (result.statusCode !== 201) return callback(new Error('Error uploading file: ' + result.statusCode));
 
-        console.log('Uploading file %s -> %s', relativeFilePath.cyan, ((options.destination ? options.destination : '') + '/' + relativeFilePath).cyan);
+            console.log('Uploaded to ' + config.server() + destinationPath);
 
-        superagent.put(config.server() + API + relativeFilePath).query(gQuery).attach('file', file).end(callback);
+            callback(null);
+        });
     }, function (error) {
         if (error) {
             console.log('Failed to put file.', error);
@@ -110,20 +130,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);
+            process.stdout.write(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) {