Add color to simple icons

Dockerfile

@@ -42,6 +42,7 @@ COPY assets/favicon ./assets/favicon
 COPY --from=logo /app/logo.txt .
 COPY --from=nodeBuilder /app/assets/css/style.css ./assets/css/style.css
 COPY --from=nodeBuilder /app/node_modules/simple-icons/icons ./node_modules/simple-icons/icons
+COPY --from=nodeBuilder /app/node_modules/simple-icons/_data ./node_modules/simple-icons/_data
 COPY --from=goBuilder /app/views ./views
 COPY --from=goBuilder /app/components ./components
 COPY --from=goBuilder /app/godash .

services/bookmark.services.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"encoding/json"
 	"io"
 	"log/slog"
 	"os"
@@ -11,6 +12,7 @@ import (
 )
 
 const simpleIconsFolder = "node_modules/simple-icons/icons/"
+const simpleIconsInfo = "node_modules/simple-icons/_data/simple-icons.json"
 const storageFolder = "storage/"
 const iconsFolder = storageFolder + "icons/"
 const bookmarkFile = storageFolder + "bookmarks.yaml"
@@ -23,9 +25,13 @@ const defaultConfig = `links:
 applications:
   - category: "Code"
     entries:
-      - name: "Github"
+    - name: "GitHub"
       icon: "si/github.svg"
-        url: "https://github.com"`
+      ignore_color: true
+      url: "https://github.com"
+    - name: "Home Assistant"
+      icon: "si/homeassistant.svg"
+      url: "https://www.home-assistant.io/"`
 
 func init() {
 	folders := []string{storageFolder, iconsFolder}
@@ -42,6 +48,7 @@ func init() {
 func NewBookmarkService() *BookmarkService {
 	bs := BookmarkService{}
 	bs.parseBookmarks()
+	bs.parseIcons()
 	return &bs
 }
 
@@ -78,23 +85,40 @@ func (bs *BookmarkService) readBookmarksFile() []byte {
 }
 
 func (bs *BookmarkService) replaceIconString() {
-	for _, v := range bs.bookmarks.Applications {
+	iconsByTitle := make(map[string]string)
-		for i, bookmark := range v.Entries {
+	for _, icon := range bs.SimpleIcons.Icons {
-			rawHTML := ""
+		iconsByTitle[icon.Title] = icon.Hex
+	}
+
+	for i, v := range bs.bookmarks.Applications {
+		for j, bookmark := range v.Entries {
+			if filepath.Ext(bookmark.Icon) == ".svg" {
 				var data []byte
 				var err error
-			if filepath.Ext(bookmark.Icon) == ".svg" {
 				if strings.HasPrefix(bookmark.Icon, "si/") {
-					data, err = os.ReadFile(simpleIconsFolder + strings.Replace(bookmark.Icon, "si/", "", 1))
+					title := strings.Replace(bookmark.Icon, "si/", "", 1)
-				} else {
+					data, err = os.ReadFile(simpleIconsFolder + title)
-					data, err = os.ReadFile(iconsFolder + bookmark.Icon)
-				}
 					if err != nil {
 						continue
 					}
-				rawHTML = string(data)
+					color, ok := iconsByTitle[bookmark.Name]
+					if !(bookmark.IgnoreColor || !ok || color == "") {
+						data = []byte(insertColor(string(data), color))
+					}
+				} else if strings.HasPrefix(bookmark.Icon, "di/") {
+					title := strings.Replace(bookmark.Icon, "di/", "", 1)
+					data, err = os.ReadFile(simpleIconsFolder + title)
+					if err != nil {
+						continue
+					}
+				} else {
+					data, err = os.ReadFile(iconsFolder + bookmark.Icon)
+					if err != nil {
+						continue
+					}
+				}
+				bs.bookmarks.Applications[i].Entries[j].Icon = string(data)
 			}
-			v.Entries[i].Icon = rawHTML
 		}
 	}
 }
@@ -106,5 +130,30 @@ func (bs *BookmarkService) parseBookmarks() {
 		slog.Error(err.Error())
 		return
 	}
+}
+
+func (bs *BookmarkService) parseIcons() {
+	file, err := os.Open(simpleIconsInfo)
+	if err != nil {
+		slog.Error(err.Error())
+	}
+	defer file.Close()
+	byteValue, err := io.ReadAll(file)
+	if err != nil {
+		slog.Error(err.Error())
+	}
+	err = json.Unmarshal(byteValue, &bs.SimpleIcons)
+	if err != nil {
+		slog.Error(err.Error())
+		return
+	}
 	bs.replaceIconString()
 }
+
+func insertColor(svg, color string) string {
+	parts := strings.SplitN(svg, "<svg", 2)
+	if len(parts) != 2 {
+		return svg
+	}
+	return parts[0] + "<svg " + `fill="#` + color + `" ` + parts[1]
+}

services/bookmark.types.go

@@ -2,6 +2,7 @@ package services
 
 type BookmarkService struct {
 	bookmarks   Bookmarks
+	SimpleIcons SimpleIcons
 }
 
 type Bookmarks struct {
@@ -23,6 +24,15 @@ type Link struct {
 type Application struct {
 	Name        string
 	Icon        string
-	Background string
+	IgnoreColor bool `yaml:"ignore_color"`
 	URL         string
 }
+
+type SimpleIcons struct {
+	Icons []SimpleIcon `json:"icons"`
+}
+
+type SimpleIcon struct {
+	Title string `json:"title"`
+	Hex   string `json:"hex"`
+}