X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=cli%2Factions.js;h=6f8faea3de72259668c8b0c5eb7f1cff3e72fed3;hb=130809800e6e3fa33e5fc207dd6e1d963231f2a9;hp=7a361b7fda3b050005bf65157556d4320bd32778;hpb=c9d33e20bf7d74b0d8a7eb1e1c89e8a845098460;p=perso%2FImmae%2FProjets%2FNodejs%2FSurfer.git

diff --git a/cli/actions.js b/cli/actions.js
index 7a361b7..6f8faea 100644
--- 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,14 +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', result.body);
+
+        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);
+        }
     });
 }