Add rename functionality

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

diff --git a/cli/actions.js b/cli/actions.js
index 7a361b7fda3b050005bf65157556d4320bd32778..ea2a3a1d1e5b6280151bf3ea7076b31da54c902d 100644 (file)
--- a/cli/actions.js
+++ b/cli/actions.js
@@ -118,9 +118,10 @@ function put(filePath, otherFilePaths, options) {
         var destinationPath = (destination ? '/' + 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) {
+        superagent.post(config.server() + API + destinationPath).query(gQuery).attach('file', file).end(function (error, result) {
+            if (result && result.statusCode === 403) return callback(new Error('Upload destination ' + destinationPath + ' not allowed'));
+            if (result && result.statusCode !== 201) return callback(new Error('Error uploading file: ' + result.statusCode));
             if (error) return callback(error);
-            if (result.statusCode !== 201) return callback(new Error('Error uploading file: ' + result.statusCode));
 
             console.log('Uploaded to ' + config.server() + destinationPath);
 
@@ -128,7 +129,7 @@ function put(filePath, otherFilePaths, options) {
         });
     }, function (error) {
         if (error) {
-            console.log('Failed to put file.', error);
+            console.log('Failed to put file.', error.message.red);
             process.exit(1);
         }
 
@@ -143,9 +144,9 @@ function get(filePath) {
     filePath = filePath || '/';
 
     request.get(config.server() + API + filePath, { qs: gQuery }, function (error, result, body) {
+        if (result && result.statusCode === 401) return console.log('Login failed');
+        if (result && result.statusCode === 404) return console.log('No such file or directory %s', filePath.yellow);
         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 %s', filePath.yellow);
 
         // 222 indicates directory listing
         if (result.statusCode === 222) {
@@ -153,9 +154,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 +181,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);
+        }
     });
 }