Fix edge cases with special langauges

Author: lafriks

models/repo_language_stats.go

@@ -55,26 +55,38 @@ func (stats LanguageStatList) getLanguagePercentages() map[string]float32 {
 	langPerc := make(map[string]float32)
 	var otherPerc float32 = 100
 	var total int64
+	// Check that repository has at least one non-special language
+	var skipSpecial bool
 	for _, stat := range stats {
-		// Exclude specific languages from percentage calculation
-		if _, ok := specialLanguages[stat.Language]; ok && len(stats) > 1 {
-			continue
+		if _, ok := specialLanguages[stat.Language]; !ok {
+			skipSpecial = true
+			break
 		}
-		total += stat.Size
 	}
 	for _, stat := range stats {
 		// Exclude specific languages from percentage calculation
-		if _, ok := specialLanguages[stat.Language]; ok && len(stats) > 1 {
+		if _, ok := specialLanguages[stat.Language]; ok && skipSpecial {
 			continue
 		}
-		perc := float32(math.Round(float64(stat.Size)/float64(total)*1000) / 10)
-		if perc <= 0.1 {
-			continue
+		total += stat.Size
+	}
+	if total > 0 {
+		for _, stat := range stats {
+			// Exclude specific languages from percentage calculation
+			if _, ok := specialLanguages[stat.Language]; ok && skipSpecial {
+				continue
+			}
+			perc := float32(math.Round(float64(stat.Size)/float64(total)*1000) / 10)
+			if perc <= 0.1 {
+				continue
+			}
+			otherPerc -= perc
+			langPerc[stat.Language] = perc
 		}
-		otherPerc -= perc
-		langPerc[stat.Language] = perc
+		otherPerc = float32(math.Round(float64(otherPerc)*10) / 10)
+	} else {
+		otherPerc = 100
 	}
-	otherPerc = float32(math.Round(float64(otherPerc)*10) / 10)
 	if otherPerc > 0 {
 		langPerc["other"] = otherPerc
 	}

modules/git/repo_language_stats.go

@@ -69,6 +69,10 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
 		return nil, err
 	}
 
+	if len(sizes) == 0 {
+		sizes["other"] = 0
+	}
+
 	return sizes, nil
 }
 

modules/indexer/stats/indexer_test.go

@@ -34,6 +34,9 @@ func TestRepoStatsIndex(t *testing.T) {
 
 	repo, err := models.GetRepositoryByID(1)
 	assert.NoError(t, err)
+	status, err := repo.GetIndexerStatus(models.RepoIndexerTypeStats)
+	assert.NoError(t, err)
+	assert.Equal(t, "65f1bf27bc3bf70f64657658635e66094edbcb4d", status.CommitSha)
 	langs, err := repo.GetTopLanguageStats(5)
 	assert.NoError(t, err)
 	assert.Len(t, langs, 1)