From 90d30a7bb2c6c197fc8416e754b9febea6cfbef1 Mon Sep 17 00:00:00 2001
From: oppiliappan <me@oppi.li>
Date: Thu, 10 Jul 2025 18:23:56 +0100
Subject: [PATCH] appview: simplify logic to build RepoLanguageDetails
Change-Id: zvkrywwskknqprmqvnwnnzwzzzwwluxm

Signed-off-by: oppiliappan <me@oppi.li>
---
 appview/pages/templates/repo/index.html | 25 +++++++------
 appview/repo/index.go                   | 50 ++++++++++---------------
 2 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/appview/pages/templates/repo/index.html b/appview/pages/templates/repo/index.html
index 1e85410..55e5abd 100644
--- a/appview/pages/templates/repo/index.html
+++ b/appview/pages/templates/repo/index.html
@@ -7,18 +7,6 @@
     {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo) }}
 {{ end }}
 
-{{ define "repoLanguages" }}
-    <div class="flex gap-[3px] -m-6 mb-6 overflow-hidden rounded-t">
-        {{ range $value := .Languages }}
-            <div
-                title="{{ $value.Name }} {{ printf "%.1f" $value.Percentage }}%"
-                class="h-2"
-                style="background-color: {{ $value.Color }}; width: {{ $value.Percentage }}%"
-            ></div>
-        {{ end }}
-    </div>
-{{ end }}
-
 {{ define "repoContent" }}
     <main>
         {{ if .Languages }}
@@ -45,6 +33,19 @@
     </main>
 {{ end }}
 
+{{ define "repoLanguages" }}
+    <div class="flex gap-[1px] -m-6 mb-6 overflow-hidden rounded-t">
+        {{ range $value := .Languages }}
+            <div
+                title='{{ or $value.Name "Other" }} {{ printf "%.1f" $value.Percentage }}%'
+                class="h-[4px] rounded-full"
+                style="background-color: {{ $value.Color }}; width: {{ $value.Percentage }}%"
+            ></div>
+        {{ end }}
+    </div>
+{{ end }}
+
+
 {{ define "branchSelector" }}
   <div class="flex gap-2 items-center items-stretch justify-center">
     <select
diff --git a/appview/repo/index.go b/appview/repo/index.go
index bb32759..9ad8219 100644
--- a/appview/repo/index.go
+++ b/appview/repo/index.go
@@ -123,7 +123,7 @@ func (rp *Repo) RepoIndex(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	languageInfo, err := getLanguageInfo(repoInfo, rp, f, user, signedClient, ref)
+	languageInfo, err := getLanguageInfo(f, signedClient, ref)
 	if err != nil {
 		log.Printf("failed to compute language percentages: %s", err)
 		// non-fatal
@@ -157,10 +157,7 @@ func (rp *Repo) RepoIndex(w http.ResponseWriter, r *http.Request) {
 }
 
 func getLanguageInfo(
-	repoInfo repoinfo.RepoInfo,
-	rp *Repo,
 	f *reporesolver.ResolvedRepo,
-	user *oauth.User,
 	signedClient *knotclient.SignedClient,
 	ref string,
 ) ([]types.RepoLanguageDetails, error) {
@@ -169,50 +166,43 @@ func getLanguageInfo(
 		return []types.RepoLanguageDetails{}, err
 	}
 	if repoLanguages == nil {
-		repoLanguages = &types.RepoLanguageResponse{Languages: make(map[string]int)}
+		repoLanguages = &types.RepoLanguageResponse{Languages: make(map[string]int64)}
 	}
 
-	totalLanguageFileCount := 0
-	for _, fileCount := range repoLanguages.Languages {
-		totalLanguageFileCount += fileCount
+	var totalSize int64
+	for _, fileSize := range repoLanguages.Languages {
+		totalSize += fileSize
 	}
 
 	var languageStats []types.RepoLanguageDetails
-	var otherLanguageStat *types.RepoLanguageDetails
 	var otherPercentage float32 = 0
 
-	for fileType, fileCount := range repoLanguages.Languages {
-		percentage := (float32(fileCount) / float32(totalLanguageFileCount)) * 100
-
-		if percentage <= 0.1 {
-			otherPercentage += percentage
-			continue
-		}
+	for lang, size := range repoLanguages.Languages {
+		percentage := (float32(size) / float32(totalSize)) * 100
 
-		// Exclude languages
-		if fileType == "Text" {
+		if percentage <= 0.5 {
 			otherPercentage += percentage
 			continue
 		}
 
-		color := enry.GetColor(fileType)
+		color := enry.GetColor(lang)
 
-		if fileType == "Other" {
-			otherLanguageStat = &types.RepoLanguageDetails{Name: fileType, Percentage: percentage, Color: color}
-		} else {
-			languageStats = append(languageStats, types.RepoLanguageDetails{Name: fileType, Percentage: percentage, Color: color})
-		}
+		languageStats = append(languageStats, types.RepoLanguageDetails{Name: lang, Percentage: percentage, Color: color})
 	}
 
 	sort.Slice(languageStats, func(i, j int) bool {
-		return languageStats[i].Percentage > languageStats[j].Percentage
+		if languageStats[i].Name == enry.OtherLanguage {
+			return false
+		}
+		if languageStats[j].Name == enry.OtherLanguage {
+			return true
+		}
+		if languageStats[i].Percentage != languageStats[j].Percentage {
+			return languageStats[i].Percentage > languageStats[j].Percentage
+		}
+		return languageStats[i].Name < languageStats[j].Name
 	})
 
-	if otherLanguageStat != nil {
-		otherLanguageStat.Percentage += otherPercentage
-		languageStats = append(languageStats, *otherLanguageStat)
-	}
-
 	return languageStats, nil
 }
 
-- 
2.43.0