patch of feat: add language statistics to repo page · round #6 · pull #208 · tangled.org/core

+1 -1

appview/pages/pages.go

···

       446
       446
        
       	Raw                bool

     

       447
       447
        
       	EmailToDidOrHandle map[string]string

     

       448
       448
        
       	VerifiedCommits    commitverify.VerifiedCommits

     

       449
       449
       -
       	Languages          *types.RepoLanguageResponse

     

       449
       449
       +
       	Languages          []types.RepoLanguageDetails

     

       450
       450
        
       	Pipelines          map[string]db.Pipeline

     

       451
       451
        
       	types.RepoIndexResponse

     

       452
       452
        
       }

+64 -2

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,

appview/repo/repo.go

···

       35
       35
        
       

     

       36
       36
        
       	securejoin "github.com/cyphar/filepath-securejoin"

     

       37
       37
        
       	"github.com/go-chi/chi/v5"

     

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

     

       38
       39
        
       	"github.com/go-git/go-git/v5/plumbing"

     

       39
       40
        
       	"github.com/posthog/posthog-go"

     

       40
       41

+4 -1

knotserver/routes.go

···

       784
       784
        
       			content, _ := gr.FileContentN(absPath, 1024)

     

       785
       785
        
       			if !safe {

     

       786
       786
        
       				lang = enry.GetLanguage(absPath, content)

     

       787
       787
       +
       				if len(lang) == 0 {

     

       788
       788
       +
       					lang = "Other"

     

       789
       789
       +
       				}

     

       787
       790
        
       			} else {

     

       788
       791
        
       				lang, _ = enry.GetLanguageByContent(absPath, content)

     

       789
       792
        
       				if len(lang) == 0 {

     

       790
       790
       -
       					return

     

       793
       793
       +
       					lang = "Other"

     

       791
       794
        
       				}

     

       792
       795
        
       			}

     

       793
       796
        
       		}

+7 -1

types/repo.go

···

       109
       109
        
       	Status ForkStatus `json:"status"`

     

       110
       110
        
       }

     

       111
       111
        
       

     

       112
       112
       +
       type RepoLanguageDetails struct {

     

       113
       113
       +
       	Name       string

     

       114
       114
       +
       	Percentage float32

     

       115
       115
       +
       	Color      string

     

       116
       116
       +
       }

     

       117
       117
       +
       

     

       112
       118
        
       type RepoLanguageResponse struct {

     

       113
       113
       -
       	// Language: Percentage

     

       119
       119
       +
       	// Language: File count

     

       114
       120
        
       	Languages map[string]int `json:"languages"`

     

       115
       121
        
       }

+26 -23

appview/pages/templates/layouts/repobase.html

···

       1
       1
        
       {{ define "title" }}{{ .RepoInfo.FullName }}{{ end }}

     

       2
       2
        
       

     

       3
       3
        
       {{ define "content" }}

     

       4
       4
       -
       <section id="repo-header" class="mb-4 py-2 px-6 dark:text-white">

     

       5
       5
       -
         {{ if .RepoInfo.Source }}

     

       6
       6
       -
         <p class="text-sm">

     

       7
       7
       -
         <div class="flex items-center">

     

       8
       8
       -
             {{ i "git-fork" "w-3 h-3 mr-1"}}

     

       9
       9
       -
             forked from

     

       10
       10
       -
             {{ $sourceOwner := didOrHandle .RepoInfo.Source.Did .RepoInfo.SourceHandle  }}

     

       11
       11
       -
             <a class="ml-1 underline" href="/{{ $sourceOwner }}/{{ .RepoInfo.Source.Name }}">{{ $sourceOwner }}/{{ .RepoInfo.Source.Name }}</a>

     

       12
       12
       -
         </div>

     

       13
       13
       -
         </p>

     

       14
       14
       -
         {{ end }}

     

       15
       15
       -
         <div class="text-lg flex items-center justify-between">

     

       16
       16
       -
           <div>

     

       17
       17
       -
             <a href="/{{ .RepoInfo.OwnerWithAt }}">{{ .RepoInfo.OwnerWithAt }}</a>

     

       18
       18
       -
             <span class="select-none">/</span>

     

       19
       19
       -
             <a href="/{{ .RepoInfo.FullName }}" class="font-bold">{{ .RepoInfo.Name }}</a>

     

       20
       20
       -
           </div>

     

       4
       4
       +
           <section id="repo-header" class="mb-4 py-2 px-6 dark:text-white">

     

       5
       5
       +
             {{ if .RepoInfo.Source }}

     

       6
       6
       +
             <p class="text-sm">

     

       7
       7
       +
             <div class="flex items-center">

     

       8
       8
       +
                 {{ i "git-fork" "w-3 h-3 mr-1"}}

     

       9
       9
       +
                 forked from

     

       10
       10
       +
                 {{ $sourceOwner := didOrHandle .RepoInfo.Source.Did .RepoInfo.SourceHandle  }}

     

       11
       11
       +
                 <a class="ml-1 underline" href="/{{ $sourceOwner }}/{{ .RepoInfo.Source.Name }}">{{ $sourceOwner }}/{{ .RepoInfo.Source.Name }}</a>

     

       12
       12
       +
             </div>

     

       13
       13
       +
             </p>

     

       14
       14
       +
             {{ end }}

     

       15
       15
       +
             <div class="text-lg flex items-center justify-between">

     

       16
       16
       +
               <div>

     

       17
       17
       +
                 <a href="/{{ .RepoInfo.OwnerWithAt }}">{{ .RepoInfo.OwnerWithAt }}</a>

     

       18
       18
       +
                 <span class="select-none">/</span>

     

       19
       19
       +
                 <a href="/{{ .RepoInfo.FullName }}" class="font-bold">{{ .RepoInfo.Name }}</a>

     

       20
       20
       +
               </div>

     

       21
       21
        
       

     

       22
       22
       -
           {{ template "repo/fragments/repoActions" .RepoInfo }}

     

       23
       23
       -
         </div>

     

       24
       24
       -
         {{ template "repo/fragments/repoDescription" . }}

     

       25
       25
       -
       </section>

     

       26
       26
       -
           <section class="min-h-screen flex flex-col drop-shadow-sm">

     

       22
       22
       +
               {{ template "repo/fragments/repoActions" .RepoInfo }}

     

       23
       23
       +
             </div>

     

       24
       24
       +
             {{ template "repo/fragments/repoDescription" . }}

     

       25
       25
       +
           </section>

     

       26
       26
       +
       

     

       27
       27
       +
           <section

     

       28
       28
       +
               class="min-h-screen w-full flex flex-col drop-shadow-sm"

     

       29
       29
       +
           >

     

       27
       30
        
               <nav class="w-full pl-4 overflow-auto">

     

       28
       31
        
                   <div class="flex z-60">

     

       29
       32
        
                       {{ $activeTabStyles := "-mb-px bg-white dark:bg-gray-800" }}

     
···

       61
       64
        
                   </div>

     

       62
       65
        
               </nav>

     

       63
       66
        
               <section

     

       64
       64
       -
                   class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"

     

       67
       67
       +
                   class="bg-white dark:bg-gray-800 p-6 rounded relative w-full drop-shadow-sm dark:text-white"

     

       65
       68
        
               >

     

       66
       69
        
                   {{ block "repoContent" . }}{{ end }}

     

       67
       70
        
               </section>

+14

appview/pages/templates/repo/index.html

···

       7
       7
        
           {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo) }}

     

       8
       8
        
       {{ end }}

     

       9
       9
        
       

     

       10
       10
       +
       {{ define "repoLanguages" }}

     

       11
       11
       +
           <div class="flex gap-[3px] -m-6 mb-6 overflow-hidden rounded-t">

     

       12
       12
       +
               {{ range $value := .Languages }}

     

       13
       13
       +
                   <div

     

       14
       14
       +
                       title="{{ $value.Name }} {{ printf "%.1f" $value.Percentage }}%"

     

       15
       15
       +
                       class="h-2"

     

       16
       16
       +
                       style="background-color: {{ $value.Color }}; width: {{ $value.Percentage }}%"

     

       17
       17
       +
                   ></div>

     

       18
       18
       +
               {{ end }}

     

       19
       19
       +
           </div>

     

       20
       20
       +
       {{ end }}

     

       10
       21
        
       

     

       11
       22
        
       {{ define "repoContent" }}

     

       12
       23
        
           <main>

     

       24
       24
       +
               {{ if .Languages }}

     

       25
       25
       +
                   {{ block "repoLanguages" . }}{{ end }}

     

       26
       26
       +
               {{ end }}

     

       13
       27
        
               <div class="flex items-center justify-between pb-5">

     

       14
       28
        
                 {{ block "branchSelector" . }}{{ end }}

     

       15
       29
        
                 <div class="flex md:hidden items-center gap-4">