summaryrefslogtreecommitdiff
path: root/app/server
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-06-26 16:09:33 +0200
committerJules Laplace <julescarbon@gmail.com>2018-06-26 16:09:33 +0200
commit2f0fd83837f9d728b384b033e0b9b2b8570df2de (patch)
tree32400963c262138481259d9d1205245f30429e68 /app/server
parent577e2753bd7979badcaf23274bbb7327fa892512 (diff)
agh
Diffstat (limited to 'app/server')
-rw-r--r--app/server/db/model.js7
-rw-r--r--app/server/db/models.js6
2 files changed, 9 insertions, 4 deletions
diff --git a/app/server/db/model.js b/app/server/db/model.js
index c5faf03..dd851bf 100644
--- a/app/server/db/model.js
+++ b/app/server/db/model.js
@@ -108,9 +108,10 @@ module.exports = function modelScope(type, db_model, _props) {
create: (data) => {
return new Promise( (resolve, reject) => {
- crud.create( model.sanitize(data) ).then( (data) => {
- resolve(data.toJSON())
- props.afterCreate && props.afterCreate(data)
+ const should_relay = data.should_relay === 'true'
+ crud.create( model.sanitize(data) ).then( (rec) => {
+ resolve(rec.toJSON())
+ props.afterCreate && props.afterCreate(rec, should_relay)
}).catch( (e) => {
console.error('error creating', e)
reject()
diff --git a/app/server/db/models.js b/app/server/db/models.js
index 24be774..f37a7bf 100644
--- a/app/server/db/models.js
+++ b/app/server/db/models.js
@@ -1,6 +1,7 @@
let model = require('./model')
let bookshelf = require("./bookshelf").bookshelf
+const client = require('../bridge').client
let Folder = bookshelf.Model.extend({
tableName: 'folders',
@@ -42,9 +43,12 @@ module.exports = {
}),
file: model('file', File, {
fields: "folder_id username name url mime datatype duration analysis size stars activity module checkpoint dataset epoch processed generated opt created_at updated_at".split(" "),
- afterCreate: (file) => {
+ afterCreate: (file, should_relay) => {
console.log('created file')
// bridge.processFiles()
+ if (should_relay) { // if this came from an automated command...
+ client.emit('api_res', { type: 'create', datatype: 'file', data: file.toJSON() })
+ }
}
}),
task: model('task', Task, {