jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-29 14:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use drivelist directly

Browse Source 
Use etcher-sdk's drive scanner instead.

Change-Type: patch
This commit is contained in:
Alexis Svinartchouk 2019-02-14 19:10:32 +01:00
parent 3b6fe7b548
commit 082c77586f
3 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/gui/app/components/file-selector/file-selector/file-selector.jsx
View File

@ -123,11 +123,15 @@ class FileSelector extends React.PureComponent {
files: [], files: [],
} }
if (props.constraintpath) { }
files.getConstraintDevice(props.constraintpath, (error, device) => {
debug('FileSelector:getConstraintDevice', error || device) componentDidMount() {
this.setState({ constraint: device }) if (this.props.constraintpath) {
}) const device = files.getConstraintDevice(this.props.constraintpath)
debug('FileSelector:getConstraintDevice', device)
if (device !== undefined) {
this.setState({ constraint: device.drive })
}
} }
} }

26
lib/gui/app/models/files.js
View File

@ -19,7 +19,8 @@
const Bluebird = require('bluebird') const Bluebird = require('bluebird')
const fs = Bluebird.promisifyAll(require('fs')) const fs = Bluebird.promisifyAll(require('fs'))
const path = require('path') const path = require('path')
const drivelist = require('drivelist')
const driveScanner = require('../modules/drive-scanner')
/* eslint-disable lodash/prefer-lodash-method */ /* eslint-disable lodash/prefer-lodash-method */
/* eslint-disable no-undefined */ /* eslint-disable no-undefined */
@ -143,26 +144,13 @@ exports.splitPath = (fullpath, subpaths = []) => {
/** /**
* @summary Get constraint path device * @summary Get constraint path device
* @param {String} pathname - device path * @param {String} pathname - device path
* @param {Function} callback - callback(error, constraintDevice) * @returns {Drive} drive - drive object
* @example * @example
* files.getConstraintDevice('/dev/disk2', (error, device) => { * const device = files.getConstraintDevice('/dev/disk2')
* // ...
* })
*/ */
exports.getConstraintDevice = (pathname, callback) => { exports.getConstraintDevice = (pathname) => {
drivelist.list((error, devices) => { // This supposes the drive scanner is ready
if (error) { return driveScanner.getBy('device', pathname) || driveScanner.getBy('devicePath', pathname)
callback()
return
}
const constraintDevice = devices.find((device) => {
return device.device === pathname ||
device.devicePath === pathname
})
callback(null, constraintDevice)
})
} }
exports.FileEntry = FileEntry exports.FileEntry = FileEntry

1
package.json
View File

@ -47,7 +47,6 @@
"command-join": "^2.0.0", "command-join": "^2.0.0",
"d3": "^4.13.0", "d3": "^4.13.0",
"debug": "^3.1.0", "debug": "^3.1.0",
"drivelist": "^6.4.2",
"electron-is-running-in-asar": "^1.0.0", "electron-is-running-in-asar": "^1.0.0",
"etcher-sdk": "^1.0.3", "etcher-sdk": "^1.0.3",
"flexboxgrid": "^6.3.0", "flexboxgrid": "^6.3.0",