working file uploads

Author: jwcooper

controllers/editor.js

@@ -160,12 +160,14 @@ exports.image = function(req, res) {
 };
 
 exports.upload_file = function(req, res) {
-  console.log(req.files.files[0]);
+  console.log(req.file);
+  console.log(req.file.originalname);
+  console.log(req.file.path);
 
-  var temp_path = sanitize(req.files.files[0].path).trim();
-  var file_name = sanitize(req.files.files[0].name).trim();
+  var temp_path = sanitize.trim(req.file.path);
+  var file_name = sanitize.trim(req.file.originalname);
   file_name = file_name.replace(" ", "_");
-  var folder_path = sanitize(req.body.path).trim().replace('filesystem', 'repositories');
+  var folder_path = sanitize.trim(req.body.path).replace('filesystem', 'repositories');
 
   var new_path = __dirname + '/..' + folder_path + file_name;
   new_path = path.resolve(new_path);

package.json

@@ -15,6 +15,7 @@
     "later": "^1.2.0",
     "method-override": "2.3.10",
     "morgan": "1.9.0",
+    "multer": "^1.3.0",
     "nedb": "1.8.0",
     "node-pty": "0.7.4",
     "pug": "2.0.0-rc.4",

public/javascripts/occ_editor.js

@@ -89,7 +89,7 @@
     "upload_file_form":           '<form class="upload-form" id="upload-file-form" action="/editor/upload" enctype="multipart/form-data">' +
                                     '<span class="fileinput-button">' +
                                       '<span>+ Upload File</span>' +
-                                      '<input id="fileupload" type="file" name="files[]" data-url="/editor/upload" multiple>' +
+                                      '<input id="fileupload" type="file" name="obj" data-url="/editor/upload" multiple>' +
                                     '</span>' +
                                   '</form>'
   };
@@ -816,7 +816,8 @@
 
     function run_command(command) {
       console.log("sending command: " + command);
-      occEditor.send_terminal_command(command);
+      term.send(JSON.stringify({type: "input", data: command}));
+      //occEditor.send_terminal_command(command);
     }
 
     // Clean terminal

server.js

@@ -7,6 +7,8 @@ var express = require('express'),
     morgan = require('morgan'),
     app = express(),
     expressWs = require('express-ws')(app),
+    multer  = require('multer'),
+    upload = multer({ dest: './uploads' }),
     util = require('util'),
     util = require('util'),
     site = require('./controllers/site'),
@@ -83,7 +85,8 @@ app.get('/', site.index);
 
 app.get('/editor', editor.index);
 app.get('/editor/image', editor.image);
-app.post('/editor/upload', editor.upload_file);
+
+app.post('/editor/upload', upload.single('obj'), editor.upload_file);
 
 app.post('/create/repository', editor.create_repository);
 

uploads/.gitignore

@@ -0,0 +1,3 @@
+*
+*/
+!.gitignore