Skip to content

Edit config-fields.go CDN URLs #830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Edit config-fields.go CDN URLs #830

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 38 additions & 2 deletions internal/glance/config-fields.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,38 @@ type customIconField struct {
AutoInvert bool
}

/*
I'm sure there are better & more optimized ways to do this,
but I have little to no experience with Go.

I couldn't find an unpkg version for homarr and selfhst,
though there might be other alternatives ¯\_(ツ)_/¯
*/
var activeCDN string

func detectCDN() string {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should return an error

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It didn't return an error in my testing, but let me know if it did on your end.

client := &http.Client{Timeout: 5 * time.Second}

candidates := []string{
"https://cdn.jsdelivr.net",
"https://unpkg.com",
}

for _, base := range candidates {
resp, err := client.Head(base)
if err != nil {
continue
}
resp.Body.Close()
if resp.StatusCode == http.StatusOK {
return base
}
}

return "None"
}


func newCustomIconField(value string) customIconField {
const autoInvertPrefix = "auto-invert "
field := customIconField{}
Expand All @@ -143,6 +175,10 @@ func newCustomIconField(value string) customIconField {
value = strings.TrimPrefix(value, autoInvertPrefix)
}

if activeCDN == "" {
activeCDN = detectCDN()
}

prefix, icon, found := strings.Cut(value, ":")
if !found {
field.URL = template.URL(value)
Expand All @@ -161,13 +197,13 @@ func newCustomIconField(value string) customIconField {

switch prefix {
case "si":
field.URL = template.URL(activeCDN + "/simple-icons@latest/icons/" + basename + ".svg")
field.AutoInvert = true
field.URL = template.URL("https://cdn.jsdelivr.net/npm/simple-icons@latest/icons/" + basename + ".svg")
case "di":
field.URL = template.URL("https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/" + ext + "/" + basename + "." + ext)
case "mdi":
field.URL = template.URL(activeCDN + "/@mdi/svg@latest/svg/" + basename + ".svg")
field.AutoInvert = true
field.URL = template.URL("https://cdn.jsdelivr.net/npm/@mdi/svg@latest/svg/" + basename + ".svg")
case "sh":
field.URL = template.URL("https://cdn.jsdelivr.net/gh/selfhst/icons/" + ext + "/" + basename + "." + ext)
default:
Expand Down