new modules..

5 files changed, 24 insertions, 120 deletions

diff --git a/app/client/modules/index.js b/app/client/modules/index.js
index 6ca4bc5..bc7c263 100644
--- a/app/client/modules/index.js
+++ b/app/client/modules/index.js
@@ -3,4 +3,4 @@ import samplernn from './samplernn'
 
 export default {
   pix2pix, samplernn
-}
\ No newline at end of file
+}
diff --git a/app/client/modules/samplernn/datasets.component.js b/app/client/modules/samplernn/datasets.component.js
index 989f145..56024e7 100644
--- a/app/client/modules/samplernn/datasets.component.js
+++ b/app/client/modules/samplernn/datasets.component.js
@@ -12,11 +12,12 @@ import TextInput from '../../common/textInput.component'
 class SampleRNNDatasets extends Component {
   constructor(props){
     super()
+    // fetch file list
     this.handleUpload = this.handleUpload.bind(this)
     this.handleURL = this.handleURL.bind(this)
   }
   handleUpload(file) {
-
+    
   }
   handleURL(url) {
 
@@ -25,7 +26,7 @@ class SampleRNNDatasets extends Component {
     return (
       <div className='app'>
         <div className='heading'>
-          <h3>SampleRNN Datasets</h3>
+          <h3>SampleRNN</h3>
         </div>
         <div className='params row'>
           <div className='column'>
@@ -41,13 +42,23 @@ class SampleRNNDatasets extends Component {
             </Group>
           </div>
         </div>
+        <div className='params row'>
+          <h3>Datasets</h3>
+          <div className="media">
+            <div className="filename">foo.mp3</div>
+            <div className="size">1.2 mb</div>
+            <div className="date">30 May 2018</div>
+            <div className="epoch">epoch 30</div>
+            <div className="options">
+              delete
+            </div>
+          </div>
+        </div>
       </div>
     )
   }
 }
-function timeInSeconds(n){
-  return (n / 10).toFixed(1) + ' s.'
-}
+
 const mapStateToProps = state => ({
 })
 
diff --git a/app/client/store.js b/app/client/store.js
index f7eb566..108ac83 100644
--- a/app/client/store.js
+++ b/app/client/store.js
@@ -10,6 +10,7 @@ import systemReducer from './system/system.reducer'
 import dashboardReducer from './dashboard/dashboard.reducer'
 import liveReducer from './live/live.reducer'
 import taskReducer from './task/task.reducer'
+import { moduleReducer } from './modules/module.reducer'
 
 const appReducer = combineReducers({
   system: systemReducer,
@@ -17,6 +18,7 @@ const appReducer = combineReducers({
   live: liveReducer,
   task: taskReducer,
   router: routerReducer,
+  module: moduleReducer,
 })
 
 export const history = createHistory()
diff --git a/app/relay/modules/samplernn.js b/app/relay/modules/samplernn.js
index 4181a32..93da566 100644
--- a/app/relay/modules/samplernn.js
+++ b/app/relay/modules/samplernn.js
@@ -1,21 +1,14 @@
 import path from 'path'
 
 const name = 'samplernn'
-const cwd = process.env.TEST_CWD || path.join(process.env.HOME, 'code/' + name + '/')
+const cwd = process.env.SAMPLERNN_CWD || path.join(process.env.HOME, 'code/' + name + '/')
 
 const fetch = {
   type: 'perl',
   script: 'get.pl',
   params: (task) => {
+    return [ task.opt.url ]
   }
-  // perl get.pl url
-}
-const dataset = {
-  type: 'perl',
-  script: 'dataset.pl',
-  params: (task) => {
-  }
-  // perl dataset.pl filename.flac
 }
 const train = {
   type: 'pytorch',
@@ -56,6 +49,6 @@ const publish = {
 export default {
   name, cwd,
   activities: {
-    dataset, train, generate,
+    fetch, train, generate,
   }
 }
diff --git a/app/server/index.js b/app/server/index.js
index 3797cbc..e4bafb0 100644
--- a/app/server/index.js
+++ b/app/server/index.js
@@ -1,104 +1,2 @@
-require('dotenv').config()
-const express = require('express')
-const app = express()
-const http = require('http')
-const socket_io = require('socket.io')
-const path = require('path')
-
-app.use(express.static('public', { extensions: ['html'] }))
-
-function serve_index(req, res) { res.sendFile(path.join(__dirname, '../../public', 'index.html')) }
-app.get('/dashboard/', serve_index)
-app.get('/system/', serve_index)
-app.get('/:module/:mode/', serve_index)
-app.get('/', serve_index)
-// app.get('/images', site.images)
-// app.post('/print', bodyParser.urlencoded({ extended: false }), site.print)
-// app.use('/upload', require('./upload'))
-
-let server = http.createServer(app)
-server.listen(process.env.EXPRESS_PORT, () => {
-  console.log('Cortex remote listening on http://localhost:' + process.env.EXPRESS_PORT)
-})
-
-const io = socket_io(server)
-let relay, client
-let relay_connected = false
-
-client = io.of('/client')
-client.on('connect', bind_client)
-
-if (process.env.EXPRESS_CONNECTS_TO_RELAY === 'true') {
-  console.log('Connecting to relay on ' + process.env.RELAY_REMOTE)
-  relay = require('socket.io-client').connect(process.env.RELAY_REMOTE)
-  bind_relay(relay)
-} else {
-  relay = io.of('/relay')
-  relay.on('connect', bind_relay)
-}
-
-function bind_relay(socket) {
-  console.log('Relay connected')
-  relay_connected = true
-  client.emit('system_res', { type: 'relay_connected' })
-
-  socket.on('res', data => {
-    // console.log('Received response', data.cmd)
-    client.emit('res', data)
-  })
-
-  socket.on('status', data => {
-    // console.log('Received status', data.key)
-    client.emit('status', data)
-  })
-
-  socket.on('system_res', data => {
-    // console.log('System responded', data.type)
-    client.emit('system_res', data)
-  })
-
-  socket.on('task_res', data => {
-    client.emit('task_res', data)
-  })
-
-  socket.on('frame', (data) => {
-    client.volatile.emit('frame', data)
-  })
-
-  socket.on('disconnect', () => {
-    console.log('Relay disconnected')
-    relay_connected = false
-    client.emit('system_res', { type: 'relay_disconnected' })
-  })
-}
-
-function bind_client(socket){
-  console.log('Client connected')
-  if (relay_connected) {
-    socket.emit('system_res', { type: 'relay_connected' })
-    relay.emit('system', { cmd: 'get_status' })
-  } else {
-    socket.emit('system_res', { type: 'relay_disconnected' })
-  }
-
-  socket.on('cmd', data => {
-    // console.log('Client sent command', data)
-    relay.emit('cmd', data)
-  })
-  
-  socket.on('system', data => {
-    // console.log('Client sent system command', data)
-    relay.emit('system', data)
-  })
-
-  socket.on('task', data => {
-    // console.log('Client sent task command', data)
-    relay.emit('task', data)
-  })
-
-  socket.on('disconnect', () => {
-    console.log('Client disconnected')
-  })
-}
-
-
+import * as site from './site'
+import * as bridge from './bridge'