diff --git a/appview/db/language.go b/appview/db/language.go index 73450acb..ea3a2b33 100644 --- a/appview/db/language.go +++ b/appview/db/language.go @@ -4,19 +4,10 @@ import ( "fmt" "strings" - "github.com/bluesky-social/indigo/atproto/syntax" + "tangled.org/core/appview/models" ) -type RepoLanguage struct { - Id int64 - RepoAt syntax.ATURI - Ref string - IsDefaultRef bool - Language string - Bytes int64 -} - -func GetRepoLanguages(e Execer, filters ...filter) ([]RepoLanguage, error) { +func GetRepoLanguages(e Execer, filters ...filter) ([]models.RepoLanguage, error) { var conditions []string var args []any for _, filter := range filters { @@ -39,9 +30,9 @@ func GetRepoLanguages(e Execer, filters ...filter) ([]RepoLanguage, error) { return nil, fmt.Errorf("failed to execute query: %w ", err) } - var langs []RepoLanguage + var langs []models.RepoLanguage for rows.Next() { - var rl RepoLanguage + var rl models.RepoLanguage var isDefaultRef int err := rows.Scan( @@ -69,7 +60,7 @@ func GetRepoLanguages(e Execer, filters ...filter) ([]RepoLanguage, error) { return langs, nil } -func InsertRepoLanguages(e Execer, langs []RepoLanguage) error { +func InsertRepoLanguages(e Execer, langs []models.RepoLanguage) error { stmt, err := e.Prepare( "insert or replace into repo_languages (repo_at, ref, is_default_ref, language, bytes) values (?, ?, ?, ?, ?)", ) diff --git a/appview/models/language.go b/appview/models/language.go new file mode 100644 index 00000000..020b9d30 --- /dev/null +++ b/appview/models/language.go @@ -0,0 +1,14 @@ +package models + +import ( + "github.com/bluesky-social/indigo/atproto/syntax" +) + +type RepoLanguage struct { + Id int64 + RepoAt syntax.ATURI + Ref string + IsDefaultRef bool + Language string + Bytes int64 +} diff --git a/appview/repo/index.go b/appview/repo/index.go index 31750259..c5f3c2d7 100644 --- a/appview/repo/index.go +++ b/appview/repo/index.go @@ -20,6 +20,7 @@ import ( "tangled.org/core/api/tangled" "tangled.org/core/appview/commitverify" "tangled.org/core/appview/db" + "tangled.org/core/appview/models" "tangled.org/core/appview/pages" "tangled.org/core/appview/pages/markup" "tangled.org/core/appview/reporesolver" @@ -191,7 +192,7 @@ func (rp *Repo) getLanguageInfo( } for _, lang := range ls.Languages { - langs = append(langs, db.RepoLanguage{ + langs = append(langs, models.RepoLanguage{ RepoAt: f.RepoAt(), Ref: currentRef, IsDefaultRef: isDefaultRef, diff --git a/appview/state/knotstream.go b/appview/state/knotstream.go index 0fab4a0c..92bc3cf3 100644 --- a/appview/state/knotstream.go +++ b/appview/state/knotstream.go @@ -12,6 +12,7 @@ import ( "tangled.org/core/appview/cache" "tangled.org/core/appview/config" "tangled.org/core/appview/db" + "tangled.org/core/appview/models" ec "tangled.org/core/eventconsumer" "tangled.org/core/eventconsumer/cursor" "tangled.org/core/log" @@ -156,13 +157,13 @@ func updateRepoLanguages(d *db.DB, record tangled.GitRefUpdate) error { return fmt.Errorf("%s is not a valid reference name", ref) } - var langs []db.RepoLanguage + var langs []models.RepoLanguage for _, l := range record.Meta.LangBreakdown.Inputs { if l == nil { continue } - langs = append(langs, db.RepoLanguage{ + langs = append(langs, models.RepoLanguage{ RepoAt: repo.RepoAt(), Ref: ref.Short(), IsDefaultRef: record.Meta.IsDefaultRef,