From e307d21bb226ade5d481a57aeb825c12a3508ef2 Mon Sep 17 00:00:00 2001 From: mio <10892119+biuuu@users.noreply.github.com> Date: Mon, 22 Jan 2024 15:15:17 +0800 Subject: [PATCH] feat: save data only in the current program directory --- src/main/config.js | 6 ++---- src/main/getData.js | 4 +--- src/main/utils.js | 7 ++----- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/main/config.js b/src/main/config.js index b7bb77e..f77d1c8 100644 --- a/src/main/config.js +++ b/src/main/config.js @@ -1,4 +1,4 @@ -const { readJSON, saveJSON, decipherAes, cipherAes, detectLocale, userDataPath, globalUserDataPath } = require('./utils') +const { readJSON, saveJSON, decipherAes, cipherAes, detectLocale, userDataPath } = require('./utils') const config = { urls: [], @@ -14,9 +14,7 @@ const config = { const getLocalConfig = async () => { let localConfig = await readJSON(userDataPath, 'config.json') - if (!localConfig) { - localConfig = await readJSON(globalUserDataPath, 'config.json') - } + if (!localConfig) return const configTemp = {} for (let key in localConfig) { diff --git a/src/main/getData.js b/src/main/getData.js index 960bf86..9d71dd9 100644 --- a/src/main/getData.js +++ b/src/main/getData.js @@ -3,7 +3,7 @@ const util = require('util') const path = require('path') const { URL } = require('url') const { app, ipcMain, shell } = require('electron') -const { sleep, request, sendMsg, readJSON, saveJSON, detectLocale, getCacheText, userDataPath, userPath, localIp, langMap, globalUserDataPath } = require('./utils') +const { sleep, request, sendMsg, readJSON, saveJSON, detectLocale, getCacheText, userDataPath, userPath, localIp, langMap } = require('./utils') const config = require('./config') const i18n = require('./i18n') const { enableProxy, disableProxy } = require('./module/system-proxy') @@ -42,10 +42,8 @@ const findDataFiles = async (dataPath, fileMap) => { const collectDataFiles = async () => { await fs.ensureDir(userDataPath) - await fs.ensureDir(globalUserDataPath) const fileMap = new Map() await findDataFiles(userDataPath, fileMap) - await findDataFiles(globalUserDataPath, fileMap) return fileMap } diff --git a/src/main/utils.js b/src/main/utils.js index a925133..14d0bd2 100644 --- a/src/main/utils.js +++ b/src/main/utils.js @@ -13,7 +13,7 @@ const isDev = !app.isPackaged const userPath = app.getPath('userData') const appRoot = isDev ? path.resolve(__dirname, '..', '..') : path.resolve(app.getAppPath(), '..', '..') const userDataPath = path.resolve(appRoot, 'userData') -const globalUserDataPath = path.resolve(userPath, 'userData') +// const globalUserDataPath = path.resolve(userPath, 'userData') let win = null const initWindow = () => { @@ -147,9 +147,6 @@ const detectLocale = (value) => { const saveJSON = async (name, data) => { try { await fs.outputJSON(path.join(userDataPath, name), data) - if (!isDev) { - await fs.outputJSON(path.join(globalUserDataPath, name), data) - } } catch (e) { sendMsg(e, 'ERROR') await sleep(3) @@ -221,5 +218,5 @@ async function getCacheText(gamePath) { module.exports = { sleep, request, hash, cipherAes, decipherAes, saveLog, getCacheText, sendMsg, readJSON, saveJSON, initWindow, getWin, localIp, userPath, detectLocale, langMap, - appRoot, userDataPath, globalUserDataPath + appRoot, userDataPath } \ No newline at end of file