GithubBackup/PicList
1
0
Fork 0
mirror of https://github.com/Kuingsmile/PicList.git synced 2026-05-30 20:50:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: bug with function in config

Browse Source
This commit is contained in:
Molunerfinn
2018-09-20 15:14:19 +08:00
parent 4a420dd5c5
commit c3b2d7b941
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/utils/picgoCoreIPC.js
View File

@@ -20,6 +20,18 @@ const getConfig = (name, type, ctx) => {
}
}
const handleConfigWithFunction = config => {
for (let i in config) {
if (typeof config[i].default === 'function') {
config[i].default = config[i].default()
}
if (typeof config[i].choices === 'function') {
config[i].choices = config[i].choices()
}
}
return config
}
export default (app, ipcMain) => {
const STORE_PATH = app.getPath('userData')
const CONFIG_PATH = path.join(STORE_PATH, '/data.json')
@@ -42,15 +54,15 @@ export default (app, ipcMain) => {
config: {
plugin: {
name: pluginList[i].replace(/picgo-plugin-/, ''),
config: plugin.config ? plugin.config(picgo) : []
config: plugin.config ? handleConfigWithFunction(plugin.config(picgo)) : []
},
uploader: {
name: uploaderName,
config: getConfig(uploaderName, 'uploader', picgo)
config: handleConfigWithFunction(getConfig(uploaderName, 'uploader', picgo))
},
transformer: {
name: transformerName,
config: getConfig(uploaderName, 'transformer', picgo)
config: handleConfigWithFunction(getConfig(uploaderName, 'transformer', picgo))
}
},
enabled: picgo.getConfig(`plugins.${pluginList[i]}`)