forked from tangled.org/core
Monorepo for Tangled

appview/models: move db.RepoLanguage into models

Signed-off-by: oppiliappan <me@oppi.li>

oppi.li 9a4412df 6a7d161d

verified
Changed files
+24 -17
appview
+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 { ··· 39 30 return nil, fmt.Errorf("failed to execute query: %w ", err) 40 31 } 41 32 42 - var langs []RepoLanguage 33 + var langs []models.RepoLanguage 43 34 for rows.Next() { 44 - var rl RepoLanguage 35 + var rl models.RepoLanguage 45 36 var isDefaultRef int 46 37 47 38 err := rows.Scan( ··· 69 60 return langs, nil 70 61 } 71 62 72 - func InsertRepoLanguages(e Execer, langs []RepoLanguage) error { 63 + func InsertRepoLanguages(e Execer, langs []models.RepoLanguage) error { 73 64 stmt, err := e.Prepare( 74 65 "insert or replace into repo_languages (repo_at, ref, is_default_ref, language, bytes) values (?, ?, ?, ?, ?)", 75 66 )
+14
appview/models/language.go
··· 1 + package models 2 + 3 + import ( 4 + "github.com/bluesky-social/indigo/atproto/syntax" 5 + ) 6 + 7 + type RepoLanguage struct { 8 + Id int64 9 + RepoAt syntax.ATURI 10 + Ref string 11 + IsDefaultRef bool 12 + Language string 13 + Bytes int64 14 + }
+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" ··· 191 192 } 192 193 193 194 for _, lang := range ls.Languages { 194 - langs = append(langs, db.RepoLanguage{ 195 + langs = append(langs, models.RepoLanguage{ 195 196 RepoAt: f.RepoAt(), 196 197 Ref: currentRef, 197 198 IsDefaultRef: isDefaultRef,
+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" ··· 156 157 return fmt.Errorf("%s is not a valid reference name", ref) 157 158 } 158 159 159 - var langs []db.RepoLanguage 160 + var langs []models.RepoLanguage 160 161 for _, l := range record.Meta.LangBreakdown.Inputs { 161 162 if l == nil { 162 163 continue 163 164 } 164 165 165 - langs = append(langs, db.RepoLanguage{ 166 + langs = append(langs, models.RepoLanguage{ 166 167 RepoAt: repo.RepoAt(), 167 168 Ref: ref.Short(), 168 169 IsDefaultRef: record.Meta.IsDefaultRef,