summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/index.js3
-rw-r--r--app/node_modules/okservices/oks3/index.js34
-rw-r--r--app/node_modules/okservices/oks3/package.json2
-rw-r--r--examples/db.json8
-rw-r--r--examples/index.js10
-rw-r--r--package.json4
-rw-r--r--themes/okadmin/public/js/app.js3
-rw-r--r--themes/okadmin/public/js/upload.js36
-rw-r--r--themes/okadmin/templates/partials/head.liquid2
-rw-r--r--themes/okadmin/templates/partials/tail.liquid4
10 files changed, 76 insertions, 30 deletions
diff --git a/app/index.js b/app/index.js
index 06b1591..d478a03 100644
--- a/app/index.js
+++ b/app/index.js
@@ -53,7 +53,8 @@ function OKCMS(options) {
}, metaDefault, metaUser);
var adminMeta = assign({
- static: withoutTrailingSlash(adminPath)
+ static: withoutTrailingSlash(adminPath),
+ services: options.services,
}, metaDefault, metaUser);
var schemaConfig = options.schemas || {};
diff --git a/app/node_modules/okservices/oks3/index.js b/app/node_modules/okservices/oks3/index.js
index 97abef0..34c5840 100644
--- a/app/node_modules/okservices/oks3/index.js
+++ b/app/node_modules/okservices/oks3/index.js
@@ -4,6 +4,7 @@ var skipperS3 = require('skipper-s3')
// Hack to prevent this god-forsaken module from crashing our shit
var d = require('domain').create()
d.on('error', function (err) {
+ console.log(err)
console.error('Stupid error in S3 upload. Upload probably prematurely canceled')
})
@@ -19,6 +20,12 @@ function OKS3(options) {
if (!options.s3.audio) options.s3.audio = {}
if (!options.s3.video) options.s3.video = {}
+/*
+ // TODO: maxBytes property doesn't work - if you upload a large file,
+ // it will just hang until you reload the browser, and then CRASH.
+
+ // Make sure maxbytes property is there - it can be a number,
+ // or zero/undefined (for no maximum upload size)
if (options.s3.maxbytes) {
if (! ('maxbytes' in options.s3.image))
options.s3.image.maxbytes = options.s3.maxbytes
@@ -27,7 +34,14 @@ function OKS3(options) {
if (! ('maxbytes' in options.s3.audio))
options.s3.audio.maxbytes = options.s3.maxbytes
}
-
+*/
+ if (options.s3.image.preserveFilename)
+ options.s3.image.preserveFilename = preserveFilename
+ if (options.s3.video.preserveFilename)
+ options.s3.video.preserveFilename = preserveFilename
+ if (options.s3.audio.preserveFilename)
+ options.s3.audio.preserveFilename = preserveFilename
+
var express = options.express;
var router = express.Router();
@@ -38,22 +52,22 @@ function OKS3(options) {
// provided by skipper. Use that to do AWS stuff
router.post('/image', function(req, res) {
d.run(function () {
- req.file('image').upload({
+ var skip = req.file('image').upload({
adapter: skipperS3,
key: options.s3.key,
secret: options.s3.secret,
bucket: options.s3.bucket,
dirname: options.s3.dirname,
- maxBytes: options.s3.image.maxbytes,
- saveAs: options.s3.image.preserveFilename && preserveFilename,
+ // maxBytes: options.s3.image.maxbytes,
+ saveAs: options.s3.image.preserveFilename,
headers: {
'x-amz-acl': 'public-read'
}
}, function (err, uploadedFiles) {
- if (err) res.status(500).send(err)
+ if (err) return res.status(500).send(err)
res.json(uploadedFiles);
});
- });
+ });
});
router.post('/audio', function(req, res) {
@@ -67,8 +81,8 @@ function OKS3(options) {
secret: options.s3.secret,
bucket: options.s3.bucket,
dirname: options.s3.dirname,
- maxBytes: options.s3.audio.maxbytes,
- saveAs: options.s3.audio.preserveFilename && preserveFilename,
+ // maxBytes: options.s3.audio.maxbytes,
+ saveAs: options.s3.audio.preserveFilename,
headers: {
'x-amz-acl': 'public-read'
}
@@ -90,8 +104,8 @@ function OKS3(options) {
secret: options.s3.secret,
bucket: options.s3.bucket,
dirname: options.s3.dirname,
- maxBytes: options.s3.video.maxbytes,
- saveAs: options.s3.video.preserveFilename && preserveFilename,
+ // maxBytes: options.s3.video.maxbytes,
+ saveAs: options.s3.video.preserveFilename,
headers: {
'x-amz-acl': 'public-read'
}
diff --git a/app/node_modules/okservices/oks3/package.json b/app/node_modules/okservices/oks3/package.json
index 1d72a26..19a2d2a 100644
--- a/app/node_modules/okservices/oks3/package.json
+++ b/app/node_modules/okservices/oks3/package.json
@@ -9,7 +9,7 @@
"author": "OKFocus",
"license": "None",
"dependencies": {
- "skipper": "^0.5.8",
+ "skipper": "^0.5.9",
"skipper-s3": "^0.5.6"
}
}
diff --git a/examples/db.json b/examples/db.json
index 3650355..da7c19a 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -167,7 +167,13 @@
"title": "Blue",
"__index": 2,
"dateCreated": "Tue, 05 Apr 2016 15:17:54 GMT",
- "media": []
+ "media": [
+ {
+ "uri": "https://ltho.s3.amazonaws.com/okcms-example/f2775199-d700-4b1f-951f-88fda599014e.png",
+ "caption": "",
+ "type": "image"
+ }
+ ]
},
{
"id": "green",
diff --git a/examples/index.js b/examples/index.js
index 147750e..57bce4b 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -41,12 +41,10 @@ var app = okcms.createApp({
secret: process.env.S3_SECRET,
bucket: process.env.S3_BUCKET,
dirname: "okcms-example",
- allowVideoUploads: true,
- allowAudioUploads: true,
- preserveFilenames: true,
- maxsize: 200,
- maxsizeVideo: 150000000,
- maxsizeAudio: 150000000,
+ // TODO: maxbytes stuff isn't working, need to change underlying module
+ image: { preserveFilename: false, maxbytes: 20000 },
+ video: { preserveFilename: true, maxbytes: 0 },
+ audio: { preserveFilename: true, maxbytes: 150000000 },
}
},
diff --git a/package.json b/package.json
index c3a7280..5caef74 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "okcms",
- "version": "0.1.27",
+ "version": "0.1.26",
"description": "great",
"main": "app/index.js",
"scripts": {
@@ -8,7 +8,7 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "OKFocus",
- "license": "None",
+ "license": "LNT",
"dependencies": {
"dotenv": "^1.1.0",
"express": "^4.12.3",
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index a12f517..59fc6ae 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -40,7 +40,8 @@ var OKAdmin = function(){
var parent = this
var uploader = new OKUpload ()
uploader.bind( this )
- uploader.add = function(url){
+ uploader.add = function(media){
+ var url = media.url
var imageTemplate = $(".image-template", parent).html()
var $el = $(imageTemplate)
$el.find(".uri").val(url)
diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js
index 6149424..44a34b5 100644
--- a/themes/okadmin/public/js/upload.js
+++ b/themes/okadmin/public/js/upload.js
@@ -1,8 +1,9 @@
var OKUpload = function(){
- this.action = this.imageAction = "/_services/s3/image"
- this.videoAction = "/_services/s3/video"
- this.audioAction = "/_services/s3/audio"
+ this.config = $("#uploadConfig").data()
+ this.imageAction = "/_services/s3/image"
+ this.videoAction = "/_services/s3/video"
+ this.audioAction = "/_services/s3/audio"
}
OKUpload.prototype.bind = function(rapper){
var uploader = this
@@ -42,29 +43,47 @@ OKUpload.prototype.handleFileSelect = function(e) {
var files = e.dataTransfer ? e.dataTransfer.files : e.target.files;
for (var i = 0, f; f = files[i]; i++) {
- if ( ! f.type.match('image.*') && ! f.type.match('video.*') ) {
- continue;
- }
this.upload(f)
}
}
+OKUpload.prototype.largeFileError = function(file, maxSize) {
+ var your_bytes = bytesToString(file.size)
+ var max_bytes = bytesToString(maxSize)
+ alert("Sorry, your file is too big.\n\n" + file.name + "\n\nYour file: " + your_bytes + "\nMax size: " + max_bytes)
+ function bytesToString (n) {
+ if (n < 1024) return n + " bytes"
+ n /= 1024
+ if (n < 1024) return n.toFixed(1) + " kb"
+ n /= 1024
+ if (n < 1024) return n.toFixed(1) + " mb"
+ }
+}
OKUpload.prototype.upload = function(f){
var field, action
if ( f.type.match('video.*') ) {
+ if (this.config.videoMaxbytes && f.size > this.config.videoMaxbytes) {
+ return this.largeFileError(f, this.config.videoMaxbytes)
+ }
field = 'video'
action = this.videoAction
}
else if ( f.type.match('audio.*') ) {
+ if (this.config.audioMaxbytes && f.size > this.config.audioMaxbytes) {
+ return this.largeFileError(f, this.config.audioMaxbytes)
+ }
field = 'audio'
action = this.audioAction
}
else {
+ if (this.config.imageMaxbytes && f.size > this.config.imageMaxbytes) {
+ return this.largeFileError(f, this.config.imageMaxbytes)
+ }
field = 'image'
action = this.imageAction || this.action
}
-
+
this.xhrCount += 1
this.$progress.addClass("loading")
@@ -109,11 +128,13 @@ OKUpload.prototype.upload = function(f){
console.log(arguments, request)
}
function transferError (data) {
+ console.log("Transfer error")
this.loadCount += 1
this.hideUploadBars()
console.log(arguments)
}
function transferAbort (data) {
+ console.log("Transfer aborted")
this.loadCount += 1
this.hideUploadBars()
console.log(arguments)
@@ -147,6 +168,7 @@ OKUpload.prototype.success = function(data){
return
}
var url = data[0].extra.Location.replace(/%2F/, '\/')
+ console.log(url)
this.parse(url)
}
OKUpload.prototype.add = function(media){
diff --git a/themes/okadmin/templates/partials/head.liquid b/themes/okadmin/templates/partials/head.liquid
index 7ee4824..e9c27dc 100644
--- a/themes/okadmin/templates/partials/head.liquid
+++ b/themes/okadmin/templates/partials/head.liquid
@@ -10,4 +10,4 @@
<span class="breadcrumb"><b>{{meta.project}}</b> Admin</span>
<a class="site-link" href="/">View Site</a>
</header>
- <div class="container">
+ <div class="container"> \ No newline at end of file
diff --git a/themes/okadmin/templates/partials/tail.liquid b/themes/okadmin/templates/partials/tail.liquid
index 53823b0..522023b 100644
--- a/themes/okadmin/templates/partials/tail.liquid
+++ b/themes/okadmin/templates/partials/tail.liquid
@@ -1,5 +1,9 @@
</div> {% comment %} closes container tag {% endcomment %}
<div id="progress"></div>
+ <div id="uploadConfig"
+ data-image-maxbytes="{{meta.services.s3.image.maxbytes}}"
+ data-audio-maxbytes="{{meta.services.s3.audio.maxbytes}}"
+ data-video-maxbytes="{{meta.services.s3.video.maxbytes}}"></div>
</body>
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/3.6.0/lodash.min.js"></script>
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-10 19:59:02 +0000