public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-14 02:06:29 +00:00
Code Issues Releases Wiki Activity

Fix a return value of RcParser.parse

Browse Source
This commit is contained in:
asmsuechan
2017-08-10 09:43:04 +09:00
parent 6c43fb2325
commit b7b715ba3d
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
browser/main/lib/ConfigManager.js
View File

@@ -64,24 +64,12 @@ function get () {
let config = window.localStorage.getItem('config') let config = window.localStorage.getItem('config')
try { try {
const homePath = global.process.env.HOME || global.process.env.USERPROFILE const boostnotercConfig = RcParser.parse()
const boostnotercPath = path.join(homePath, BOOSTNOTERC)
const boostnotercConfig = RcParser.parse(boostnotercPath)
config = Object.assign({}, DEFAULT_CONFIG, JSON.parse(config)) config = Object.assign({}, DEFAULT_CONFIG, JSON.parse(config))
if (boostnotercConfig !== undefined) {
config = Object.assign({}, DEFAULT_CONFIG, boostnotercConfig) config = Object.assign({}, DEFAULT_CONFIG, boostnotercConfig)
config.hotkey = Object.assign({}, DEFAULT_CONFIG.hotkey, boostnotercConfig.hotkey) config = assignConfigValues(config, boostnotercConfig, config)
config.ui = Object.assign({}, DEFAULT_CONFIG.ui, boostnotercConfig.ui)
config.editor = Object.assign({}, DEFAULT_CONFIG.editor, boostnotercConfig.editor)
config.preview = Object.assign({}, DEFAULT_CONFIG.preview, boostnotercConfig.preview)
}
config.hotkey = Object.assign({}, DEFAULT_CONFIG.hotkey, config.hotkey)
config.ui = Object.assign({}, DEFAULT_CONFIG.ui, config.ui)
config.editor = Object.assign({}, DEFAULT_CONFIG.editor, config.editor)
config.preview = Object.assign({}, DEFAULT_CONFIG.preview, config.preview)
if (!validate(config)) throw new Error('INVALID CONFIG') if (!validate(config)) throw new Error('INVALID CONFIG')
} catch (err) { } catch (err) {
@@ -144,6 +132,14 @@ function set (updates) {
}) })
} }
function assignConfigValues (config, rcConfig, originalConfig) {
config.hotkey = Object.assign({}, DEFAULT_CONFIG.hotkey, rcConfig, originalConfig.hotkey)
config.ui = Object.assign({}, DEFAULT_CONFIG.ui, rcConfig, originalConfig.ui)
config.editor = Object.assign({}, DEFAULT_CONFIG.editor, rcConfig, originalConfig.editor)
config.preview = Object.assign({}, DEFAULT_CONFIG.preview, rcConfig, originalConfig.preview)
return config
}
export default { export default {
get, get,
set, set,

15
browser/main/lib/RcParser.js
View File

@@ -1,12 +1,13 @@
import _ from 'lodash' import path from 'path'
import sander from 'sander'
const path = require('path') function parse () {
const sander = require('sander') const BOOSTNOTERC = '.boostnoterc'
const homePath = global.process.env.HOME || global.process.env.USERPROFILE
const boostnotercPath = path.join(homePath, BOOSTNOTERC)
function parse (boostnotercPath) { if (!sander.existsSync(boostnotercPath)) return {}
if (!sander.existsSync(boostnotercPath)) return return JSON.parse(sander.readFileSync(boostnotercPath).toString())
let config = JSON.parse(sander.readFileSync(boostnotercPath).toString())
return config
} }
function exec (boostnotercPath) { function exec (boostnotercPath) {