Skip to content

show 'USE' label instead of 'CREATE' at init modal if path exists #1359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lukaszb wants to merge 4 commits into from
Closed

show 'USE' label instead of 'CREATE' at init modal if path exists #1359

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7fdb2b
show 'USE' label instead of 'CREATE' at init modal if path exists
lukaszb Jan 2, 2018
ba06634
lint fixes
lukaszb Jan 5, 2018
928e6bf
removed unused code
lukaszb Jan 5, 2018
f651fd8
exported pathExists
lukaszb Jan 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions browser/main/modals/InitModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import _ from 'lodash'
const CSON = require('@rokt33r/season')
const path = require('path')
const electron = require('electron')
const fs = require('fs')
const { remote } = electron

function browseFolder () {
Expand All @@ -31,8 +32,10 @@ class InitModal extends React.Component {
constructor (props) {
super(props)

const initPath = path.join(remote.app.getPath('home'), 'Boostnote')
this.state = {
path: path.join(remote.app.getPath('home'), 'Boostnote'),
path: initPath,
pathAlreadyExists: pathExists(initPath),
migrationRequested: true,
isLoading: true,
data: null,
Expand All @@ -42,9 +45,12 @@ class InitModal extends React.Component {
}

handlePathChange (e) {
this.setState({
path: e.target.value
})
this.updatePath(e.target.value)
}

updatePath(path) {
const pathAlreadyExists = pathExists(path)
this.setState({ path, pathAlreadyExists })
}

componentDidMount () {
Expand All @@ -70,9 +76,7 @@ class InitModal extends React.Component {
browseFolder()
.then((targetPath) => {
if (targetPath.length > 0) {
this.setState({
path: targetPath
})
this.updatePath(targetPath)
}
})
.catch((err) => {
Expand Down Expand Up @@ -237,7 +241,7 @@ class InitModal extends React.Component {
? <span>
<i className='fa fa-spin fa-spinner' /> Loading...
</span>
: 'CREATE'
: (this.state.pathAlreadyExists ? 'USE' : 'CREATE')
}
</button>
</div>
Expand All @@ -252,3 +256,18 @@ InitModal.propTypes = {
}

export default CSSModules(InitModal, styles)


function pathExists(path) {
try {
fs.statSync(path)
return true
} catch(e) {
if (e.errno === -2) {
// no such file or dir
return false
} else {
throw e
}
}
}
3 changes: 2 additions & 1 deletion browser/main/modals/PreferencesModal/StoragesTab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ class StoragesTab extends React.Component {
newStorage: {
name: 'Unnamed',
type: 'FILESYSTEM',
path: ''
path: '',
pathAlreadyExists: false,
}
}, () => {
this.refs.addStorageName.select()
Expand Down