regnault.dev
appview: calculate default branch for storage in languages table
do not use the empty string, but use the calculated default branch
instead.
Signed-off-by: oppiliappan <me@oppi.li>
oppi.li
+4
-5
appview/repo/index.go
+4
-5
appview/repo/index.go
···
123
}
124
}
125
126
-
languageInfo, err := rp.getLanguageInfo(f, signedClient, ref)
127
if err != nil {
128
log.Printf("failed to compute language percentages: %s", err)
129
// non-fatal
···
158
func (rp *Repo) getLanguageInfo(
159
f *reporesolver.ResolvedRepo,
160
signedClient *knotclient.SignedClient,
161
-
ref string,
162
) ([]types.RepoLanguageDetails, error) {
163
// first attempt to fetch from db
164
langs, err := db.GetRepoLanguages(
165
rp.db,
166
db.FilterEq("repo_at", f.RepoAt),
167
-
db.FilterEq("ref", ref),
168
)
169
170
if err != nil || langs == nil {
171
// non-fatal, fetch langs from ks
172
-
ls, err := signedClient.RepoLanguages(f.OwnerDid(), f.RepoName, ref)
173
if err != nil {
174
return nil, err
175
}
···
179
for l, s := range ls.Languages {
180
langs = append(langs, db.RepoLanguage{
181
RepoAt: f.RepoAt,
182
-
Ref: ref,
183
Language: l,
184
Bytes: s,
185
})
···
123
}
124
}
125
126
+
languageInfo, err := rp.getLanguageInfo(f, signedClient)
127
if err != nil {
128
log.Printf("failed to compute language percentages: %s", err)
129
// non-fatal
···
158
func (rp *Repo) getLanguageInfo(
159
f *reporesolver.ResolvedRepo,
160
signedClient *knotclient.SignedClient,
161
) ([]types.RepoLanguageDetails, error) {
162
// first attempt to fetch from db
163
langs, err := db.GetRepoLanguages(
164
rp.db,
165
db.FilterEq("repo_at", f.RepoAt),
166
+
db.FilterEq("ref", f.Ref),
167
)
168
169
if err != nil || langs == nil {
170
// non-fatal, fetch langs from ks
171
+
ls, err := signedClient.RepoLanguages(f.OwnerDid(), f.RepoName, f.Ref)
172
if err != nil {
173
return nil, err
174
}
···
178
for l, s := range ls.Languages {
179
langs = append(langs, db.RepoLanguage{
180
RepoAt: f.RepoAt,
181
+
Ref: f.Ref,
182
Language: l,
183
Bytes: s,
184
})