Skip to content

Commit 6ff792a

Browse files
staniel359staniel359
committed
refactor: client settings logic
1 parent ccaed59 commit 6ff792a

39 files changed

+247
-214
lines changed

‎electron/actions/app/checkForUpdates.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
releasesUrl
99
} from '../../helpers/urls.js'
1010
import i18n from 'i18n'
11-
import getElectronStoreKey from '../electronStore/getKey.js'
11+
import getSettingsKey from '../settings/getKey.js'
1212

1313
const {
1414
autoUpdater
@@ -117,12 +117,12 @@ function checkWithUpdate () {
117117

118118
export default function checkForUpdates () {
119119
const isAutoupdateAvailable =
120-
getElectronStoreKey(
120+
getSettingsKey(
121121
'updates.isAutoupdateAvailable'
122122
)
123123

124124
const isAutoupdateEnabled =
125-
getElectronStoreKey(
125+
getSettingsKey(
126126
'updates.isAutoupdateEnabled'
127127
)
128128

‎electron/actions/app/setAutoupdateSetting.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ import {
33
isMacos,
44
isLinux
55
} from '../../helpers/utils.js'
6-
import getElectronStoreKey from '../electronStore/getKey.js'
7-
import setElectronStoreData from '../electronStore/setData.js'
6+
import getSettingsKey from '../settings/getKey.js'
7+
import setSettings from '../settings/set.js'
88

99
export default function () {
1010
let isAutoupdateAvailable
1111

1212
let isAutoupdateBeta
1313

1414
let isAutoupdateEnabled =
15-
getElectronStoreKey(
15+
getSettingsKey(
1616
'updates.isAutoupdateEnabled'
1717
)
1818

@@ -36,7 +36,7 @@ export default function () {
3636
isAutoupdateEnabled ??= false
3737
}
3838

39-
setElectronStoreData(
39+
setSettings(
4040
{
4141
'updates.isAutoupdateAvailable': isAutoupdateAvailable,
4242
'updates.isAutoupdateBeta': isAutoupdateBeta,

‎electron/actions/app/setEvents.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import setAppEvents from '../../events/app.js'
2-
import setElectronStoreEvents from '../../events/electronStore.js'
2+
import setSettingsEvents from '../../events/settings.js'
33
import setNativeThemeEvents from '../../events/nativeTheme.js'
44
import setIpcAppEvents from '../../events/ipc/app.js'
55
import setIpcWindowEvents from '../../events/ipc/window.js'
@@ -10,13 +10,13 @@ import setIpcAudioFileEvents from '../../events/ipc/audioFile.js'
1010
import setIpcRemoteAudioFileEvents from '../../events/ipc/remoteAudioFile.js'
1111
import setIpcBackgroundImageEvents from '../../events/ipc/backgroundImage.js'
1212
import setIpcFileEvents from '../../events/ipc/file.js'
13-
import setIpcElectronStoreEvents from '../../events/ipc/electronStore.js'
13+
import setIpcSettingsEvents from '../../events/ipc/settings.js'
1414
import setIpcDiscordEvents from '../../events/ipc/discord.js'
1515

1616
export default function () {
1717
setAppEvents()
1818

19-
setElectronStoreEvents()
19+
setSettingsEvents()
2020

2121
setNativeThemeEvents()
2222

@@ -38,7 +38,7 @@ export default function () {
3838

3939
setIpcFileEvents()
4040

41-
setIpcElectronStoreEvents()
41+
setIpcSettingsEvents()
4242

4343
setIpcDiscordEvents()
4444
}

‎electron/actions/app/setFlags.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import {
22
app
33
} from 'electron'
4-
import getElectronStoreKey from '../electronStore/getKey.js'
4+
import getSettingsKey from '../settings/getKey.js'
55

66
export default function () {
77
const isWithCache =
8-
getElectronStoreKey(
8+
getSettingsKey(
99
'system.isWithCache'
1010
)
1111

‎electron/actions/app/setup.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import createAboutWindow
88
import createTray from '../../actions/tray/create.js'
99
import addSessionHeadersHandlers
1010
from '../../actions/session/headers/addHandlers.js'
11-
import getElectronStoreKey from '../electronStore/getKey.js'
11+
import getSettingsKey from '../settings/getKey.js'
1212

1313
export default function () {
1414
createMainWindow()
@@ -27,7 +27,7 @@ export default function () {
2727
}
2828

2929
const isWithTrayIcon =
30-
getElectronStoreKey(
30+
getSettingsKey(
3131
'window.isWithTrayIcon'
3232
)
3333

‎electron/actions/app/updateTheme.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import {
22
nativeTheme
33
} from 'electron'
4-
import getElectronStoreKey from '../electronStore/getKey.js'
4+
import getSettingsKey from '../settings/getKey.js'
55

66
export default function () {
77
const isWithSystemTheme =
8-
getElectronStoreKey(
8+
getSettingsKey(
99
'layout.isWithSystemTheme'
1010
)
1111

‎electron/actions/electronStore/addValue.js

-23
This file was deleted.

‎electron/actions/mainWindow/create.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
import {
1414
baseUrl
1515
} from '../../helpers/urls.js'
16-
import getElectronStoreKey from '../electronStore/getKey.js'
16+
import getSettingsKey from '../settings/getKey.js'
1717
import showMainWindow from './show.js'
1818
import hideMainWindow from './hide.js'
1919
import checkForUpdates from '../app/checkForUpdates.js'
@@ -47,7 +47,7 @@ function handleClose (
4747
event.preventDefault()
4848

4949
const isQuitOnClose =
50-
getElectronStoreKey(
50+
getSettingsKey(
5151
'window.isQuitOnClose'
5252
)
5353

@@ -90,7 +90,7 @@ async function handleFirstShow () {
9090
)
9191

9292
const isMaximizeOnStart =
93-
getElectronStoreKey(
93+
getSettingsKey(
9494
'window.isMaximizeOnStart'
9595
)
9696

@@ -103,7 +103,7 @@ async function handleFirstShow () {
103103
}
104104

105105
const isCheckForNewVersions =
106-
getElectronStoreKey(
106+
getSettingsKey(
107107
'updates.isCheckForNewVersions'
108108
)
109109

‎electron/actions/settings/addKeyValue.js

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import getSettingsKey from './getKey.js'
2+
import setSettings from './set.js'
3+
4+
export default function (
5+
{
6+
key,
7+
value
8+
}
9+
) {
10+
const oldValue =
11+
getSettingsKey(
12+
key
13+
)
14+
15+
const newValue = [
16+
...oldValue,
17+
value
18+
]
19+
20+
return setSettings(
21+
{
22+
[key]: newValue
23+
}
24+
)
25+
}

‎electron/actions/electronStore/deleteValue.js renamed to ‎electron/actions/settings/deleteKeyValue.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
import getElectronStoreKey from './getKey.js'
2-
import setElectronStoreData from './setData.js'
1+
import getSettingsKey from './getKey.js'
2+
import setSettings from './set.js'
33

44
export default function (
5-
key,
6-
uuid
5+
{
6+
key,
7+
valueId
8+
}
79
) {
810
const oldValue =
9-
getElectronStoreKey(
11+
getSettingsKey(
1012
key
1113
)
1214

1315
function isMatchedItem (
1416
itemData
1517
) {
1618
return (
17-
itemData.uuid !== uuid
19+
itemData.uuid !== valueId
1820
)
1921
}
2022

@@ -24,7 +26,7 @@ export default function (
2426
)
2527
]
2628

27-
return setElectronStoreData(
29+
return setSettings(
2830
{
2931
[key]: newValue
3032
}

‎electron/actions/electronStore/getData.js renamed to ‎electron/actions/settings/get.js

File renamed without changes.

‎electron/actions/electronStore/getKey.js renamed to ‎electron/actions/settings/getKey.js

File renamed without changes.

‎electron/actions/electronStore/setData.js renamed to ‎electron/actions/settings/set.js

File renamed without changes.

‎electron/actions/store/update.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import getViews from '../views/get.js'
2-
import setElectronStoreData from '../electronStore/setData.js'
2+
import setSettings from '../settings/set.js'
33

44
export default function (
55
data,
@@ -23,7 +23,7 @@ export default function (
2323
)
2424

2525
if (isSave) {
26-
setElectronStoreData(
26+
setSettings(
2727
data
2828
)
2929
}

‎electron/actions/tab/create.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
WebContentsView
33
} from 'electron'
4-
import getElectronStoreKey from '../electronStore/getKey.js'
4+
import getSettingsKey from '../settings/getKey.js'
55
import getActiveTabId from './getActiveId.js'
66
import setActiveTab from './setActive.js'
77
import setTabBounds from './setBounds.js'
@@ -57,7 +57,7 @@ export default function (
5757
)
5858

5959
const isSwitchToNewTab =
60-
getElectronStoreKey(
60+
getSettingsKey(
6161
'layout.isSwitchToNewTab'
6262
)
6363

@@ -100,15 +100,13 @@ export default function (
100100
)
101101

102102
function handleDidStartNavigation () {
103-
const data = {
104-
'layout.tabId': uuid
105-
}
106-
107103
tab
108104
.webContents
109105
.send(
110106
'update-store',
111-
data
107+
{
108+
'layout.tabId': uuid
109+
}
112110
)
113111
}
114112

‎electron/actions/tab/getActiveId.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import getElectronStoreKey from '../electronStore/getKey.js'
1+
import getSettingsKey from '../settings/getKey.js'
22

33
export default function () {
4-
return getElectronStoreKey(
4+
return getSettingsKey(
55
'layout.activeTabId'
66
)
77
}

‎electron/actions/tab/setBounds.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import getElectronStoreKey from '../electronStore/getKey.js'
1+
import getSettingsKey from '../settings/getKey.js'
22
import getMainWindowSize from '../mainWindow/getSize.js'
33

44
export default function (
55
tab
66
) {
77
const scale =
8-
getElectronStoreKey(
8+
getSettingsKey(
99
'layout.scale'
1010
)
1111

‎electron/actions/view/changeBackgroundColor.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import getElectronStoreKey from '../electronStore/getKey.js'
1+
import getSettingsKey from '../settings/getKey.js'
22
import {
33
colors
44
} from '../../helpers/utils.js'
@@ -7,7 +7,7 @@ export default function (
77
view
88
) {
99
const isDarkMode =
10-
getElectronStoreKey(
10+
getSettingsKey(
1111
'layout.isDarkMode'
1212
)
1313

‎electron/actions/view/setScale.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import getElectronStoreKey from '../electronStore/getKey.js'
1+
import getSettingsKey from '../settings/getKey.js'
22

33
export default function (
44
view
55
) {
66
const scale =
7-
getElectronStoreKey(
7+
getSettingsKey(
88
'layout.scale'
99
)
1010

‎electron/events/ipc/electronStore.js

-31
This file was deleted.

0 commit comments

Comments
 (0)