chore: use wakatime colors for editors and os (resolve #100)

config/config.go

@@ -37,10 +37,10 @@ var cfg *Config
 var cFlag = flag.String("config", defaultConfigPath, "config file location")
 
 type appConfig struct {
-	AggregationTime string            `yaml:"aggregation_time" default:"02:15" env:"WAKAPI_AGGREGATION_TIME"`
-	CountingTime    string            `yaml:"counting_time" default:"05:15" env:"WAKAPI_COUNTING_TIME"`
-	CustomLanguages map[string]string `yaml:"custom_languages"`
-	LanguageColors  map[string]string `yaml:"-"`
+	AggregationTime string                       `yaml:"aggregation_time" default:"02:15" env:"WAKAPI_AGGREGATION_TIME"`
+	CountingTime    string                       `yaml:"counting_time" default:"05:15" env:"WAKAPI_COUNTING_TIME"`
+	CustomLanguages map[string]string            `yaml:"custom_languages"`
+	Colors          map[string]map[string]string `yaml:"-"`
 }
 
 type securityConfig struct {
@@ -127,7 +127,7 @@ func (c *Config) GetMigrationFunc(dbDialect string) models.MigrationFunc {
 
 func (c *Config) GetFixturesFunc(dbDialect string) models.MigrationFunc {
 	return func(db *gorm.DB) error {
-		migrations := &migrate.HttpFileSystemMigrationSource {
+		migrations := &migrate.HttpFileSystemMigrationSource{
 			FileSystem: pkger.Dir("/migrations"),
 		}
 
@@ -193,11 +193,19 @@ func sqliteConnectionString(config *dbConfig) string {
 }
 
 func (c *appConfig) GetCustomLanguages() map[string]string {
-	return cloneStringMap(c.CustomLanguages)
+	return cloneStringMap(c.CustomLanguages, false)
 }
 
 func (c *appConfig) GetLanguageColors() map[string]string {
-	return cloneStringMap(c.LanguageColors)
+	return cloneStringMap(c.Colors["languages"], true)
+}
+
+func (c *appConfig) GetEditorColors() map[string]string {
+	return cloneStringMap(c.Colors["editors"], true)
+}
+
+func (c *appConfig) GetOSColors() map[string]string {
+	return cloneStringMap(c.Colors["operating_systems"], true)
 }
 
 func IsDev(env string) bool {
@@ -219,14 +227,16 @@ func readVersion() string {
 	return strings.TrimSpace(string(bytes))
 }
 
-func readLanguageColors() map[string]string {
+func readColors() map[string]map[string]string {
 	// Read language colors
-	// Source: https://raw.githubusercontent.com/ozh/github-colors/master/colors.json
-	var colors = make(map[string]string)
-	var rawColors map[string]struct {
-		Color string `json:"color"`
-		Url   string `json:"url"`
-	}
+	// Source:
+	// – https://raw.githubusercontent.com/ozh/github-colors/master/colors.json
+	// – https://wakatime.com/colors/operating_systems
+	// - https://wakatime.com/colors/editors
+	// Extracted from Wakatime website with XPath (see below) and did a bit of regex magic after.
+	// – $x('//span[@class="editor-icon tip"]/@data-original-title').map(e => e.nodeValue)
+	// – $x('//span[@class="editor-icon tip"]/div[1]/text()').map(e => e.nodeValue)
+	var colors = make(map[string]map[string]string)
 
 	file, err := pkger.Open("/data/colors.json")
 	if err != nil {
@@ -238,14 +248,10 @@ func readLanguageColors() map[string]string {
 		log.Fatal(err)
 	}
 
-	if err := json.Unmarshal(bytes, &rawColors); err != nil {
+	if err := json.Unmarshal(bytes, &colors); err != nil {
 		log.Fatal(err)
 	}
 
-	for k, v := range rawColors {
-		colors[strings.ToLower(k)] = v.Color
-	}
-
 	return colors
 }
 
@@ -284,7 +290,7 @@ func Load() *Config {
 	}
 
 	config.Version = readVersion()
-	config.App.LanguageColors = readLanguageColors()
+	config.App.Colors = readColors()
 	config.Db.Dialect = resolveDbDialect(config.Db.Type)
 	config.Security.SecureCookie = securecookie.New(
 		securecookie.GenerateRandomKey(64),

config/utils.go

@@ -1,8 +1,13 @@
 package config
 
-func cloneStringMap(m map[string]string) map[string]string {
+import "strings"
+
+func cloneStringMap(m map[string]string, keysToLower bool) map[string]string {
 	m2 := make(map[string]string)
 	for k, v := range m {
+		if keysToLower {
+			k = strings.ToLower(k)
+		}
 		m2[k] = v
 	}
 	return m2

models/summary.go

@@ -66,6 +66,8 @@ type SummaryItemContainer struct {
 type SummaryViewModel struct {
 	*Summary
 	LanguageColors map[string]string
+	EditorColors   map[string]string
+	OSColors       map[string]string
 	Error          string
 	Success        string
 	ApiKey         string

routes/summary.go

@@ -59,7 +59,9 @@ func (h *SummaryHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 
 	vm := models.SummaryViewModel{
 		Summary:        summary,
-		LanguageColors: utils.FilterLanguageColors(h.config.App.GetLanguageColors(), summary),
+		LanguageColors: utils.FilterColors(h.config.App.GetLanguageColors(), summary.Languages),
+		EditorColors:   utils.FilterColors(h.config.App.GetEditorColors(), summary.Editors),
+		OSColors:       utils.FilterColors(h.config.App.GetOSColors(), summary.OperatingSystems),
 		ApiKey:         user.ApiKey,
 	}
 

static/assets/app.js

@@ -110,7 +110,7 @@ function draw(subselection) {
                     data: wakapiData.operatingSystems
                         .slice(0, Math.min(showTopN[1], wakapiData.operatingSystems.length))
                         .map(p => parseInt(p.total)),
-                    backgroundColor: wakapiData.operatingSystems.map(p => getRandomColor(p.key))
+                    backgroundColor: wakapiData.operatingSystems.map(p => osColors[p.key.toLowerCase()] || getRandomColor(p.key))
                 }],
                 labels: wakapiData.operatingSystems
                     .slice(0, Math.min(showTopN[1], wakapiData.operatingSystems.length))
@@ -132,7 +132,7 @@ function draw(subselection) {
                     data: wakapiData.editors
                         .slice(0, Math.min(showTopN[2], wakapiData.editors.length))
                         .map(p => parseInt(p.total)),
-                    backgroundColor: wakapiData.editors.map(p => getRandomColor(p.key))
+                    backgroundColor: wakapiData.editors.map(p => editorColors[p.key.toLowerCase()] || getRandomColor(p.key))
                 }],
                 labels: wakapiData.editors
                     .slice(0, Math.min(showTopN[2], wakapiData.editors.length))

utils/color.go

@@ -5,9 +5,9 @@ import (
 	"strings"
 )
 
-func FilterLanguageColors(all map[string]string, summary *models.Summary) map[string]string {
+func FilterColors(all map[string]string, haystack models.SummaryItems) map[string]string {
 	subset := make(map[string]string)
-	for _, item := range summary.Languages {
+	for _, item := range haystack {
 		if c, ok := all[strings.ToLower(item.Key)]; ok {
 			subset[strings.ToLower(item.Key)] = c
 		}

version.txt

@@ -1 +1 @@
-1.20.2
+1.20.3

views/summary.tpl.html

@@ -158,6 +158,8 @@
 
 <script>
     const languageColors = {{ .LanguageColors | json }}
+    const editorColors = {{ .EditorColors | json }}
+    const osColors = {{ .OSColors | json }}
 
     const wakapiData = {}
     wakapiData.projects = {{ .Projects | json }}