taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Clean up cfg error handling a bit

Browse Source 
Pass in the actual file being used, rather than hardcoded `config.yaml`
Differences between two error messages are not that distinct
Centralize on one and clean up all the `isCustomConfig` tracking
This commit is contained in:
Sean Smith
2019-09-12 20:28:24 -04:00
parent 8cf50fe92c
commit 9f81207037
4 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/wtf_app.go
View File

@@ -22,19 +22,17 @@ type WtfApp struct {
configFilePath string
display *Display
focusTracker FocusTracker
isCustomConfig bool
pages *tview.Pages
validator *ModuleValidator
widgets []wtf.Wtfable
}
// NewWtfApp creates and returns an instance of WtfApp
func NewWtfApp(app *tview.Application, config *config.Config, configFilePath string, isCustom bool) *WtfApp {
func NewWtfApp(app *tview.Application, config *config.Config, configFilePath string) *WtfApp {
wtfApp := WtfApp{
app: app,
config: config,
configFilePath: configFilePath,
isCustomConfig: isCustom,
pages: tview.NewPages(),
}
@@ -140,8 +138,8 @@ func (wtfApp *WtfApp) watchForConfigChanges() {
case <-watch.Event:
wtfApp.Stop()
config := cfg.LoadWtfConfigFile(wtfApp.configFilePath, wtfApp.isCustomConfig)
newApp := NewWtfApp(wtfApp.app, config, wtfApp.configFilePath, wtfApp.isCustomConfig)
config := cfg.LoadWtfConfigFile(wtfApp.configFilePath)
newApp := NewWtfApp(wtfApp.app, config, wtfApp.configFilePath)
newApp.Start()
case err := <-watch.Error: