From f8b61281be84a6e4e7a44be5109e688a7c56c671 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 7 Jul 2017 21:18:33 +0200 Subject: refactor files so list updates while processing --- .../components/Browser/Folder/FileUploadButton.jsx | 35 ---------- client/components/Browser/Folder/Files.jsx | 79 ---------------------- 2 files changed, 114 deletions(-) delete mode 100644 client/components/Browser/Folder/FileUploadButton.jsx delete mode 100644 client/components/Browser/Folder/Files.jsx (limited to 'client/components/Browser/Folder') diff --git a/client/components/Browser/Folder/FileUploadButton.jsx b/client/components/Browser/Folder/FileUploadButton.jsx deleted file mode 100644 index 136cd45..0000000 --- a/client/components/Browser/Folder/FileUploadButton.jsx +++ /dev/null @@ -1,35 +0,0 @@ -import { h, Component } from 'preact' - -import client from '../../../client.js' - -export default class Folder extends Component { - constructor(props) { - super() - this.state = { - } - this.updateFiles = this.updateFiles.bind(this) - } - updateFiles(event){ - const name = event.target.name - const files = event.target.files - client.upload(this.props.folder.id, files).then( got_files => { - this.props.addFiles(got_files) - }) - } - - render() { - const files = (this.props.folder.files || []).map( (file, i) => { - return ( -
- {file.name} -
- ) - }) - return ( -
- - + upload -
- ) - } -} diff --git a/client/components/Browser/Folder/Files.jsx b/client/components/Browser/Folder/Files.jsx deleted file mode 100644 index f0ad95e..0000000 --- a/client/components/Browser/Folder/Files.jsx +++ /dev/null @@ -1,79 +0,0 @@ -import { h, Component } from 'preact' - -import { audioPlayFile } fromĀ '../../../actions' - -import client from '../../../client.js' - -import FileUploadButton from './FileUploadButton.jsx' -import FileLink from '../../../containers/fileLink.js' -import TaskContentLink from '../../../containers/taskContentLink.js' -import TaskStyleLink from '../../../containers/taskStyleLink.js' - -export default class Files extends Component { - constructor(props) { - super() - this.state = { - files: props.folder.files || [], - selected: null, - } - this.addFiles = this.addFiles.bind(this) - if (! props.folder.files) { - client.file.index({ folder_id: props.folder.id }).then( files => this.setState({ files }) ) - } - } - addFiles(newFiles) { - if (! newFiles) return - const files = this.state.files.concat(newFiles).sort( (a,b) => { return b.id - a.id } ) - this.setState({ files }) - } - handleClick(file) { - this.setState({ selected: file }) - } - render() { - const files = (this.state.files).map(toFilenamePair).sort(sortByFilename).map(fromPair).map( (file, i) => { - if (! file) return - return ( -
- {file.name} - {file.processed ? file.mime : 'working...'} - {file.duration ? (file.duration.toFixed(1) + 's') : ''} - - content - style - -
- ) - }) - return ( -
-
- {this.props.folder.name} -
- - -
-
-
- {files} -
-
- ) - } -} - -function toFilenamePair (file) { return [file.name.toLowerCase(), file] } -function sortByFilename (a,b) { return a[0] < b[0] ? -1 : a[0] == b[0] ? 0 : 1 } -function fromPair (pair) { return pair[1] } - -function filepath (file) { - return '/data/' + file.folder_id + '/' + encodeURIComponent(file.name) -} -function mp3path (file) { - if (file.mime !== 'audio/mp3') { - return filepath(file) + '.mp3' - } - return filepath(file) -} -function pngpath (file) { - return filepath(file) + '.png' -} \ No newline at end of file -- cgit v1.2.3-70-g09d2