jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-24 19:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace imageStream with etcher-sdk in the react file selector

Browse Source
This commit is contained in:
Alexis Svinartchouk 2018-07-05 16:54:54 +01:00
parent 98a8588c1b
commit a42e81cf8c
1 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@
'use strict' 'use strict'
const path = require('path') const path = require('path')
const sdk = require('etcher-sdk')
const Bluebird = require('bluebird') const Bluebird = require('bluebird')
const React = require('react') const React = require('react')
@ -36,7 +37,6 @@ const osDialog = require('../../../os/dialog')
const exceptionReporter = require('../../../modules/exception-reporter') const exceptionReporter = require('../../../modules/exception-reporter')
const messages = require('../../../../../shared/messages') const messages = require('../../../../../shared/messages')
const errors = require('../../../../../shared/errors') const errors = require('../../../../../shared/errors')
const imageStream = require('../../../../../sdk/image-stream')
const supportedFormats = require('../../../../../shared/supported-formats') const supportedFormats = require('../../../../../shared/supported-formats')
const analytics = require('../../../modules/analytics') const analytics = require('../../../modules/analytics')
@ -183,7 +183,7 @@ class FileSelector extends React.PureComponent {
applicationSessionUuid: store.getState().toJS().applicationSessionUuid, applicationSessionUuid: store.getState().toJS().applicationSessionUuid,
flashingWorkflowUuid: store.getState().toJS().flashingWorkflowUuid flashingWorkflowUuid: store.getState().toJS().flashingWorkflowUuid
}) })
return return Bluebird.resolve()
} }
return Bluebird.try(() => { return Bluebird.try(() => {
@ -247,23 +247,47 @@ class FileSelector extends React.PureComponent {
return return
} }
if (!supportedFormats.isSupportedImage(file.path)) {
const invalidImageError = errors.createUserError({
title: 'Invalid image',
description: messages.error.invalidImage(file.path)
})
osDialog.showError(invalidImageError)
analytics.logEvent('Invalid image', { path: file.path })
return
}
debug('FileSelector:getImageMetadata', file) debug('FileSelector:getImageMetadata', file)
imageStream.getImageMetadata(file.path) const source = new sdk.sourceDestination.File(file.path, sdk.sourceDestination.File.OpenFlags.Read)
source.getInnerSource()
.then((innerSource) => {
return innerSource.getMetadata()
.then((imageMetadata) => { .then((imageMetadata) => {
debug('FileSelector:getImageMetadata', imageMetadata) debug('FileSelector:getImageMetadata', imageMetadata)
return this.selectImage(imageMetadata) imageMetadata.path = file.path
}) imageMetadata.extension = path.extname(file.path).slice(1)
.catch((error) => { return innerSource.getPartitionTable()
debug('FileSelector:getImageMetadata', error) .then((partitionTable) => {
const imageError = errors.createUserError({ if (partitionTable !== undefined) {
title: 'Error opening image', imageMetadata.hasMBR = true
description: messages.error.openImage(path.basename(file.path), error.message) imageMetadata.partitions = partitionTable.partitions
}
return this.selectImage(imageMetadata)
}) })
osDialog.showError(imageError)
analytics.logException(error)
}) })
})
.catch((error) => {
debug('FileSelector:getImageMetadata', error)
const imageError = errors.createUserError({
title: 'Error opening image',
description: messages.error.openImage(path.basename(file.path), error.message)
})
osDialog.showError(imageError)
analytics.logException(error)
})
} }
onHighlight (file) { onHighlight (file) {