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

Don't show a dialog when the write fails.

Browse Source 
There is already an error modal and the error detail will be shown in the console.

Changelog-entry: Don't show a dialog when the write fails.
This commit is contained in:
Alexis Svinartchouk 2019-04-22 18:25:26 +02:00
parent 63c047009f
commit 1f7e4c886b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/gui/app/pages/main/controllers/flash.js
View File

@ -22,7 +22,7 @@ const flashState = require('../../../models/flash-state')
const driveScanner = require('../../../modules/drive-scanner') const driveScanner = require('../../../modules/drive-scanner')
const progressStatus = require('../../../modules/progress-status') const progressStatus = require('../../../modules/progress-status')
const notification = require('../../../os/notification') const notification = require('../../../os/notification')
const exceptionReporter = require('../../../modules/exception-reporter') const analytics = require('../../../modules/analytics')
const imageWriter = require('../../../modules/image-writer') const imageWriter = require('../../../modules/image-writer')
const path = require('path') const path = require('path')
const store = require('../../../models/store') const store = require('../../../models/store')
@ -145,12 +145,13 @@ module.exports = function (
driveScanner.stop() driveScanner.stop()
const iconPath = '../../../assets/icon.png' const iconPath = '../../../assets/icon.png'
const basename = path.basename(image.path)
try { try {
await imageWriter.flash(image.path, drives) await imageWriter.flash(image.path, drives)
if (!flashState.wasLastFlashCancelled()) { if (!flashState.wasLastFlashCancelled()) {
const flashResults = flashState.getFlashResults() const flashResults = flashState.getFlashResults()
notification.send('Flash complete!', { notification.send('Flash complete!', {
body: messages.info.flashComplete(path.basename(image.path), drives, flashResults.results.devices), body: messages.info.flashComplete(basename, drives, flashResults.results.devices),
icon: iconPath icon: iconPath
}) })
$state.go('success') $state.go('success')
@ -181,7 +182,8 @@ module.exports = function (
FlashErrorModalService.show(messages.error.childWriterDied()) FlashErrorModalService.show(messages.error.childWriterDied())
} else { } else {
FlashErrorModalService.show(messages.error.genericFlashError()) FlashErrorModalService.show(messages.error.genericFlashError())
exceptionReporter.report(error) error.image = basename
analytics.logException(error)
} }
} finally { } finally {
availableDrives.setDrives([]) availableDrives.setDrives([])

2
lib/shared/messages.js
View File

@ -171,7 +171,7 @@ module.exports = {
}, },
genericFlashError: () => { genericFlashError: () => {
return 'Oops, seems something went wrong.' return 'Something went wrong. If it is a compressed image, please check that the archive is not corrupted.'
}, },
validation: () => { validation: () => {