diff --git a/README.md b/README.md index 576f473..a584804 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ In order to be adjustable to your needs there are some ways to customize your OT appIcon: '' # Override the app-title, if unset or empty the default app-title -# "OTS - One Time Secret" will be used +# "OTS - One Time Secrets" will be used appTitle: '' # Disable display of the app-title (for example if you included the diff --git a/customize.go b/customize.go index 87d18c7..93893fe 100644 --- a/customize.go +++ b/customize.go @@ -43,19 +43,22 @@ func loadCustomize(filename string) (customize, error) { } defer cf.Close() - return cust, errors.Wrap( - yaml.NewDecoder(cf).Decode(&cust), - "decoding customize file", - ) -} - -func (c *customize) defaults() { - if len(c.AppTitle) == 0 { - c.AppTitle = "OTS - One Time Secrets" + if err = yaml.NewDecoder(cf).Decode(&cust); err != nil { + return cust, errors.Wrap(err, "decoding customize file") } + + cust.applyFixes() + + return cust, nil } func (c customize) ToJSON() (string, error) { j, err := json.Marshal(c) return string(j), errors.Wrap(err, "marshalling JSON") } + +func (c *customize) applyFixes() { + if len(c.AppTitle) == 0 { + c.AppTitle = "OTS - One Time Secrets" + } +} diff --git a/main.go b/main.go index 9ed0707..7e2b931 100644 --- a/main.go +++ b/main.go @@ -73,7 +73,6 @@ func initApp() error { if cust, err = loadCustomize(cfg.Customize); err != nil { return errors.Wrap(err, "loading customizations") } - cust.defaults() frontendFS, err := fs.Sub(embeddedAssets, "frontend") if err != nil { diff --git a/src/app.vue b/src/app.vue index 0f74fb8..ccc2a1d 100644 --- a/src/app.vue +++ b/src/app.vue @@ -18,7 +18,7 @@ class="mr-1" :src="customize.appIcon" > - {{ customize.appTitle || 'OTS - One Time Secrets' }} + {{ customize.appTitle }}