commands: Rename doWithCommandeer to cfgInit/cfgSetAndInit

This will make it clearer what it does and make the code more consistent.

diff --git a/commands/commandeer.go b/commands/commandeer.go
index 8c8440a7a992fe2b0497fe9c55d4d45454205dbd..3054ffb7412c2b32a5891ae99b0a75194a16e504 100644 (file)
--- a/commands/commandeer.go
+++ b/commands/commandeer.go
@@ -72,7 +72,7 @@ type commandeer struct {
 
        visitedURLs *types.EvictingStringQueue
 
-       doWithCommandeer func(c *commandeer) error
+       cfgInit func(c *commandeer) error
 
        // We watch these for changes.
        configFiles []string
@@ -152,7 +152,7 @@ func (c *commandeer) initFs(fs *hugofs.Fs) error {
        return nil
 }
 
-func newCommandeer(mustHaveConfigFile, running bool, h *hugoBuilderCommon, f flagsToConfigHandler, doWithCommandeer func(c *commandeer) error, subCmdVs ...*cobra.Command) (*commandeer, error) {
+func newCommandeer(mustHaveConfigFile, running bool, h *hugoBuilderCommon, f flagsToConfigHandler, cfgInit func(c *commandeer) error, subCmdVs ...*cobra.Command) (*commandeer, error) {
 
        var rebuildDebouncer func(f func())
        if running {
@@ -171,7 +171,7 @@ func newCommandeer(mustHaveConfigFile, running bool, h *hugoBuilderCommon, f fla
                h:                   h,
                ftch:                f,
                commandeerHugoState: newCommandeerHugoState(),
-               doWithCommandeer:    doWithCommandeer,
+               cfgInit:             cfgInit,
                visitedURLs:         types.NewEvictingStringQueue(10),
                debounce:            rebuildDebouncer,
                fullRebuildSem:      semaphore.NewWeighted(1),
@@ -284,12 +284,12 @@ func (c *commandeer) loadConfig(mustHaveConfigFile, running bool) error {
                return nil
        }
 
-       doWithCommandeer := func(cfg config.Provider) error {
+       cfgSetAndInit := func(cfg config.Provider) error {
                c.Cfg = cfg
-               if c.doWithCommandeer == nil {
+               if c.cfgInit == nil {
                        return nil
                }
-               err := c.doWithCommandeer(c)
+               err := c.cfgInit(c)
                return err
        }
 
@@ -307,7 +307,7 @@ func (c *commandeer) loadConfig(mustHaveConfigFile, running bool) error {
                        AbsConfigDir: c.h.getConfigDir(dir),
                        Environ:      os.Environ(),
                        Environment:  environment},
-               doWithCommandeer,
+               cfgSetAndInit,
                doWithConfig)
 
        if err != nil && mustHaveConfigFile {
@@ -330,8 +330,8 @@ func (c *commandeer) loadConfig(mustHaveConfigFile, running bool) error {
 
        // This is potentially double work, but we need to do this one more time now
        // that all the languages have been configured.
-       if c.doWithCommandeer != nil {
-               if err := c.doWithCommandeer(c); err != nil {
+       if c.cfgInit != nil {
+               if err := c.cfgInit(c); err != nil {
                        return err
                }
        }

diff --git a/commands/hugo.go b/commands/hugo.go
index b2b0981a9f8ffb99a402dd3a5ab346fe5686b16b..4f7faaae43696ccb2d51c713d9cc06eba2bf896a 100644 (file)
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -118,9 +118,9 @@ func Execute(args []string) Response {
 func initializeConfig(mustHaveConfigFile, running bool,
        h *hugoBuilderCommon,
        f flagsToConfigHandler,
-       doWithCommandeer func(c *commandeer) error) (*commandeer, error) {
+       cfgInit func(c *commandeer) error) (*commandeer, error) {
 
-       c, err := newCommandeer(mustHaveConfigFile, running, h, f, doWithCommandeer)
+       c, err := newCommandeer(mustHaveConfigFile, running, h, f, cfgInit)
        if err != nil {
                return nil, err
        }