Commit 3700715

Eric Bower  ·  2023-08-05 23:40:43 -0400 EDT
parent e51bb05 
looking good
6 files changed,  +141, -77
M go.mod
M go.sum
M html/commit.page.tmpl
M html/index.page.tmpl
M html/tree.page.tmpl
M main.go
M go.mod
+1, -0
......@@ -4,6 +4,7 @@ go 1.18
44
55 require (
66 github.com/gogs/git-module v1.6.0
7+ github.com/mergestat/timediff v0.0.3
78 github.com/picosh/pico v1.1.6
89 github.com/spf13/viper v1.12.0
910 )
M go.sum
+2, -0
......@@ -213,6 +213,8 @@ github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
213213 github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
214214 github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75 h1:Pijfgr7ZuvX7QIQiEwLdRVr3RoMG+i0SbBO1Qu+7yVk=
215215 github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75/go.mod h1:76rfSfYPWj01Z85hUf/ituArm797mNKcvINh1OlsZKo=
216+github.com/mergestat/timediff v0.0.3 h1:ucCNh4/ZrTPjFZ081PccNbhx9spymCJkFxSzgVuPU+Y=
217+github.com/mergestat/timediff v0.0.3/go.mod h1:yvMUaRu2oetc+9IbPLYBJviz6sA7xz8OXMDfhBl7YSI=
216218 github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg=
217219 github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=
218220 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
M html/commit.page.tmpl
+11, -11
......@@ -5,17 +5,17 @@
55 {{template "header" .}}
66
77 <dl>
8- <dt>commit</dt>
9- <dd><a href="{{.Data.CommitURL}}">{{.Data.Commit.ID}}</a></dd>
8+ <dt>commit</dt>
9+ <dd><a href="{{.Data.CommitURL}}">{{.Data.CommitID}}</a></dd>
1010
11- <dt>parent</dt>
12- <dd><a href="{{.Data.ParentURL}}">{{.Data.Parent}}</a></dd>
11+ <dt>parent</dt>
12+ <dd><a href="{{.Data.ParentURL}}">{{.Data.Parent}}</a></dd>
1313
14- <dt>author</dt>
15- <dd>{{.Data.Commit.Author.Name}}</dd>
14+ <dt>author</dt>
15+ <dd>{{.Data.Commit.Author.Name}}</dd>
1616
17- <dt>date</dt>
18- <dd>{{.Data.Commit.Author.When}}</dd>
17+ <dt>date</dt>
18+ <dd>{{.Data.Commit.Author.When}}</dd>
1919 </dl>
2020
2121 <pre>{{.Data.Commit.Message}}</pre>
......@@ -31,15 +31,15 @@
3131 {{range .Data.Diff.Files}}
3232 <div>
3333 <span>{{.FileType}}</span>
34- <span>{{.Name}}</span>
34+ <a href="#diff-{{.Name}}">{{.Name}}</a>
3535 </div>
3636 {{end}}
3737 </div>
3838 </div>
3939
4040 {{range .Data.Diff.Files}}
41- <div class="flex justify-between mono">
42- <span>{{.FileType}} {{.OldName}} => {{.Name}}</span>
41+ <div id="diff-{{.Name}}" class="flex justify-between mono">
42+ <span>{{.FileType}} {{if eq .FileType "R"}}{{.OldName}} => {{end}}{{.Name}}</span>
4343 <div>
4444 <span class="color-green">+{{.NumAdditions}}</span>,
4545 <span class="color-red">-{{.NumDeletions}}</span>
M html/index.page.tmpl
+13, -6
......@@ -3,10 +3,17 @@
33 {{define "title"}}index{{end}}
44
55 {{define "content"}}
6- <h1>repos</h1>
7- {{range .RepoList}}
8- <div>
9- <a href="{{.URL}}">{{.Name}}</a>
10- </div>
11- {{end}}
6+ <h1 class="text-xl">repos</h1>
7+ <div>
8+ {{range .RepoList}}
9+ <div class="my box">
10+ <div class="flex justify-between items-center">
11+ <div><a class="text-lg" href="{{.URL}}">{{.Name}}</a></div>
12+ <div class="text-sm">{{.LastCommit.Author.When}}</div>
13+ </div>
14+
15+ <div class="my">{{.Desc}}</div>
16+ </div>
17+ {{end}}
18+ </div>
1219 {{end}}
M html/tree.page.tmpl
+20, -12
......@@ -5,16 +5,24 @@
55 {{define "content"}}
66 {{template "header" .}}
77
8- <div>
9- {{range .Data.Tree}}
10- <div class="flex justify-between mt">
11- <div class="text-md">
12- <a href="{{.URL}}">{{.Path}}</a>
13- </div>
14- <div class="mono">
15- <span>lines: {{.NumLines}}</span>
16- </div>
17- </div>
18- {{end}}
19- </div>
8+ <table>
9+ <tbody>
10+ {{range .Data.Tree}}
11+ <tr>
12+ <td>
13+ <a href="{{.URL}}">{{.Path}}</a>
14+ </td>
15+ <td>
16+ <a href="{{.CommitURL}}">{{.Desc}}</a>
17+ </td>
18+ <td>
19+ {{.When}}
20+ </td>
21+ <td class="mono font-bold">
22+ L{{.NumLines}}
23+ </td>
24+ </tr>
25+ {{end}}
26+ </tbody>
27+ </table>
2028 {{end}}
M main.go
+94, -48
......@@ -6,9 +6,11 @@ import (
66 html "html/template"
77 "os"
88 "path/filepath"
9+ "sort"
910 "strings"
1011
1112 git "github.com/gogs/git-module"
13+ "github.com/mergestat/timediff"
1214 "github.com/picosh/pico/pastes"
1315 "github.com/spf13/viper"
1416 )
......@@ -16,8 +18,10 @@ import (
1618 var defaultBranches = []string{"main", "master"}
1719
1820 type RepoItemData struct {
19- URL string
20- Name string
21+ URL string
22+ Name string
23+ Desc string
24+ LastCommit *git.Commit
2125 }
2226
2327 type IndexPage struct {
......@@ -32,6 +36,7 @@ type RepoData struct {
3236 LogURL string
3337 RefsURL string
3438 CloneURL string
39+ MaxCommits int
3540 }
3641
3742 type CommitData struct {
......@@ -44,6 +49,9 @@ type TreeItem struct {
4449 URL string
4550 Path string
4651 Entry *git.TreeEntry
52+ CommitURL string
53+ Desc string
54+ When string
4755 }
4856
4957 type PageData struct {
......@@ -59,6 +67,7 @@ type PageData struct {
5967
6068 type CommitPageData struct {
6169 CommitMsg template.HTML
70+ CommitID string
6271 Commit *CommitData
6372 Diff *DiffRender
6473 Repo *RepoData
......@@ -114,7 +123,7 @@ func bail(err error) {
114123 }
115124 }
116125
117-func CommitURL(repo string, commitID string) string {
126+func commitURL(repo string, commitID string) string {
118127 return fmt.Sprintf("/%s/commits/%s.html", repo, commitID)
119128 }
120129
......@@ -283,14 +292,15 @@ func writeHTMLTreeFiles(data *PageData) string {
283292 return readme
284293 }
285294
286-func writeLogDiffs(project string, repo *git.Repository, data *PageData, cache map[string]bool) {
287- for _, commit := range data.Log {
295+func (c *Config) writeLogDiffs(repo *git.Repository, pageData *PageData) {
296+ project := pageData.Repo.Name
297+ for _, commit := range pageData.Log {
288298 commitID := commit.ID.String()
289299
290- if cache[commitID] {
300+ if c.Cache[commitID] {
291301 continue
292302 } else {
293- cache[commitID] = true
303+ c.Cache[commitID] = true
294304 }
295305
296306 ancestors, err := commit.Ancestors()
......@@ -302,7 +312,7 @@ func writeLogDiffs(project string, repo *git.Repository, data *PageData, cache m
302312 pt := ancestors[0]
303313 parent = &CommitData{
304314 Commit: pt,
305- URL: CommitURL(project, pt.ID.String()),
315+ URL: commitURL(project, pt.ID.String()),
306316 }
307317 }
308318 parentID := parent.ID.String()
......@@ -347,30 +357,30 @@ func writeLogDiffs(project string, repo *git.Repository, data *PageData, cache m
347357
348358 commitData := &CommitPageData{
349359 Commit: commit,
360+ CommitID: commit.ID.String()[:7],
350361 Diff: rnd,
351- Repo: data.Repo,
352- Parent: parentID,
353- CommitURL: CommitURL(project, commitID),
354- ParentURL: CommitURL(project, parentID),
362+ Repo: pageData.Repo,
363+ Parent: parentID[:7],
364+ CommitURL: commitURL(project, commitID),
365+ ParentURL: commitURL(project, parentID),
355366 }
356367
357368 writeHtml(&WriteData{
358369 Name: fmt.Sprintf("%s.html", commitID),
359370 Template: "./html/commit.page.tmpl",
360371 Data: commitData,
361- RepoName: data.Repo.Name,
372+ RepoName: pageData.Repo.Name,
362373 Subdir: "commits",
363- Repo: data.Repo,
374+ Repo: pageData.Repo,
364375 })
365376 }
366377 }
367378
368-func writeRepo(config *RepoConfig) {
379+func (c *Config) writeRepo(config *RepoConfig) *BranchOutput {
369380 repo, err := git.Open(config.Path)
370381 bail(err)
371382
372383 name := repoName(config.Path)
373- desc := config.Desc
374384
375385 heads, err := repo.ShowRef(git.ShowRefOptions{Heads: true, Tags: false})
376386 bail(err)
......@@ -383,19 +393,19 @@ func writeRepo(config *RepoConfig) {
383393
384394 repoData := &RepoData{
385395 Name: name,
386- Desc: desc,
396+ Desc: config.Desc,
397+ MaxCommits: config.MaxCommits,
387398 SummaryURL: fmt.Sprintf("/%s/index.html", name),
388399 TreeURL: fmt.Sprintf("/%s/tree/%s/index.html", name, revName),
389400 LogURL: fmt.Sprintf("/%s/logs/%s/index.html", name, revName),
390401 RefsURL: fmt.Sprintf("/%s/refs.html", name),
391- CloneURL: fmt.Sprintf("/%s.git", name),
402+ CloneURL: fmt.Sprintf("https://%s/%s.git", c.URL, name),
392403 }
393404
394405 tags, _ := repo.ShowRef(git.ShowRefOptions{Heads: false, Tags: true})
395406
396- cache := make(map[string]bool)
397-
398- readme := ""
407+ var mainOutput *BranchOutput
408+ claimed := false
399409 for _, revn := range config.Refs {
400410 for _, head := range heads {
401411 _, headName := filepath.Split(head.Refspec)
......@@ -410,9 +420,10 @@ func writeRepo(config *RepoConfig) {
410420 Repo: repoData,
411421 }
412422
413- branchReadme := writeBranch(repo, data, cache)
414- if readme == "" {
415- readme = branchReadme
423+ branchOutput := c.writeBranch(repo, data)
424+ if !claimed {
425+ mainOutput = branchOutput
426+ claimed = true
416427 }
417428 }
418429 }
......@@ -423,20 +434,36 @@ func writeRepo(config *RepoConfig) {
423434 Rev: rev,
424435 RevName: revName,
425436 Repo: repoData,
426- Readme: template.HTML(readme),
437+ Readme: template.HTML(mainOutput.Readme),
427438 }
428439 writeRefs(data)
429440 writeRootSummary(data)
441+ return mainOutput
442+}
443+
444+type BranchOutput struct {
445+ Readme string
446+ LastCommit *git.Commit
430447 }
431448
432-func writeBranch(repo *git.Repository, pageData *PageData, cache map[string]bool) string {
433- commits, err := repo.CommitsByPage(pageData.Rev.ID, 0, 100)
449+func (c *Config) writeBranch(repo *git.Repository, pageData *PageData) *BranchOutput {
450+ output := &BranchOutput{}
451+ pageSize := pageData.Repo.MaxCommits
452+ if pageSize == 0 {
453+ pageSize = 5000
454+ }
455+
456+ commits, err := repo.CommitsByPage(pageData.Rev.ID, 0, pageSize)
434457 bail(err)
435458
436459 logs := []*CommitData{}
437- for _, commit := range commits {
460+ for i, commit := range commits {
461+ if i == 0 {
462+ output.LastCommit = commit
463+ }
464+
438465 logs = append(logs, &CommitData{
439- URL: CommitURL(pageData.Repo.Name, commit.ID.String()),
466+ URL: commitURL(pageData.Repo.Name, commit.ID.String()),
440467 Commit: commit,
441468 })
442469 }
......@@ -447,6 +474,19 @@ func writeBranch(repo *git.Repository, pageData *PageData, cache map[string]bool
447474 treeEntries := walkTree(tree, pageData.RevName, "", entries)
448475 for _, entry := range treeEntries {
449476 entry.Path = strings.TrimPrefix(entry.Path, "/")
477+
478+ lastCommits, err := repo.RevList([]string{pageData.Rev.Refspec}, git.RevListOptions{
479+ Path: entry.Path,
480+ })
481+ bail(err)
482+
483+ var lc *git.Commit
484+ if (len(lastCommits) > 0) {
485+ lc = lastCommits[0]
486+ }
487+ entry.CommitURL = commitURL(pageData.Repo.Name, lc.ID.String())
488+ entry.Desc = lc.Summary()
489+ entry.When = timediff.TimeDiff(lc.Author.When)
450490 entry.URL = filepath.Join(
451491 "/",
452492 pageData.Repo.Name,
......@@ -462,25 +502,24 @@ func writeBranch(repo *git.Repository, pageData *PageData, cache map[string]bool
462502
463503 writeLog(pageData)
464504 readme := writeHTMLTreeFiles(pageData)
465- writeLogDiffs(pageData.Repo.Name, repo, pageData, cache)
505+ c.writeLogDiffs(repo, pageData)
466506
467- for _, def := range defaultBranches {
468- if def == pageData.RevName {
469- writeTree(pageData)
470- }
471- }
507+ writeTree(pageData)
472508
473- return readme
509+ output.Readme = readme
510+ return output
474511 }
475512
476513 type RepoConfig struct {
477- Path string `mapstructure:"path"`
478- Refs []string `mapstructure:"refs"`
479- Desc string `mapstructure:"desc"`
514+ Path string `mapstructure:"path"`
515+ Refs []string `mapstructure:"refs"`
516+ Desc string `mapstructure:"desc"`
517+ MaxCommits int `mapstructure:"max_commits"`
480518 }
481519 type Config struct {
482520 Repos []*RepoConfig `mapstructure:"repos"`
483521 URL string `mapstructure:"url"`
522+ Cache map[string]bool
484523 }
485524
486525 func main() {
......@@ -492,23 +531,30 @@ func main() {
492531 bail(err)
493532
494533 var config Config
495- if err := viper.Unmarshal(&config); err != nil {
496- fmt.Println(err)
497- return
498- }
534+ err = viper.Unmarshal(&config)
535+ bail(err)
536+
537+ config.Cache = make(map[string]bool)
538+
499539 repoList := []*RepoItemData{}
500540 for _, r := range config.Repos {
541+ mainOutput := config.writeRepo(r)
501542 name := repoName(r.Path)
502543 url := filepath.Join("/", name, "index.html")
503544 repoList = append(repoList, &RepoItemData{
504- URL: url,
505- Name: name,
545+ URL: url,
546+ Name: name,
547+ Desc: r.Desc,
548+ LastCommit: mainOutput.LastCommit,
506549 })
507550 }
551+ sort.Slice(repoList, func(i, j int) bool {
552+ first := repoList[i].LastCommit.Author.When
553+ second := repoList[j].LastCommit.Author.When
554+ return first.After(second)
555+ })
556+
508557 writeIndex(&IndexPage{
509558 RepoList: repoList,
510559 })
511- for _, r := range config.Repos {
512- writeRepo(r)
513- }
514560 }