From be3b2bd56550b71a2ffb7eb1604c1b8c1d2dd4a2 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 26 May 2018 21:33:26 +0200 Subject: refactor some task stuff --- app/client/live/actions.js | 53 ----------------- app/client/live/live.actions.js | 53 +++++++++++++++++ app/client/live/live.reducer.js | 129 ++++++++++++++++++++++++++++++++++++++++ app/client/live/reducer.js | 129 ---------------------------------------- 4 files changed, 182 insertions(+), 182 deletions(-) delete mode 100644 app/client/live/actions.js create mode 100644 app/client/live/live.actions.js create mode 100644 app/client/live/live.reducer.js delete mode 100644 app/client/live/reducer.js (limited to 'app/client/live') diff --git a/app/client/live/actions.js b/app/client/live/actions.js deleted file mode 100644 index e63854e..0000000 --- a/app/client/live/actions.js +++ /dev/null @@ -1,53 +0,0 @@ -import * as socket from '../socket' -import types from '../types' - -export const get_params = () => { - socket.get_params() - return { type: types.player.get_params, } -} - -export const set_param = (key, value) => { - console.log('set param', key, value) - socket.set_param(key, value) - return { type: types.player.set_param, key, value, } -} - -export const list_checkpoints = () => { - socket.list_checkpoints() - return { type: types.player.loading_checkpoints, } -} - -export const list_epochs = (path) => { - socket.list_epochs(path) - return { type: types.player.loading_epochs, } -} - -export const list_sequences = () => { - socket.list_sequences() - return { type: types.player.loading_sequences } -} - -export const load_sequence = (sequence) => { - socket.load_sequence(sequence) - return { type: types.player.loading_sequence, } -} - -export const load_epoch = (checkpoint, epoch) => { - socket.load_epoch(checkpoint, epoch) - return { type: types.player.loading_checkpoint, } -} - -export const seek = (frame) => { - socket.seek(frame) - return { type: types.player.seeking, } -} - -export const pause = (frame) => { - socket.pause(pause) - return { type: types.player.pausing, } -} - -export const play = (frame) => { - socket.play() - return { type: types.player.playing, } -} diff --git a/app/client/live/live.actions.js b/app/client/live/live.actions.js new file mode 100644 index 0000000..e63854e --- /dev/null +++ b/app/client/live/live.actions.js @@ -0,0 +1,53 @@ +import * as socket from '../socket' +import types from '../types' + +export const get_params = () => { + socket.get_params() + return { type: types.player.get_params, } +} + +export const set_param = (key, value) => { + console.log('set param', key, value) + socket.set_param(key, value) + return { type: types.player.set_param, key, value, } +} + +export const list_checkpoints = () => { + socket.list_checkpoints() + return { type: types.player.loading_checkpoints, } +} + +export const list_epochs = (path) => { + socket.list_epochs(path) + return { type: types.player.loading_epochs, } +} + +export const list_sequences = () => { + socket.list_sequences() + return { type: types.player.loading_sequences } +} + +export const load_sequence = (sequence) => { + socket.load_sequence(sequence) + return { type: types.player.loading_sequence, } +} + +export const load_epoch = (checkpoint, epoch) => { + socket.load_epoch(checkpoint, epoch) + return { type: types.player.loading_checkpoint, } +} + +export const seek = (frame) => { + socket.seek(frame) + return { type: types.player.seeking, } +} + +export const pause = (frame) => { + socket.pause(pause) + return { type: types.player.pausing, } +} + +export const play = (frame) => { + socket.play() + return { type: types.player.playing, } +} diff --git a/app/client/live/live.reducer.js b/app/client/live/live.reducer.js new file mode 100644 index 0000000..60bcb41 --- /dev/null +++ b/app/client/live/live.reducer.js @@ -0,0 +1,129 @@ +import moment from 'moment' +import FileSaver from 'file-saver' +import types from '../types' + +const liveInitialState = { + loading: false, + error: null, + opt: {}, + checkpoints: [], + epochs: ['latest'], + sequences: [], + fps: 0, + frame: { i: 0, sequence_i: 0, sequence_len: '1' } +} + +const liveReducer = (state = liveInitialState, action) => { + let results; + + switch(action.type) { + case types.player.load_params: + if (! action.opt || ! Object.keys(action.opt).length) { + return state + } + return { + ...state, + loading: false, + error: null, + opt: action.opt, + } + + case types.player.set_param: + return { + ...state, + opt: { + ...state.opt, + [action.key]: action.value, + } + } + + case types.player.list_checkpoints: + return { + ...state, + checkpoints: action.checkpoints, + epochs: [], + } + + case types.player.list_epochs: + return { + ...state, + epochs: (action.epochs || []).map(a => [ a == 'latest' ? Infinity : a, a ]) + .sort((a,b) => a[0] - b[0]) + .map(a => a[1]) + } + + case types.player.list_sequences: + return { + ...state, + sequences: action.sequences, + } + + case types.player.set_fps: + return { + ...state, + fps: action.fps, + } + + case types.player.current_frame: + return action.meta ? { + ...state, + frame: action.meta + } : state + + case types.player.start_recording: + return { + ...state, + opt: { + ...state.opt, + recording: true, + } + } + case types.player.add_record_frame: + return { + ...state, + opt: { + ...state.opt, + recordFrames: (state.opt.recordFrames || 0) + 1, + } + } + + case types.player.save_frame: + FileSaver.saveAs( + action.blob, + state.opt.checkpoint_name + "_" + + state.opt.sequence + "_" + + moment().format("YYYYMMDD_HHmm") + ".png" + ) + return state + + case types.player.saving_video: + return { + ...state, + opt: { + ...state.opt, + savingVideo: true, + } + } + case types.player.save_video: + FileSaver.saveAs( + action.blob, + state.opt.checkpoint_name + "_" + + state.opt.sequence + "_" + + moment().format("YYYYMMDD_HHmm") + ".webm" + ) + return { + ...state, + opt: { + ...state.opt, + recording: false, + savingVideo: false, + recordFrames: 0, + } + } + + default: + return state + } +} + +export default liveReducer diff --git a/app/client/live/reducer.js b/app/client/live/reducer.js deleted file mode 100644 index 60bcb41..0000000 --- a/app/client/live/reducer.js +++ /dev/null @@ -1,129 +0,0 @@ -import moment from 'moment' -import FileSaver from 'file-saver' -import types from '../types' - -const liveInitialState = { - loading: false, - error: null, - opt: {}, - checkpoints: [], - epochs: ['latest'], - sequences: [], - fps: 0, - frame: { i: 0, sequence_i: 0, sequence_len: '1' } -} - -const liveReducer = (state = liveInitialState, action) => { - let results; - - switch(action.type) { - case types.player.load_params: - if (! action.opt || ! Object.keys(action.opt).length) { - return state - } - return { - ...state, - loading: false, - error: null, - opt: action.opt, - } - - case types.player.set_param: - return { - ...state, - opt: { - ...state.opt, - [action.key]: action.value, - } - } - - case types.player.list_checkpoints: - return { - ...state, - checkpoints: action.checkpoints, - epochs: [], - } - - case types.player.list_epochs: - return { - ...state, - epochs: (action.epochs || []).map(a => [ a == 'latest' ? Infinity : a, a ]) - .sort((a,b) => a[0] - b[0]) - .map(a => a[1]) - } - - case types.player.list_sequences: - return { - ...state, - sequences: action.sequences, - } - - case types.player.set_fps: - return { - ...state, - fps: action.fps, - } - - case types.player.current_frame: - return action.meta ? { - ...state, - frame: action.meta - } : state - - case types.player.start_recording: - return { - ...state, - opt: { - ...state.opt, - recording: true, - } - } - case types.player.add_record_frame: - return { - ...state, - opt: { - ...state.opt, - recordFrames: (state.opt.recordFrames || 0) + 1, - } - } - - case types.player.save_frame: - FileSaver.saveAs( - action.blob, - state.opt.checkpoint_name + "_" + - state.opt.sequence + "_" + - moment().format("YYYYMMDD_HHmm") + ".png" - ) - return state - - case types.player.saving_video: - return { - ...state, - opt: { - ...state.opt, - savingVideo: true, - } - } - case types.player.save_video: - FileSaver.saveAs( - action.blob, - state.opt.checkpoint_name + "_" + - state.opt.sequence + "_" + - moment().format("YYYYMMDD_HHmm") + ".webm" - ) - return { - ...state, - opt: { - ...state.opt, - recording: false, - savingVideo: false, - recordFrames: 0, - } - } - - default: - return state - } -} - -export default liveReducer -- cgit v1.2.3-70-g09d2