task queuing workingggg

1 files changed, 36 insertions, 20 deletions

diff --git a/public/bundle.js b/public/bundle.js
index a3b0565..43b738b 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -2686,6 +2686,12 @@ var _redux = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js"
 
 var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js");
 
+var _util = __webpack_require__(/*! ../util */ "./app/client/util/index.js");
+
+var util = _interopRequireWildcard(_util);
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
@@ -2710,9 +2716,6 @@ var TaskList = function (_Component) {
 
 						var time = 0;
 						var taskList = tasks.map(function (task) {
-								console.log(task);
-								var eta = time + task.epochs * 180 / 60 + " min.";
-								time += task.epochs * 180 / 60;
 								var dataset_type = void 0,
 								    dataset_name = void 0;
 								if (task.dataset.indexOf('/') !== -1) {
@@ -2744,14 +2747,8 @@ var TaskList = function (_Component) {
 										),
 										(0, _preact.h)(
 												'div',
-												{ 'class': 'epochs' },
-												task.epoch,
-												' ep.'
-										),
-										(0, _preact.h)(
-												'div',
-												{ 'class': 'eta' },
-												eta
+												{ className: "age " + util.carbon_date(task.updated_at) },
+												util.get_age(task.updated_at)
 										)
 								);
 						});
@@ -6509,6 +6506,7 @@ var SampleRNNShow = function (_Component) {
         (0, _preact.h)(_samplernn3.default, {
           id: this.props.match.params.id || localStorage.getItem('samplernn.last_id'),
           folder: folder,
+          history: history,
           onPickFile: function onPickFile(file, e) {
             e.preventDefault();
             e.stopPropagation();
@@ -6730,7 +6728,7 @@ var queueInitialState = {
   completed: []
 };
 
-var dateSort = util.sort.orderByFn('date desc');
+var dateSort = util.sort.orderByFn('updated_at desc');
 var prioritySort = util.sort.orderByFn('priority asc');
 
 var queueReducer = function queueReducer() {
@@ -6738,12 +6736,6 @@ var queueReducer = function queueReducer() {
   var action = arguments[1];
 
   switch (action.type) {
-    case _types2.default.task.create:
-      console.log(action.data);
-      return _extends({}, state, {
-        tasks: _extends({}, state.tasks, _defineProperty({}, action.data.id, action.data)),
-        queue: state.queue.concat([action.data.id])
-      });
     case _types2.default.task.index:
       return _extends({}, state, {
         tasks: action.data.reduce(function (a, b) {
@@ -6760,6 +6752,23 @@ var queueReducer = function queueReducer() {
           return pair[1].id;
         })
       });
+    case _types2.default.task.create:
+      console.log(action.data);
+      return _extends({}, state, {
+        tasks: _extends({}, state.tasks, _defineProperty({}, action.data.id, action.data)),
+        queue: state.queue.concat([action.data.id])
+      });
+    case _types2.default.task.update:
+      return _extends({}, state, {
+        tasks: _extends({}, state.tasks, _defineProperty({}, action.data.id, action.data))
+      });
+    case _types2.default.task.task_finish:
+      return _extends({}, state, {
+        queue: state.queue.filter(function (a) {
+          return a !== action.task.id;
+        }),
+        completed: [action.task.id].concat(state.completed)
+      });
     default:
       return state;
   }
@@ -7192,6 +7201,9 @@ var finishTimeout = void 0;
 
 _socket.socket.on('task_res', function (data) {
   console.log('task response', data);
+  if (data.task) {
+    (0, _store.dispatch)({ type: _types2.default.task.update, data: data.task });
+  }
   switch (data.type) {
     case 'start':
       // return dispatch({ type: types.system.rpc_connected, runner: data.runner })
@@ -7227,11 +7239,9 @@ _socket.socket.on('task_res', function (data) {
       break;
     case 'progress':
       (0, _store.dispatch)({ type: _types2.default.task.progress, task: data.task });
-      (0, _store.dispatch)({ type: _types2.default.task.update, task: data.task });
       break;
     case 'epoch':
       (0, _store.dispatch)({ type: _types2.default.task.epoch, task: data.task });
-      (0, _store.dispatch)({ type: _types2.default.task.update, task: data.task });
       break;
     case 'task_error':
       return console.log('task error', data);
@@ -8459,6 +8469,12 @@ var orderByFn = exports.orderByFn = function orderByFn() {
       };
       sortFn = numericSort[direction];
       break;
+    case 'updated_at':
+      mapFn = function mapFn(a) {
+        return [+new Date(a.updated_at), a];
+      };
+      sortFn = numericSort[direction];
+      break;
     case 'priority':
       mapFn = function mapFn(a) {
         return [parseInt(a.priority) || parseInt(a.id) || 1000, a];