summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-10-16 18:08:13 +0200
committerJules Laplace <julescarbon@gmail.com>2018-10-16 18:08:13 +0200
commit36e2151d2480d9baadaf2e35c90af721082dc8a8 (patch)
treeba40452b898a39a85b8040cd9476f0d52d14465d /app
parentd13187a09e951d9a048a034322d2e28c9797a850 (diff)
add folder_id to dataset object
Diffstat (limited to 'app')
-rw-r--r--app/client/dataset/dataset.loader.js1
-rw-r--r--app/client/modules/pix2pixhd/views/pix2pixhd.train.js18
2 files changed, 18 insertions, 1 deletions
diff --git a/app/client/dataset/dataset.loader.js b/app/client/dataset/dataset.loader.js
index 76d8b16..f1ff75e 100644
--- a/app/client/dataset/dataset.loader.js
+++ b/app/client/dataset/dataset.loader.js
@@ -20,6 +20,7 @@ export const unsortedFolder = (module, instantiate=false) => {
export const emptyDataset = (module, datasetLookup, name, folder) => {
const dataset = {
name,
+ folder_id: folder.id,
input: [],
checkpoints: [],
output: [],
diff --git a/app/client/modules/pix2pixhd/views/pix2pixhd.train.js b/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
index 78def7a..d4e390c 100644
--- a/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
+++ b/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
@@ -152,8 +152,24 @@ class Pix2PixHDTrain extends Component {
renderEditor(){
const { pix2pixhd, queue, remote } = this.props
- const { checkpoint, folder_id } = pix2pixhd
const { dataset, processed } = this.state
+ let { checkpoint, folder_id } = pix2pixhd
+
+ const currentDataset = this.props.pix2pixhd.data.datasetLookup[this.state.dataset]
+ if (currentDataset && currentDataset.folder_id) {
+ folder_id = currentDataset.folder_id || folder_id
+ console.log("dataset folder id", folder_id)
+ const processed = currentDataset.input
+ .map(f => this.props.pix2pixhd.data.fileLookup[f])
+ .reduce((a, b) => {
+ console.log(b)
+ return b.processed || a
+ }, false)
+ console.log("is processed?", processed)
+ }
+ console.log(currentDataset)
+ console.log("so folder id is..", folder_id)
+
return (
<div>
<Group title='Sequence Editor'>