+5 -25

appview/pages/pages.go

reviewed

··· 709 709 } 710 710 711 711 type RepoTreeParams struct { 712 712 - LoggedInUser *oauth.User 713 713 - RepoInfo repoinfo.RepoInfo 714 714 - Active string 715 715 - BreadCrumbs [][]string 716 716 - TreePath string 717 717 - Readme string 718 718 - ReadmeFileName string 719 719 - HTMLReadme template.HTML 720 720 - Raw bool 712 712 + LoggedInUser *oauth.User 713 713 + RepoInfo repoinfo.RepoInfo 714 714 + Active string 715 715 + BreadCrumbs [][]string 716 716 + TreePath string 721 717 types.RepoTreeResponse 722 718 } 723 719 ··· 740 744 741 745 func (p *Pages) RepoTree(w io.Writer, params RepoTreeParams) error { 742 746 params.Active = "overview" 743 743 - 744 744 - if params.ReadmeFileName != "" { 745 745 - params.ReadmeFileName = filepath.Base(params.ReadmeFileName) 746 746 - 747 747 - ext := filepath.Ext(params.ReadmeFileName) 748 748 - switch ext { 749 749 - case ".md", ".markdown", ".mdown", ".mkdn", ".mkd": 750 750 - params.Raw = false 751 751 - htmlString := p.rctx.RenderMarkdown(params.Readme) 752 752 - sanitized := p.rctx.SanitizeDefault(htmlString) 753 753 - params.HTMLReadme = template.HTML(sanitized) 754 754 - default: 755 755 - params.Raw = true 756 756 - } 757 757 - } 758 758 - 759 747 return p.executeRepo("repo/tree", w, params) 760 748 } 761 749

-6

appview/pages/templates/repo/tree.html

reviewed

··· 88 88 </div> 89 89 </main> 90 90 {{end}} 91 91 - 92 92 - {{ define "repoAfter" }} 93 93 - {{- if or .HTMLReadme .Readme -}} 94 94 - {{ template "repo/fragments/readme" . }} 95 95 - {{- end -}} 96 96 - {{ end }}

-24

appview/repo/repo.go

reviewed

··· 449 449 return 450 450 } 451 451 452 452 - // readme content 453 453 - var ( 454 454 - readmeContent string 455 455 - readmeFileName string 456 456 - ) 457 457 - 458 458 - for _, filename := range markup.ReadmeFilenames { 459 459 - path := fmt.Sprintf("%s/%s", treePath, filename) 460 460 - blobResp, err := tangled.RepoBlob(r.Context(), xrpcc, path, false, ref, repo) 461 461 - if err != nil { 462 462 - continue 463 463 - } 464 464 - 465 465 - if blobResp == nil { 466 466 - continue 467 467 - } 468 468 - 469 469 - readmeContent = blobResp.Content 470 470 - readmeFileName = path 471 471 - break 472 472 - } 473 473 - 474 452 // Convert XRPC response to internal types.RepoTreeResponse 475 453 files := make([]types.NiceTree, len(xrpcResp.Files)) 476 454 for i, xrpcFile := range xrpcResp.Files { ··· 510 532 BreadCrumbs: breadcrumbs, 511 533 TreePath: treePath, 512 534 RepoInfo: f.RepoInfo(user), 513 513 - Readme: readmeContent, 514 514 - ReadmeFileName: readmeFileName, 515 535 RepoTreeResponse: result, 516 536 }) 517 537 }