Rewritten settings saving. Now saves on 'close' window event.

openproxyspace · Jan 18, 2019 · be336fd · be336fd
1 parent ef4f623
commit be336fd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/src/actions/ResultActions.js b/src/actions/ResultActions.js
@@ -2,7 +2,6 @@ import { getFilteredProxies } from '../store/selectors/getFilteredProxies';
 import { writeFile } from 'fs';
 import { sort } from 'js-flock';
 import { remote } from 'electron';
-import { saveSettings } from '../core/settings';
 import {
     SHOW_RESULT,
     TOGGLE_ANON,
@@ -61,9 +60,8 @@ export const getResultsInProtocolIpPort = items => {
 };
 
 export const save = () => (dispatch, getState) => {
-    const { core, judges, blacklist, ip, result } = getState();
-    const saveType = result.exporting.type == 1 ? getResultsInIpPort : getResultsInProtocolIpPort;
-
+    const saveType = getState().exporting.type == 1 ? getResultsInIpPort : getResultsInProtocolIpPort;
+
     let savePath = dialog.showSaveDialog({
         filters: [
             {
@@ -76,17 +74,6 @@ export const save = () => (dispatch, getState) => {
     if (savePath) {
         writeFile(savePath, saveType(getFilteredProxies(getState())), () => {
             dispatch(toggleExport());
-            saveSettings({
-                core,
-                judges,
-                ip: {
-                    lookupUrl: ip.lookupUrl
-                },
-                blacklist,
-                exporting: {
-                    type: result.exporting.type
-                }
-            });
         });
     }
 };

diff --git a/src/core/settings.js b/src/core/settings.js
@@ -1,3 +1,5 @@
+import store from '../store';
+import { remote } from 'electron';
 import { writeFile, readFileSync, existsSync } from 'fs';
 import { SETTINGS_FILE_PATH, MERGED_DEFAULT_SETTINGS } from '../constants/SettingsConstants';
 
@@ -21,3 +23,19 @@ const getSettings = () => {
 };
 
 export const initial = getSettings();
+
+remote.getCurrentWindow().on('close', () => {
+    const { core, judges, ip, blacklist, result } = store.getState();
+
+    saveSettings({
+        core,
+        judges,
+        ip: {
+            lookupUrl: ip.lookupUrl
+        },
+        blacklist,
+        exporting: {
+            type: result.exporting.type
+        }
+    });
+});