[Fix] Archive path may be upper dir of the root dir

efeiefei · Apr 21, 2017 · 8005160 · 8005160
1 parent 375be28
commit 8005160
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/lib/public/js/app.js b/lib/public/js/app.js
@@ -186,11 +186,11 @@ FMApp.controller('FileManagerCtr', ['$scope', '$http', '$location',
       if (!archive.match(/\.zip$/)) {
         archive += '.zip';
       }
-      var url = 'api' + FM.curFolderPath;
+      var url = 'api' + FM.curFolderPath + archive;
       var src = FM.selection.map(function (file) {
         return file.relPath;
       });
-      httpRequest('PUT', url, {type: 'ARCHIVE'}, {src: src, archive: archive, dirs: FM.archiveEmbedDirs});
+      httpRequest('POST', url, {type: 'CREATE_ARCHIVE'}, {src: src, embedDirs: FM.archiveEmbedDirs});
     };
 
     FM.rename = function (newName) {

diff --git a/lib/routes.js b/lib/routes.js
@@ -61,20 +61,13 @@ router.put('/api/(.*)', Tools.loadRealPath, Tools.checkPathExists, bodyParser(),
     yield * FileManager.rename(p, FilePath(target));
     this.body = 'Rename Succeed!';
   }
-  else if (type === 'ARCHIVE') {
-    var src = this.request.body.src;
-    var archive = (p === '.' ? '' : p) + this.request.body.archive;
-    if (!src) return this.status = 400;
-    yield * FileManager.archive(C.data.root, archive, src, !!this.request.body.dirs);
-    this.body = 'Create Archive Succeed!';
-  }
   else {
     this.status = 400;
     this.body = 'Arg Type Error!';
   }
 });
 
-router.post('/api/(.*)', Tools.loadRealPath, Tools.checkPathNotExists, function *() {
+router.post('/api/(.*)', Tools.loadRealPath, Tools.checkPathNotExists, bodyParser(), function *() {
   var type = this.query.type;
   var p = this.request.fPath;
   if (!type) {
@@ -97,6 +90,12 @@ router.post('/api/(.*)', Tools.loadRealPath, Tools.checkPathNotExists, function
       this.body = 'Lack Upload File!';
     }
   }
+  else if (type === 'CREATE_ARCHIVE') {
+    var src = this.request.body.src;
+    if (!src) return this.status = 400;
+    yield * FileManager.archive(C.data.root, p, src, !!this.request.body.embedDirs);
+    this.body = 'Create Archive Succeed!';
+  }
   else {
     this.status = 400;
     this.body = 'Arg Type Error!';