langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge new keys from config.json into user conf

Browse Source
This commit is contained in:
Damien Elmes 2017-08-30 15:31:03 +10:00
parent 9fb9d9c902
commit 5a11efa0e3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
aqt/addons.py
View File

@ -208,10 +208,15 @@ When loading '%(name)s':
def getConfig(self, module): def getConfig(self, module):
addon = module.split(".")[0] addon = module.split(".")[0]
# get default config
config = self.addonConfigDefaults(addon)
if config is None:
return None
# merge in user's keys
meta = self.addonMeta(addon) meta = self.addonMeta(addon)
if meta.get("config"): userConf = meta.get("config", {})
return meta["config"] config.update(userConf)
return self.addonConfigDefaults(addon) return config
def configAction(self, addon): def configAction(self, addon):
return self._configButtonActions.get(addon) return self._configButtonActions.get(addon)