forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).
appview/models: move db.RepoLanguage into models
Signed-off-by: oppiliappan <me@oppi.li>
+24
-17
+5
-14
appview/db/language.go
+5
-14
appview/db/language.go
···
4
4
"fmt"
5
5
"strings"
6
6
7
-
"github.com/bluesky-social/indigo/atproto/syntax"
7
+
"tangled.org/core/appview/models"
8
8
)
9
9
10
-
type RepoLanguage struct {
11
-
Id int64
12
-
RepoAt syntax.ATURI
13
-
Ref string
14
-
IsDefaultRef bool
15
-
Language string
16
-
Bytes int64
17
-
}
18
-
19
-
func GetRepoLanguages(e Execer, filters ...filter) ([]RepoLanguage, error) {
10
+
func GetRepoLanguages(e Execer, filters ...filter) ([]models.RepoLanguage, error) {
20
11
var conditions []string
21
12
var args []any
22
13
for _, filter := range filters {
···
30
39
return nil, fmt.Errorf("failed to execute query: %w ", err)
31
40
}
32
41
33
-
var langs []RepoLanguage
42
+
var langs []models.RepoLanguage
34
43
for rows.Next() {
35
-
var rl RepoLanguage
44
+
var rl models.RepoLanguage
36
45
var isDefaultRef int
37
46
38
47
err := rows.Scan(
···
60
69
return langs, nil
61
70
}
62
71
63
-
func InsertRepoLanguages(e Execer, langs []RepoLanguage) error {
72
+
func InsertRepoLanguages(e Execer, langs []models.RepoLanguage) error {
64
73
stmt, err := e.Prepare(
65
74
"insert or replace into repo_languages (repo_at, ref, is_default_ref, language, bytes) values (?, ?, ?, ?, ?)",
66
75
)
+14
appview/models/language.go
+14
appview/models/language.go
+2
-1
appview/repo/index.go
+2
-1
appview/repo/index.go
···
20
20
"tangled.org/core/api/tangled"
21
21
"tangled.org/core/appview/commitverify"
22
22
"tangled.org/core/appview/db"
23
+
"tangled.org/core/appview/models"
23
24
"tangled.org/core/appview/pages"
24
25
"tangled.org/core/appview/pages/markup"
25
26
"tangled.org/core/appview/reporesolver"
···
192
191
}
193
192
194
193
for _, lang := range ls.Languages {
195
-
langs = append(langs, db.RepoLanguage{
194
+
langs = append(langs, models.RepoLanguage{
196
195
RepoAt: f.RepoAt(),
197
196
Ref: currentRef,
198
197
IsDefaultRef: isDefaultRef,
+3
-2
appview/state/knotstream.go
+3
-2
appview/state/knotstream.go
···
12
12
"tangled.org/core/appview/cache"
13
13
"tangled.org/core/appview/config"
14
14
"tangled.org/core/appview/db"
15
+
"tangled.org/core/appview/models"
15
16
ec "tangled.org/core/eventconsumer"
16
17
"tangled.org/core/eventconsumer/cursor"
17
18
"tangled.org/core/log"
···
157
156
return fmt.Errorf("%s is not a valid reference name", ref)
158
157
}
159
158
160
-
var langs []db.RepoLanguage
159
+
var langs []models.RepoLanguage
161
160
for _, l := range record.Meta.LangBreakdown.Inputs {
162
161
if l == nil {
163
162
continue
164
163
}
165
164
166
-
langs = append(langs, db.RepoLanguage{
165
+
langs = append(langs, models.RepoLanguage{
167
166
RepoAt: repo.RepoAt(),
168
167
Ref: ref.Short(),
169
168
IsDefaultRef: record.Meta.IsDefaultRef,