diff options
author | Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com> | 2021-08-08 00:01:37 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-08 05:31:37 +0530 |
commit | 97d51a7763b14c92ee71ff9a012311dd9498d803 (patch) | |
tree | bd36005031ecb1148f27aa541e7a92a5e3aa4c0c /src/electron/ipc-api | |
parent | 5.6.1-nightly.17 [skip ci] (diff) | |
download | ferdium-app-97d51a7763b14c92ee71ff9a012311dd9498d803.tar.gz ferdium-app-97d51a7763b14c92ee71ff9a012311dd9498d803.tar.zst ferdium-app-97d51a7763b14c92ee71ff9a012311dd9498d803.zip |
refactor: path-references refactoring and using 'import' instead of 'require' (#1752)
* refactor references to 'userData' and 'appData' directories to move hardcoding into single location
* convert to es6 for lower memory usage as per https://codesource.io/the-difference-between-import-and-require-in-javascript/
Diffstat (limited to 'src/electron/ipc-api')
-rw-r--r-- | src/electron/ipc-api/appIndicator.js | 4 | ||||
-rw-r--r-- | src/electron/ipc-api/download.js | 4 | ||||
-rw-r--r-- | src/electron/ipc-api/localServer.js | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.js index 0691e5170..c6c261d0f 100644 --- a/src/electron/ipc-api/appIndicator.js +++ b/src/electron/ipc-api/appIndicator.js | |||
@@ -1,5 +1,5 @@ | |||
1 | import { app, ipcMain } from 'electron'; | 1 | import { app, ipcMain } from 'electron'; |
2 | import path from 'path'; | 2 | import { join } from 'path'; |
3 | import { autorun } from 'mobx'; | 3 | import { autorun } from 'mobx'; |
4 | import { isMac, isWindows, isLinux } from '../../environment'; | 4 | import { isMac, isWindows, isLinux } from '../../environment'; |
5 | 5 | ||
@@ -9,7 +9,7 @@ const FILE_EXTENSION = isWindows ? 'ico' : 'png'; | |||
9 | let isTrayIconEnabled; | 9 | let isTrayIconEnabled; |
10 | 10 | ||
11 | function getAsset(type, asset) { | 11 | function getAsset(type, asset) { |
12 | return path.join( | 12 | return join( |
13 | __dirname, '..', '..', 'assets', 'images', type, process.platform, `${asset}.${FILE_EXTENSION}`, | 13 | __dirname, '..', '..', 'assets', 'images', type, process.platform, `${asset}.${FILE_EXTENSION}`, |
14 | ); | 14 | ); |
15 | } | 15 | } |
diff --git a/src/electron/ipc-api/download.js b/src/electron/ipc-api/download.js index 7f8718924..ba261ba1e 100644 --- a/src/electron/ipc-api/download.js +++ b/src/electron/ipc-api/download.js | |||
@@ -1,7 +1,7 @@ | |||
1 | import { ipcMain, dialog, BrowserWindow } from 'electron'; | 1 | import { ipcMain, dialog, BrowserWindow } from 'electron'; |
2 | import { download } from 'electron-dl'; | 2 | import { download } from 'electron-dl'; |
3 | import mime from 'mime-types'; | 3 | import mime from 'mime-types'; |
4 | import fs from 'fs-extra'; | 4 | import { writeFileSync } from 'fs-extra'; |
5 | 5 | ||
6 | const debug = require('debug')('Ferdi:ipcApi:download'); | 6 | const debug = require('debug')('Ferdi:ipcApi:download'); |
7 | 7 | ||
@@ -37,7 +37,7 @@ export default (params) => { | |||
37 | if (saveDialog.canceled) return; | 37 | if (saveDialog.canceled) return; |
38 | 38 | ||
39 | const binaryImage = decodeBase64Image(content); | 39 | const binaryImage = decodeBase64Image(content); |
40 | fs.writeFileSync(saveDialog.filePath, binaryImage, 'binary'); | 40 | writeFileSync(saveDialog.filePath, binaryImage, 'binary'); |
41 | 41 | ||
42 | debug('File blob saved to', saveDialog.filePath); | 42 | debug('File blob saved to', saveDialog.filePath); |
43 | } catch (err) { | 43 | } catch (err) { |
diff --git a/src/electron/ipc-api/localServer.js b/src/electron/ipc-api/localServer.js index 493253e17..1ed4b7167 100644 --- a/src/electron/ipc-api/localServer.js +++ b/src/electron/ipc-api/localServer.js | |||
@@ -1,6 +1,7 @@ | |||
1 | import { ipcMain, app } from 'electron'; | 1 | import { ipcMain } from 'electron'; |
2 | import net from 'net'; | 2 | import net from 'net'; |
3 | import { LOCAL_HOSTNAME } from '../../config'; | 3 | import { LOCAL_HOSTNAME } from '../../config'; |
4 | import { userDataPath } from '../../environment'; | ||
4 | import startServer from '../../internal-server/start'; | 5 | import startServer from '../../internal-server/start'; |
5 | 6 | ||
6 | const DEFAULT_PORT = 45569; | 7 | const DEFAULT_PORT = 45569; |
@@ -37,7 +38,7 @@ export default (params) => { | |||
37 | } | 38 | } |
38 | console.log('Starting local server on port', port); | 39 | console.log('Starting local server on port', port); |
39 | 40 | ||
40 | startServer(app.getPath('userData'), port); | 41 | startServer(userDataPath(), port); |
41 | 42 | ||
42 | params.mainWindow.webContents.send('localServerPort', { | 43 | params.mainWindow.webContents.send('localServerPort', { |
43 | port, | 44 | port, |