Skip to content

Commit

Permalink
Add some small improvements
Browse files Browse the repository at this point in the history
- Move application of fixes into loader function
- Remove default fallback from frontend source
- Fix documentation of default value in AppTitle

Signed-off-by: Knut Ahlers <knut@ahlers.me>
  • Loading branch information
Luzifer committed Aug 10, 2023
1 parent faccb17 commit 318ae9f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 12 additions & 9 deletions customize.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
1 change: 0 additions & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
class="mr-1"
:src="customize.appIcon"
>
<span v-if="!customize.disableAppTitle">{{ customize.appTitle || 'OTS - One Time Secrets' }}</span>
<span v-if="!customize.disableAppTitle">{{ customize.appTitle }}</span>
</b-navbar-brand>

<b-navbar-toggle target="nav-collapse" />
Expand Down

0 comments on commit 318ae9f

Please sign in to comment.