From 687e0b563b0dc3619ece4ce49d353d5838a21ff6 Mon Sep 17 00:00:00 2001 From: Jonas Hermsmeier Date: Fri, 25 May 2018 18:23:53 +0200 Subject: [PATCH] refactor(gui): Move shared models to app/models --- lib/gui/app/app.js | 6 +++--- .../drive-selector/controllers/drive-selector.js | 4 ++-- .../file-selector/file-selector/file-selector.jsx | 2 +- .../flash-error-modal/services/flash-error-modal.js | 4 ++-- lib/{shared => gui/app}/models/available-drives.js | 2 +- lib/{shared => gui/app}/models/flash-state.js | 4 ++-- lib/{shared => gui/app}/models/selection-state.js | 2 +- lib/gui/app/modules/image-writer.js | 4 ++-- lib/gui/app/pages/finish/controllers/finish.js | 4 ++-- lib/gui/app/pages/main/controllers/drive-selection.js | 2 +- lib/gui/app/pages/main/controllers/flash.js | 10 +++++++--- lib/gui/app/pages/main/controllers/image-selection.js | 2 +- lib/gui/app/pages/main/controllers/main.js | 6 +++--- tests/gui/modules/image-writer.spec.js | 2 +- tests/gui/pages/main.spec.js | 6 +++--- tests/shared/models/available-drives.spec.js | 4 ++-- tests/shared/models/flash-state.spec.js | 2 +- tests/shared/models/selection-state.spec.js | 4 ++-- 18 files changed, 37 insertions(+), 33 deletions(-) rename lib/{shared => gui/app}/models/available-drives.js (96%) rename lib/{shared => gui/app}/models/flash-state.js (98%) rename lib/{shared => gui/app}/models/selection-state.js (99%) diff --git a/lib/gui/app/app.js b/lib/gui/app/app.js index 2ce1802a..b52b414c 100644 --- a/lib/gui/app/app.js +++ b/lib/gui/app/app.js @@ -36,13 +36,13 @@ const release = require('../../shared/release') const store = require('./models/store') const errors = require('../../shared/errors') const packageJSON = require('../../../package.json') -const flashState = require('../../shared/models/flash-state') +const flashState = require('./models/flash-state') const settings = require('./models/settings') const windowProgress = require('./os/window-progress') const analytics = require('./modules/analytics') const updateNotifier = require('./components/update-notifier') -const availableDrives = require('../../shared/models/available-drives') -const selectionState = require('../../shared/models/selection-state') +const availableDrives = require('./models/available-drives') +const selectionState = require('./models/selection-state') const driveScanner = require('./modules/drive-scanner') const osDialog = require('./os/dialog') const exceptionReporter = require('./modules/exception-reporter') diff --git a/lib/gui/app/components/drive-selector/controllers/drive-selector.js b/lib/gui/app/components/drive-selector/controllers/drive-selector.js index 0b873049..c008cf9c 100644 --- a/lib/gui/app/components/drive-selector/controllers/drive-selector.js +++ b/lib/gui/app/components/drive-selector/controllers/drive-selector.js @@ -21,8 +21,8 @@ const _ = require('lodash') const Bluebird = require('bluebird') const constraints = require('../../../../../shared/drive-constraints') const analytics = require('../../../modules/analytics') -const availableDrives = require('../../../../../shared/models/available-drives') -const selectionState = require('../../../../../shared/models/selection-state') +const availableDrives = require('../../../models/available-drives') +const selectionState = require('../../../models/selection-state') const utils = require('../../../../../shared/utils') module.exports = function ( diff --git a/lib/gui/app/components/file-selector/file-selector/file-selector.jsx b/lib/gui/app/components/file-selector/file-selector/file-selector.jsx index 4484d01f..c1241b9e 100644 --- a/lib/gui/app/components/file-selector/file-selector/file-selector.jsx +++ b/lib/gui/app/components/file-selector/file-selector/file-selector.jsx @@ -37,7 +37,7 @@ const Storage = require('../../../models/storage') const analytics = require('../../../modules/analytics') const middleEllipsis = require('../../../utils/middle-ellipsis') const files = require('../../../../../shared/files') -const selectionState = require('../../../../../shared/models/selection-state') +const selectionState = require('../../../models/selection-state') const imageStream = require('../../../../../sdk/image-stream') const errors = require('../../../../../shared/errors') const messages = require('../../../../../shared/messages') diff --git a/lib/gui/app/components/flash-error-modal/services/flash-error-modal.js b/lib/gui/app/components/flash-error-modal/services/flash-error-modal.js index 811b203b..42494138 100644 --- a/lib/gui/app/components/flash-error-modal/services/flash-error-modal.js +++ b/lib/gui/app/components/flash-error-modal/services/flash-error-modal.js @@ -16,8 +16,8 @@ 'use strict' -const flashState = require('../../../../../shared/models/flash-state') -const selectionState = require('../../../../../shared/models/selection-state') +const flashState = require('../../../models/flash-state') +const selectionState = require('../../../models/selection-state') const analytics = require('../../../modules/analytics') module.exports = function (WarningModalService) { diff --git a/lib/shared/models/available-drives.js b/lib/gui/app/models/available-drives.js similarity index 96% rename from lib/shared/models/available-drives.js rename to lib/gui/app/models/available-drives.js index c324cd57..78e4b525 100644 --- a/lib/shared/models/available-drives.js +++ b/lib/gui/app/models/available-drives.js @@ -17,7 +17,7 @@ 'use strict' const _ = require('lodash') -const store = require('../../gui/app/models/store') +const store = require('./store') /** * @summary Check if there are available drives diff --git a/lib/shared/models/flash-state.js b/lib/gui/app/models/flash-state.js similarity index 98% rename from lib/shared/models/flash-state.js rename to lib/gui/app/models/flash-state.js index 33966013..59cad9f7 100644 --- a/lib/shared/models/flash-state.js +++ b/lib/gui/app/models/flash-state.js @@ -17,8 +17,8 @@ 'use strict' const _ = require('lodash') -const store = require('../../gui/app/models/store') -const units = require('../units') +const store = require('./store') +const units = require('../../../shared/units') /** * @summary Reset flash state diff --git a/lib/shared/models/selection-state.js b/lib/gui/app/models/selection-state.js similarity index 99% rename from lib/shared/models/selection-state.js rename to lib/gui/app/models/selection-state.js index 58d470fb..56af929d 100644 --- a/lib/shared/models/selection-state.js +++ b/lib/gui/app/models/selection-state.js @@ -17,7 +17,7 @@ 'use strict' const _ = require('lodash') -const store = require('../../gui/app/models/store') +const store = require('./store') const availableDrives = require('./available-drives') /** diff --git a/lib/gui/app/modules/image-writer.js b/lib/gui/app/modules/image-writer.js index d95bbc46..fcc82d31 100644 --- a/lib/gui/app/modules/image-writer.js +++ b/lib/gui/app/modules/image-writer.js @@ -24,14 +24,14 @@ const ipc = require('node-ipc') const isRunningInAsar = require('electron-is-running-in-asar') const electron = require('electron') const settings = require('../models/settings') -const flashState = require('../../../shared/models/flash-state') +const flashState = require('../models/flash-state') const errors = require('../../../shared/errors') const permissions = require('../../../shared/permissions') const windowProgress = require('../os/window-progress') const analytics = require('../modules/analytics') const updateLock = require('./update-lock') const packageJSON = require('../../../../package.json') -const selectionState = require('../../../shared/models/selection-state') +const selectionState = require('../models/selection-state') /** * @summary Number of threads per CPU to allocate to the UV_THREADPOOL diff --git a/lib/gui/app/pages/finish/controllers/finish.js b/lib/gui/app/pages/finish/controllers/finish.js index 1bf94592..6bd52279 100644 --- a/lib/gui/app/pages/finish/controllers/finish.js +++ b/lib/gui/app/pages/finish/controllers/finish.js @@ -18,8 +18,8 @@ const _ = require('lodash') const settings = require('../../../models/settings') -const flashState = require('../../../../../shared/models/flash-state') -const selectionState = require('../../../../../shared/models/selection-state') +const flashState = require('../../../models/flash-state') +const selectionState = require('../../../models/selection-state') const analytics = require('../../../modules/analytics') const updateLock = require('../../../modules/update-lock') const messages = require('../../../../../shared/messages') diff --git a/lib/gui/app/pages/main/controllers/drive-selection.js b/lib/gui/app/pages/main/controllers/drive-selection.js index 318f055f..8a834616 100644 --- a/lib/gui/app/pages/main/controllers/drive-selection.js +++ b/lib/gui/app/pages/main/controllers/drive-selection.js @@ -20,7 +20,7 @@ const _ = require('lodash') const angular = require('angular') const prettyBytes = require('pretty-bytes') const settings = require('../../../models/settings') -const selectionState = require('../../../../../shared/models/selection-state') +const selectionState = require('../../../models/selection-state') const analytics = require('../../../modules/analytics') const exceptionReporter = require('../../../modules/exception-reporter') const utils = require('../../../../../shared/utils') diff --git a/lib/gui/app/pages/main/controllers/flash.js b/lib/gui/app/pages/main/controllers/flash.js index f9223baf..1feea4c5 100644 --- a/lib/gui/app/pages/main/controllers/flash.js +++ b/lib/gui/app/pages/main/controllers/flash.js @@ -18,7 +18,7 @@ const _ = require('lodash') const messages = require('../../../../../shared/messages') -const flashState = require('../../../../../shared/models/flash-state') +const flashState = require('../../../models/flash-state') const driveScanner = require('../../../modules/drive-scanner') const progressStatus = require('../../../modules/progress-status') const notification = require('../../../os/notification') @@ -27,7 +27,8 @@ const imageWriter = require('../../../modules/image-writer') const path = require('path') const store = require('../../../models/store') const constraints = require('../../../../../shared/drive-constraints') -const availableDrives = require('../../../../../shared/models/available-drives') +const availableDrives = require('../../../models/available-drives') +const debug = require('debug')('etcher:controller:flash') module.exports = function ( $q, @@ -139,7 +140,10 @@ module.exports = function ( // Trigger Angular digests along with store updates, as the flash state // updates. Without this there is essentially no progress to watch. - const unsubscribe = store.subscribe($timeout) + const unsubscribe = store.subscribe(() => { + debug('store.onChange') + $timeout() + }) const iconPath = '../../../assets/icon.png' diff --git a/lib/gui/app/pages/main/controllers/image-selection.js b/lib/gui/app/pages/main/controllers/image-selection.js index 8f35cd53..6a7be5bb 100644 --- a/lib/gui/app/pages/main/controllers/image-selection.js +++ b/lib/gui/app/pages/main/controllers/image-selection.js @@ -24,7 +24,7 @@ const errors = require('../../../../../shared/errors') const imageStream = require('../../../../../sdk/image-stream') const supportedFormats = require('../../../../../shared/supported-formats') const analytics = require('../../../modules/analytics') -const selectionState = require('../../../../../shared/models/selection-state') +const selectionState = require('../../../models/selection-state') const osDialog = require('../../../os/dialog') const exceptionReporter = require('../../../modules/exception-reporter') diff --git a/lib/gui/app/pages/main/controllers/main.js b/lib/gui/app/pages/main/controllers/main.js index a99d7bbb..ba60fb46 100644 --- a/lib/gui/app/pages/main/controllers/main.js +++ b/lib/gui/app/pages/main/controllers/main.js @@ -17,11 +17,11 @@ 'use strict' const settings = require('../../../models/settings') -const flashState = require('../../../../../shared/models/flash-state') +const flashState = require('../../../models/flash-state') const analytics = require('../../../modules/analytics') const exceptionReporter = require('../../../modules/exception-reporter') -const availableDrives = require('../../../../../shared/models/available-drives') -const selectionState = require('../../../../../shared/models/selection-state') +const availableDrives = require('../../../models/available-drives') +const selectionState = require('../../../models/selection-state') const driveConstraints = require('../../../../../shared/drive-constraints') const messages = require('../../../../../shared/messages') diff --git a/tests/gui/modules/image-writer.spec.js b/tests/gui/modules/image-writer.spec.js index b566babf..8aadf5df 100644 --- a/tests/gui/modules/image-writer.spec.js +++ b/tests/gui/modules/image-writer.spec.js @@ -4,7 +4,7 @@ const m = require('mochainon') const ipc = require('node-ipc') const angular = require('angular') const Bluebird = require('bluebird') -const flashState = require('../../../lib/shared/models/flash-state') +const flashState = require('../../../lib/gui/app/models/flash-state') const imageWriter = require('../../../lib/gui/app/modules/image-writer') require('angular-mocks') diff --git a/tests/gui/pages/main.spec.js b/tests/gui/pages/main.spec.js index e20c0c44..05e78305 100644 --- a/tests/gui/pages/main.spec.js +++ b/tests/gui/pages/main.spec.js @@ -22,9 +22,9 @@ const fs = require('fs') const path = require('path') const supportedFormats = require('../../../lib/shared/supported-formats') const angular = require('angular') -const flashState = require('../../../lib/shared/models/flash-state') -const availableDrives = require('../../../lib/shared/models/available-drives') -const selectionState = require('../../../lib/shared/models/selection-state') +const flashState = require('../../../lib/gui/app/models/flash-state') +const availableDrives = require('../../../lib/gui/app/models/available-drives') +const selectionState = require('../../../lib/gui/app/models/selection-state') require('angular-mocks') // Mock HTML requires by reading from the file-system diff --git a/tests/shared/models/available-drives.spec.js b/tests/shared/models/available-drives.spec.js index 7c33bc85..82447c8e 100644 --- a/tests/shared/models/available-drives.spec.js +++ b/tests/shared/models/available-drives.spec.js @@ -18,8 +18,8 @@ const m = require('mochainon') const path = require('path') -const availableDrives = require('../../../lib/shared/models/available-drives') -const selectionState = require('../../../lib/shared/models/selection-state') +const availableDrives = require('../../../lib/gui/app/available-drives') +const selectionState = require('../../../lib/gui/app/selection-state') const constraints = require('../../../lib/shared/drive-constraints') describe('Model: availableDrives', function () { diff --git a/tests/shared/models/flash-state.spec.js b/tests/shared/models/flash-state.spec.js index 5faeb59d..6973cdb4 100644 --- a/tests/shared/models/flash-state.spec.js +++ b/tests/shared/models/flash-state.spec.js @@ -17,7 +17,7 @@ 'use strict' const m = require('mochainon') -const flashState = require('../../../lib/shared/models/flash-state') +const flashState = require('../../../lib/gui/app/models/flash-state') describe('Model: flashState', function () { beforeEach(function () { diff --git a/tests/shared/models/selection-state.spec.js b/tests/shared/models/selection-state.spec.js index d3bec552..49531883 100644 --- a/tests/shared/models/selection-state.spec.js +++ b/tests/shared/models/selection-state.spec.js @@ -19,8 +19,8 @@ const m = require('mochainon') const _ = require('lodash') const path = require('path') -const availableDrives = require('../../../lib/shared/models/available-drives') -const selectionState = require('../../../lib/shared/models/selection-state') +const availableDrives = require('../../../lib/gui/app/available-drives') +const selectionState = require('../../../lib/gui/app/selection-state') describe('Model: selectionState', function () { describe('given a clean state', function () {