interdiff of round #6 and #5 · pull #208 · tangled.org/core

ERROR
appview/pages/pages.go
Failed to calculate interdiff for this file.
REBASED
appview/repo/repo.go
This patch was likely rebased, as context lines do not match.
REBASED
knotserver/routes.go
This patch was likely rebased, as context lines do not match.
ERROR
types/repo.go
Failed to calculate interdiff for this file.
ERROR
appview/pages/templates/layouts/repobase.html
Failed to calculate interdiff for this file.
ERROR
appview/pages/templates/repo/index.html
Failed to calculate interdiff for this file.
NEW
appview/repo/index.go
···

       6
       6
        
       	"log"

     

       7
       7
        
       	"net/http"

     

       8
       8
        
       	"slices"

     

       9
       9
       +
       	"sort"

     

       9
       10
        
       	"strings"

     

       10
       11
        
       

     

       11
       12
        
       	"tangled.sh/tangled.sh/core/appview/commitverify"

     
···

       18
       19
        
       	"tangled.sh/tangled.sh/core/types"

     

       19
       20
        
       

     

       20
       21
        
       	"github.com/go-chi/chi/v5"

     

       22
       22
       +
       	"github.com/go-enry/go-enry/v2"

     

       21
       23
        
       )

     

       22
       24
        
       

     

       23
       25
        
       func (rp *Repo) RepoIndex(w http.ResponseWriter, r *http.Request) {

     
···

       121
       123
        
       		}

     

       122
       124
        
       	}

     

       123
       125
        
       

     

       124
       124
       -
       	repoLanguages, err := signedClient.RepoLanguages(f.OwnerDid(), f.RepoName, ref)

     

       126
       126
       +
       	languageInfo, err := getLanguageInfo(repoInfo, rp, f, user, signedClient, ref)

     

       125
       127
        
       	if err != nil {

     

       126
       128
        
       		log.Printf("failed to compute language percentages: %s", err)

     

       127
       129
        
       		// non-fatal

     
···

       148
       150
        
       		BranchesTrunc:      branchesTrunc,

     

       149
       151
        
       		EmailToDidOrHandle: emailToDidOrHandle(rp, emailToDidMap),

     

       150
       152
        
       		VerifiedCommits:    vc,

     

       151
       151
       -
       		Languages:          repoLanguages,

     

       153
       153
       +
       		Languages:          languageInfo,

     

       152
       154
        
       		Pipelines:          pipelines,

     

       153
       155
        
       	})

     

       154
       156
        
       	return

     

       155
       157
        
       }

     

       156
       158
        
       

     

       159
       159
       +
       func getLanguageInfo(

     

       160
       160
       +
       	repoInfo repoinfo.RepoInfo,

     

       161
       161
       +
       	rp *Repo,

     

       162
       162
       +
       	f *reporesolver.ResolvedRepo,

     

       163
       163
       +
       	user *oauth.User,

     

       164
       164
       +
       	signedClient *knotclient.SignedClient,

     

       165
       165
       +
       	ref string,

     

       166
       166
       +
       ) ([]types.RepoLanguageDetails, error) {

     

       167
       167
       +
       	repoLanguages, err := signedClient.RepoLanguages(f.OwnerDid(), f.RepoName, ref)

     

       168
       168
       +
       	if err != nil {

     

       169
       169
       +
       		return []types.RepoLanguageDetails{}, err

     

       170
       170
       +
       	}

     

       171
       171
       +
       	if repoLanguages == nil {

     

       172
       172
       +
       		repoLanguages = &types.RepoLanguageResponse{Languages: make(map[string]int)}

     

       173
       173
       +
       	}

     

       174
       174
       +
       

     

       175
       175
       +
       	totalLanguageFileCount := 0

     

       176
       176
       +
       	for _, fileCount := range repoLanguages.Languages {

     

       177
       177
       +
       		totalLanguageFileCount += fileCount

     

       178
       178
       +
       	}

     

       179
       179
       +
       

     

       180
       180
       +
       	var languageStats []types.RepoLanguageDetails

     

       181
       181
       +
       	var otherLanguageStat *types.RepoLanguageDetails

     

       182
       182
       +
       	var otherPercentage float32 = 0

     

       183
       183
       +
       

     

       184
       184
       +
       	for fileType, fileCount := range repoLanguages.Languages {

     

       185
       185
       +
       		percentage := (float32(fileCount) / float32(totalLanguageFileCount)) * 100

     

       186
       186
       +
       

     

       187
       187
       +
       		if percentage <= 0.1 {

     

       188
       188
       +
       			otherPercentage += percentage

     

       189
       189
       +
       			continue

     

       190
       190
       +
       		}

     

       191
       191
       +
       

     

       192
       192
       +
       		// Exclude languages

     

       193
       193
       +
       		if fileType == "Text" {

     

       194
       194
       +
       			otherPercentage += percentage

     

       195
       195
       +
       			continue

     

       196
       196
       +
       		}

     

       197
       197
       +
       

     

       198
       198
       +
       		color := enry.GetColor(fileType)

     

       199
       199
       +
       

     

       200
       200
       +
       		if fileType == "Other" {

     

       201
       201
       +
       			otherLanguageStat = &types.RepoLanguageDetails{Name: fileType, Percentage: percentage, Color: color}

     

       202
       202
       +
       		} else {

     

       203
       203
       +
       			languageStats = append(languageStats, types.RepoLanguageDetails{Name: fileType, Percentage: percentage, Color: color})

     

       204
       204
       +
       		}

     

       205
       205
       +
       	}

     

       206
       206
       +
       

     

       207
       207
       +
       	sort.Slice(languageStats, func(i, j int) bool {

     

       208
       208
       +
       		return languageStats[i].Percentage > languageStats[j].Percentage

     

       209
       209
       +
       	})

     

       210
       210
       +
       

     

       211
       211
       +
       	if otherLanguageStat != nil {

     

       212
       212
       +
       		otherLanguageStat.Percentage += otherPercentage

     

       213
       213
       +
       		languageStats = append(languageStats, *otherLanguageStat)

     

       214
       214
       +
       	}

     

       215
       215
       +
       

     

       216
       216
       +
       	return languageStats, nil

     

       217
       217
       +
       }

     

       218
       218
       +
       

     

       157
       219
        
       func getForkInfo(

     

       158
       220
        
       	repoInfo repoinfo.RepoInfo,

     

       159
       221
        
       	rp *Repo,