knotserver/git: skip unknown files in language breakdown #325

+12 -1

appview/repo/index.go

reviewed

··· 162 162 orm.FilterEq("ref", currentRef), 163 163 ) 164 164 165 165 - if err != nil || langs == nil { 165 165 + if err != nil || langs == nil || containsOtherLanguage(langs) { 166 166 + langs = nil 167 167 + 166 168 // non-fatal, fetch langs from ks via XRPC 167 169 xrpcc := &indigoxrpc.Client{ 168 170 Host: rp.config.KnotMirror.Url, ··· 238 240 return languageStats, nil 239 241 } 240 242 243 243 + func containsOtherLanguage(langs []models.RepoLanguage) bool { 244 244 + for _, l := range langs { 245 245 + if l.Language == enry.OtherLanguage { 246 246 + return true 247 247 + } 248 248 + } 249 249 + return false 250 250 + } 251 251 + 241 252 // buildIndexResponse creates a RepoIndexResponse by combining multiple xrpc calls in parallel 242 253 func (rp *Repo) buildIndexResponse(ctx context.Context, repo *models.Repo, ref string) (*types.RepoIndexResponse, error) { 243 254 xrpcc := &indigoxrpc.Client{Host: rp.config.KnotMirror.Url}

+1 -1

knotserver/git/language.go

reviewed

··· 33 33 } 34 34 35 35 langType := enry.GetLanguageType(language) 36 36 - if langType != enry.Programming && langType != enry.Markup && langType != enry.Unknown { 36 36 + if langType != enry.Programming && langType != enry.Markup { 37 37 return nil 38 38 } 39 39

+57

knotserver/git/language_test.go

reviewed

··· 1 1 + package git 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "strings" 6 6 + "testing" 7 7 + 8 8 + "github.com/stretchr/testify/require" 9 9 + "github.com/stretchr/testify/suite" 10 10 + ) 11 11 + 12 12 + type LanguageSuite struct { 13 13 + suite.Suite 14 14 + *RepoSuite 15 15 + } 16 16 + 17 17 + func TestLanguageSuite(t *testing.T) { 18 18 + t.Parallel() 19 19 + suite.Run(t, new(LanguageSuite)) 20 20 + } 21 21 + 22 22 + func (s *LanguageSuite) SetupTest() { 23 23 + s.RepoSuite = NewRepoSuite(s.T()) 24 24 + } 25 25 + 26 26 + func (s *LanguageSuite) TearDownTest() { 27 27 + s.RepoSuite.cleanup() 28 28 + } 29 29 + 30 30 + func (s *LanguageSuite) TestAnalyzeLanguagesSkipsUnknownGodotMetadata() { 31 31 + s.init() 32 32 + 33 33 + gdscript := "extends CharacterBody3D\n\nfunc _ready():\n\tpass\n" 34 34 + s.commitFile("code/player.gd", gdscript, "Add GDScript") 35 35 + s.commitFile("code/player.gd.uid", "uid://b5gy7avoc3cs1\n", "Add Godot uid") 36 36 + s.commitFile( 37 37 + "assets/player.glb.import", 38 38 + "[remap]\n\nimporter=\"scene\"\n\n[params]\n"+strings.Repeat("animation/import=true\n", 512), 39 39 + "Add Godot import metadata", 40 40 + ) 41 41 + s.commitFile( 42 42 + "scenes/player.tscn", 43 43 + "[gd_scene format=4]\n\n[sub_resource type=\"ArrayMesh\"]\n"+strings.Repeat("vertex_data = PackedByteArray(\"AAAA\")\n", 512), 44 44 + "Add Godot scene", 45 45 + ) 46 46 + 47 47 + gr, err := Open(s.repo.path, "") 48 48 + require.NoError(s.T(), err) 49 49 + 50 50 + langs, err := gr.AnalyzeLanguages(context.Background()) 51 51 + require.NoError(s.T(), err) 52 52 + 53 53 + require.NotContains(s.T(), langs, "") 54 54 + require.Equal(s.T(), LangBreakdown{ 55 55 + "GDScript": int64(len(gdscript)), 56 56 + }, langs) 57 57 + }