pull in old upload script

4 files changed, 110 insertions, 10 deletions

diff --git a/bucky/app/bucky.js b/bucky/app/bucky.js
index 876a769..00730c5 100644
--- a/bucky/app/bucky.js
+++ b/bucky/app/bucky.js
@@ -77,17 +77,30 @@ var bucky = module.exports = {
       return
     }
     var data = {
-      thread: res.thread.get('id'),
-      parent_id: req.body.parent_id || -1,
+      title: req.body.title,
+      keyword: req.body.keyword,
       username: req.user.get('username'),
-      date: util.now(),
-      comment: req.body.comment,
+      createdate: util.now(),
+      lastmodified: util.now(),
+      size: 0,
+      private: false,
+      color: req.body.color,
+      viewed: 0,
+      revision: 'a',
     }
-    db.createComment(data).then(function(comment){
-      res.comment = comment
+    db.createThread(data).then(function(thread){
+      res.thread = thread
       next()
     })
   },
+  verifyFilesOrComment: function (req, res, next){
+    var hasComment = req.body.comment && req.body.comment.length
+    var hasFile = req.files && req.files.length
+    if (! hasComment && ! hasFile) {
+      return res.sendStatus(400)
+    }
+    next()
+  },
       
   /* DETAILS */
   
@@ -166,6 +179,12 @@ var bucky = module.exports = {
   
   /* COMMENTS */
   
+  createOptionalComment: function(req, res, next){
+    if (! req.body.comment || ! req.body.comment.length) {
+      return next()
+    }
+    bucky.createComment(req, res, next)
+  },
   createComment: function (req, res, next){
     if (! req.body.comment || ! req.body.comment.length) {
       res.json({ error: "no comment" })
diff --git a/bucky/app/index.js b/bucky/app/index.js
index b88471c..95a11a8 100644
--- a/bucky/app/index.js
+++ b/bucky/app/index.js
@@ -13,7 +13,6 @@ var favicon = require('serve-favicon')
 var passport = require('passport')
 var sessionstore = require('sessionstore')
 var session = require('express-session')
-var multer = require('multer')
 
 var app, server
 
@@ -30,7 +29,6 @@ site.init = function(){
   app.use(favicon(__dirname + '../../../public/favicon.ico'))
   app.use(bodyParser.json())
   app.use(bodyParser.urlencoded({ extended: false }))
-  app.use( multer({ dest:'./uploads/' }).multiple("files") )
   
   app.use(session({
     key: 'bucky.sid',
diff --git a/bucky/app/router.js b/bucky/app/router.js
index c8392da..134ab1d 100644
--- a/bucky/app/router.js
+++ b/bucky/app/router.js
@@ -5,6 +5,7 @@ var bucky = require('./bucky')
 var db = require('../db')
 var util = require('../util/util')
 var search = require('../search/middleware')
+var multer = require('multer')({ dest:'./uploads/' })
 
 module.exports = function(app){
 	app.all('*', middleware.ensureLocals)
@@ -76,9 +77,12 @@ module.exports = function(app){
   )
   app.post("/api/thread",
     middleware.ensureAuthenticated,
-    bucky.createComment,
+    multer.array("files"),
+    bucky.verifyFilesOrComment,
+    bucky.createThread,
+//     bucky.createFiles,
+    bucky.createOptionalComment,
     function(req, res){
-      // make a new thread
       res.json(res.thread)
   })
   app.post("/api/thread/:id/comment",
diff --git a/bucky/util/upload.js b/bucky/util/upload.js
new file mode 100644
index 0000000..517d5f7
--- /dev/null
+++ b/bucky/util/upload.js
@@ -0,0 +1,79 @@
+
+var	knox = require('knox')
+var uuid = require('node-uuid')
+
+var s3
+
+var acceptableuploadTypes = {
+	'image/gif': 'gif',
+	'image/jpeg': 'jpg',
+	'image/jpg': 'jpg',
+	'image/png': 'png',
+}
+
+module.exports = {}
+
+module.exports.init = function (opt){
+  s3 = knox.createClient({
+    key: opt.key,
+    secret: opt.secret,
+    bucket: opt.bucket,
+  })
+}
+
+module.exports.put = function (opt) {
+	var filename
+	var err
+	var now = new Date()
+
+	var file = opt.file
+
+  var types = opt.types || acceptableuploadTypes
+	var extension = types[file.mimetype]
+	
+	if (opt.preserveFilename) {
+	  filename = file.originalname
+	}
+	else {
+    filename = uuid.v1() + "." + extension;
+	}
+
+	var remote_path = "/" + opt.dirname + "/" + filename
+
+	if (! extension) {
+		err = "Unacceptable filetype."
+	}
+	else if (opt.maxSize && file.size > opt.maxSize) {
+		err = "File too large. Uploads can be a maximum of " + opt.maxSize + " bytes."
+	}
+
+	if (err) {
+		console.error(">>>", err)
+		opt.unacceptable && opt.unacceptable(err)
+		return
+	}
+
+	opt.acceptable && opt.acceptable(err)
+	
+	// console.log("upload >", remote_path)
+	s3.putBuffer(file.buffer, remote_path, {
+		'Content-Length': file.size,
+		'Content-Type': file.mimetype,
+		'x-amz-acl': 'public-read'
+	}, function(err, s3res) {
+		if (err || s3res.statusCode !== 200) {
+			console.error(err);
+			if (s3res && s3res.resume) {
+				s3res.resume()
+			}
+			return;
+		}
+
+		var file_url = s3res.url || s3res.req.url		
+
+		opt.success && opt.success(file_url)
+	}).on('error', function(err, s3res){
+		console.error(err)
+		s3res && s3res.resume && s3res.resume()
+	})
+}