diff --git a/cfg/config_files.go b/cfg/config_files.go index dac769e1..284dbae8 100644 --- a/cfg/config_files.go +++ b/cfg/config_files.go @@ -6,7 +6,7 @@ import ( "os" "github.com/olebedev/config" - "github.com/wtfutil/wtf/logger" + // "github.com/wtfutil/wtf/logger" "github.com/wtfutil/wtf/wtf" ) @@ -38,15 +38,13 @@ func MigrateOldConfig() { err := Copy(srcDir, destDir) if err != nil { panic(err) - } else { - logger.Log(fmt.Sprintf("Copied old config from %s to %s", srcDir, destDir)) } // Delete the old directory if the new one exists if _, err := os.Stat(destDir); err == nil { err := os.RemoveAll(srcDir) if err != nil { - logger.Log(err.Error()) + fmt.Println(err) } } } diff --git a/logger/log.go b/logger/log.go index 0e40dc0d..b786e122 100644 --- a/logger/log.go +++ b/logger/log.go @@ -2,7 +2,6 @@ package logger import ( "fmt" - //"io/ioutil" "log" "os" "path/filepath" @@ -18,13 +17,15 @@ type Widget struct { wtf.TextWidget filePath string + settings *Settings } -func NewWidget(app *tview.Application) *Widget { +func NewWidget(app *tview.Application, settings *Settings) *Widget { widget := Widget{ TextWidget: wtf.NewTextWidget(app, "Logs", "logger", true), filePath: logFilePath(), + settings: settings, } return &widget diff --git a/logger/settings.go b/logger/settings.go new file mode 100644 index 00000000..f5787b98 --- /dev/null +++ b/logger/settings.go @@ -0,0 +1,20 @@ +package logger + +import ( + "github.com/olebedev/config" + "github.com/wtfutil/wtf/cfg" +) + +type Settings struct { + common *cfg.Common + + filePath string +} + +func NewSettingsFromYAML(ymlConfig *config.Config) *Settings { + settings := Settings{ + common: cfg.NewCommonSettingsFromYAML(ymlConfig), + } + + return &settings +} diff --git a/main.go b/main.go index ae77eac6..f8ab6313 100644 --- a/main.go +++ b/main.go @@ -244,7 +244,8 @@ func makeWidget(app *tview.Application, pages *tview.Pages, widgetName string) w settings := jira.NewSettingsFromYAML(wtf.Config) widget = jira.NewWidget(app, pages, settings) case "logger": - widget = logger.NewWidget(app) + settings := logger.NewSettingsFromYAML(wtf.Config) + widget = logger.NewWidget(app, settings) case "mercurial": widget = mercurial.NewWidget(app, pages) case "nbascore":