From 960a7495f502d3f6a604a14828dd68bc61bed92e Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 22 Sep 2018 16:32:46 +0200 Subject: preload sequence, dont overload fileviewer --- app/client/common/fileViewer.component.js | 32 +- .../modules/pix2pixhd/views/pix2pixhd.train.js | 5 +- .../modules/pix2pixhd/views/sequence.editor.js | 162 ++++-- package-lock.json | 545 +++++++++++++++++++++ package.json | 1 + 5 files changed, 682 insertions(+), 63 deletions(-) diff --git a/app/client/common/fileViewer.component.js b/app/client/common/fileViewer.component.js index 72aebd4..b1cabd4 100644 --- a/app/client/common/fileViewer.component.js +++ b/app/client/common/fileViewer.component.js @@ -23,19 +23,31 @@ const video_types = { class FileViewer extends Component { state = { - loading: true, + loading: false, + stale: false, buffer: {} } fetch() { - const { file } = this.props - const fn = [file.path, file.name].join('/').replace('//','/') + const { file, path } = this.props + if (!file) return + if (this.state.loading) { + this.setState({ stale: true }) + return + } + const fn = [path || file.path, file.name].join('/').replace('//','/') console.log('fetch file', fn) const { tool: module } = this.props.app this.setState({ buffer: null, loading: true }) actions.socket.read_file({ module, fn }).then(buffer => { - console.log(buffer) - this.setState({ buffer, loading: false }) + console.log('fetched buffer') + const { stale } = this.state + this.setState({ buffer, loading: false, stale: false, }, () => { + if (stale) { + console.log('stale, fetching...') + this.fetch() + } + }) }) } @@ -50,6 +62,10 @@ class FileViewer extends Component { } render() { + const { file } = this.props + if (!file) { + return
+ } const { loading, buffer } = this.state if (loading) { return
Loading...
@@ -69,14 +85,14 @@ class FileViewer extends Component { if (!buf) { return
File empty
} - const ext = name.split('.').slice(-1)[0].toLowerCase() + const ext = extension(name) let tag; if (ext in image_types) { tag = } else if (ext in audio_types) { tag =