filter #1

+99 -3

store/store.go

reviewed

··· 10 10 "encoding/json" 11 11 "fmt" 12 12 "io" 13 13 + "sort" 13 14 "time" 14 15 15 16 "entgo.io/ent/dialect" ··· 395 396 return out, rows.Err() 396 397 } 397 398 398 398 - // RecentRepos returns repos created since `since`, optionally filtered by 399 399 - // primary language. Pass limit <= 0 for no limit. Uses raw SQL for the 400 400 - // scalar star-count subquery and handle JOIN — both awkward in ent. 399 399 + // PrimaryLanguages returns the sorted set of "primary" languages observed 400 400 + // across all enriched repos — i.e., the highest-bytes language per repo, 401 401 + // deduplicated. Used to populate the language filter dropdown. 402 402 + func (s *Store) PrimaryLanguages(ctx context.Context) ([]string, error) { 403 403 + rows, err := s.db.QueryContext(ctx, `SELECT languages FROM repos WHERE languages IS NOT NULL AND languages != '' AND languages != '{}'`) 404 404 + if err != nil { 405 405 + return nil, err 406 406 + } 407 407 + defer rows.Close() 408 408 + seen := make(map[string]struct{}) 409 409 + for rows.Next() { 410 410 + var raw string 411 411 + if err := rows.Scan(&raw); err != nil { 412 412 + return nil, err 413 413 + } 414 414 + var langs map[string]int64 415 415 + if err := json.Unmarshal([]byte(raw), &langs); err != nil { 416 416 + continue 417 417 + } 418 418 + var best string 419 419 + var bestN int64 420 420 + for k, v := range langs { 421 421 + if v > bestN { 422 422 + bestN, best = v, k 423 423 + } 424 424 + } 425 425 + if best != "" { 426 426 + seen[best] = struct{}{} 427 427 + } 428 428 + } 429 429 + if err := rows.Err(); err != nil { 430 430 + return nil, err 431 431 + } 432 432 + out := make([]string, 0, len(seen)) 433 433 + for k := range seen { 434 434 + out = append(out, k) 435 435 + } 436 436 + sort.Strings(out) 437 437 + return out, nil 438 438 + } 439 439 + 440 440 + // ReposFilter narrows the result of RecentRepos. Zero values mean "no 441 441 + // filter" so callers can mix and match. 442 442 + type ReposFilter struct { 443 443 + Language string // primary language match (post-filter in Go over JSON map) 444 444 + Since time.Time // repos created at or after this time (zero = no time floor) 445 445 + ForksOnly bool // only rows with non-empty source 446 446 + NoForks bool // exclude rows with non-empty source 447 447 + } 448 448 + 449 449 + // RecentRepos returns repos matching the filter, sorted newest first. Pass 450 450 + // limit <= 0 for no limit. Uses raw SQL because the scalar star-count 451 451 + // subquery and handle LEFT JOIN are awkward to express via ent's query API. 452 452 + func (s *Store) RecentRepos(ctx context.Context, f ReposFilter, limit int) ([]Repo, error) { 453 453 + candidateLimit := -1 454 454 + if limit > 0 { 455 455 + candidateLimit = limit 456 456 + if f.Language != "" { 457 457 + candidateLimit = limit * 5 458 458 + } 459 459 + } 460 460 + forksOnly := 0 461 461 + if f.ForksOnly { 462 462 + forksOnly = 1 463 463 + } 464 464 + noForks := 0 465 465 + if f.NoForks { 466 466 + noForks = 1 467 467 + } 468 468 + rows, err := s.db.QueryContext(ctx, ` 469 469 + SELECT r.at_uri, r.did, r.rkey, r.name, r.knot, r.description, r.topics, 470 470 + r.website, r.source, r.spindle, r.repo_did, r.created_at, r.seen_at, 471 471 + 472 472 + 473 473 + 474 474 + LEFT JOIN handles h ON h.did = r.did 475 475 + WHERE r.created_at >= ? 476 476 + AND (? = '' OR r.languages IS NOT NULL) 477 477 + AND (? = 0 OR (r.source IS NOT NULL AND r.source != '')) 478 478 + AND (? = 0 OR r.source IS NULL OR r.source = '') 479 479 + ORDER BY r.created_at DESC 480 480 + LIMIT ? 481 481 + `, f.Since.UnixMilli(), f.Language, forksOnly, noForks, candidateLimit) 482 482 + if err != nil { 483 483 + return nil, err 484 484 + } 485 485 + 486 486 + 487 487 + 488 488 + 489 489 + 490 490 + if err != nil { 491 491 + return nil, err 492 492 + } 493 493 + if f.Language != "" && r.Primary() != f.Language { 494 494 + continue 495 495 + } 496 496 + out = append(out, r)

+45 -28

web/server.go

reviewed

··· 27 27 28 28 29 29 30 30 + Language string 31 31 + SinceRaw string // empty = no time filter 32 32 + Threshold time.Time // zero = no time filter 33 33 + Forks string // "" or "only" 34 34 + } 30 35 36 36 + func parseQuery(r *http.Request) query { 37 37 + q := query{ 38 38 + Language: r.URL.Query().Get("language"), 39 39 + SinceRaw: r.URL.Query().Get("since"), 40 40 + Forks: r.URL.Query().Get("forks"), 41 41 + } 42 42 + if q.SinceRaw != "" { 43 43 + if d, err := time.ParseDuration(q.SinceRaw); err == nil { 31 44 32 45 33 46 47 47 + return q 48 48 + } 34 49 50 50 + func (q query) filter() store.ReposFilter { 51 51 + return store.ReposFilter{ 52 52 + Language: q.Language, 53 53 + Since: q.Threshold, 54 54 + ForksOnly: q.Forks == "only", 55 55 + NoForks: q.Forks == "no", 56 56 + } 57 57 + } 35 58 59 59 + func reposJSON(s *store.Store) http.HandlerFunc { 60 60 + return func(w http.ResponseWriter, r *http.Request) { 61 61 + q := parseQuery(r) 62 62 + repos, err := s.RecentRepos(r.Context(), q.filter(), 0) 63 63 + if err != nil { 64 64 + http.Error(w, err.Error(), http.StatusInternalServerError) 65 65 + return 36 66 37 67 38 68 39 69 40 70 41 71 42 42 - 43 43 - 44 44 - 45 45 - 46 46 - 47 47 - 48 48 - 49 49 - 50 50 - 51 51 - 52 52 - 53 53 - 54 54 - 55 55 - 56 56 - 57 57 - 58 58 - 59 59 - 60 60 - 61 61 - 62 62 - 63 63 - 64 64 - 65 65 - 72 72 + func reposHTML(s *store.Store) http.HandlerFunc { 73 73 + return func(w http.ResponseWriter, r *http.Request) { 74 74 + q := parseQuery(r) 75 75 + repos, err := s.RecentRepos(r.Context(), q.filter(), 0) 76 76 + if err != nil { 77 77 + http.Error(w, err.Error(), http.StatusInternalServerError) 78 78 + return 79 79 + } 80 80 + langs, err := s.PrimaryLanguages(r.Context()) 81 81 + if err != nil { 66 82 http.Error(w, err.Error(), http.StatusInternalServerError) 67 83 return 68 84 } 69 85 render(w, "repos", struct { 70 70 - Active string 71 71 - Query query 72 72 - Repos []store.Repo 73 73 - }{"repos", q, repos}) 86 86 + Active string 87 87 + Query query 88 88 + Repos []store.Repo 89 89 + Languages []string 90 90 + }{"repos", q, repos, langs}) 74 91 } 75 92 } 76 93

+33 -1

web/templates/repos.html

reviewed

··· 1 1 {{define "repos"}}{{template "head" .}} 2 2 <form method="get"> 3 3 - <label>language<input name="language" value="{{.Query.Language}}" placeholder="any"></label> 3 3 + <label>language 4 4 + <select name="language"> 5 5 + <option value=""{{if eq .Query.Language ""}} selected{{end}}>any</option> 6 6 + {{range .Languages}} 7 7 + <option value="{{.}}"{{if eq $.Query.Language .}} selected{{end}}>{{.}}</option> 8 8 + {{end}} 9 9 + </select> 10 10 + </label> 4 11 <label>since<input name="since" value="{{.Query.SinceRaw}}" placeholder="e.g. 24h"></label> 12 12 + <label>forks 13 13 + <select name="forks"> 14 14 + <option value=""{{if eq .Query.Forks ""}} selected{{end}}>any</option> 15 15 + <option value="only"{{if eq .Query.Forks "only"}} selected{{end}}>only forks</option> 16 16 + <option value="no"{{if eq .Query.Forks "no"}} selected{{end}}>no forks</option> 17 17 + </select> 18 18 + </label> 5 19 <button>filter</button> 6 20 </form> 21 21 + <p class="summary">{{len .Repos}} repos · <a href="/repos.json?language={{.Query.Language}}&since={{.Query.SinceRaw}}&forks={{.Query.Forks}}">json</a></p> 22 22 + {{if .Repos}} 23 23 + <table> 24 24 + <thead><tr><th>created</th><th>repo</th><th>knot</th><th>language</th><th>★</th><th>description</th></tr></thead> 25 25 + 26 26 + 27 27 + 28 28 + 29 29 + 30 30 + 31 31 + 32 32 + {{- else -}} 33 33 + {{.DID}}/{{.Name}} 34 34 + {{- end -}} 35 35 + {{if .Source}} <span class="fork" title="forked from {{.Source}}">↗</span>{{end}} 36 36 + </td> 37 37 + <td class="knot">{{.Knot}}</td> 38 38 + <td class="lang">{{.Primary}}</td>

+1

web/templates/layout.html

reviewed

··· 22 22 td.handle { font-weight: 600; } 23 23 td.handle a, td.knot a, .link a { color: inherit; text-decoration: none; border-bottom: 1px dotted currentColor; } 24 24 td.handle a:hover, td.knot a:hover, .link a:hover { border-bottom-style: solid; } 25 25 + .fork { color: #888; cursor: help; margin-left: .25em; } 25 26 td.knot, td.did { color: #888; } 26 27 td.lang { color: #6a6; } 27 28 td.num { text-align: right; font-variant-numeric: tabular-nums; color: #888; }