Send more folder listing details

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

diff --git a/cli/actions.js b/cli/actions.js
index 59f0714a6da0b088358570982febdf4e8f4a5c12..6f8faea3de72259668c8b0c5eb7f1cff3e72fed3 100644 (file)
--- a/cli/actions.js
+++ b/cli/actions.js
@@ -153,9 +153,9 @@ function get(filePath) {
             if (!files || files.entries.length === 0) {
                 console.log('No files on the server. Use %s to upload some.', 'surfer put <file>'.yellow);
             } else {
-                console.log('Files:');
+                console.log('Entries:');
                 files.entries.forEach(function (entry) {
-                    console.log('\t %s', entry);
+                    console.log('\t %s', entry.isDirectory ? entry.filePath + '/' : entry.filePath);
                 });
             }
         } else {
@@ -180,15 +180,27 @@ function get(filePath) {
     // });
 }
 
-function del(filePath) {
+function del(filePath, options) {
     checkConfig();
 
+    var query = safe.JSON.parse(safe.JSON.stringify(gQuery));
+    query.recursive = options.recursive;
+    query.dryRun = options.dryRun;
+
     var relativeFilePath = path.resolve(filePath).slice(process.cwd().length + 1);
-    superagent.del(config.server() + API + relativeFilePath).query(gQuery).end(function (error, result) {
-        if (error && error.status === 401) return console.log('Login failed');
+    superagent.del(config.server() + API + relativeFilePath).query(query).end(function (error, result) {
+        if (error && error.status === 401) return console.log('Login failed'.red);
         if (error && error.status === 404) return console.log('No such file or directory');
+        if (error && error.status === 403) return console.log('Failed. Target is a directory. Use %s to delete directories.', '--recursive'.yellow);
         if (error) return console.log('Failed', result ? result.body : error);
 
-        console.log('Success. Removed %s files.', result.body.entries.length);
+        if (options.dryRun) {
+            console.log('This would remove %s files:', result.body.entries.length);
+            result.body.entries.forEach(function (entry) {
+                console.log('\t %s', entry);
+            });
+        } else {
+            console.log('Success. Removed %s files.', result.body.entries.length);
+        }
     });
 }