forked from tangled.org/core
Monorepo for Tangled

appview/pages: revert: show readme files in tree listings

Signed-off-by: oppiliappan <me@oppi.li>

oppi.li 9c76503e b3303e84

verified
Changed files
+5 -55
appview
pages
templates
repo
repo
+5 -25
appview/pages/pages.go
··· 709 709 } 710 710 711 711 type RepoTreeParams struct { 712 - LoggedInUser *oauth.User 713 - RepoInfo repoinfo.RepoInfo 714 - Active string 715 - BreadCrumbs [][]string 716 - TreePath string 717 - Readme string 718 - ReadmeFileName string 719 - HTMLReadme template.HTML 720 - Raw bool 712 + LoggedInUser *oauth.User 713 + RepoInfo repoinfo.RepoInfo 714 + Active string 715 + BreadCrumbs [][]string 716 + TreePath string 721 717 types.RepoTreeResponse 722 718 } 723 719 ··· 744 740 745 741 func (p *Pages) RepoTree(w io.Writer, params RepoTreeParams) error { 746 742 params.Active = "overview" 747 - 748 - if params.ReadmeFileName != "" { 749 - params.ReadmeFileName = filepath.Base(params.ReadmeFileName) 750 - 751 - ext := filepath.Ext(params.ReadmeFileName) 752 - switch ext { 753 - case ".md", ".markdown", ".mdown", ".mkdn", ".mkd": 754 - params.Raw = false 755 - htmlString := p.rctx.RenderMarkdown(params.Readme) 756 - sanitized := p.rctx.SanitizeDefault(htmlString) 757 - params.HTMLReadme = template.HTML(sanitized) 758 - default: 759 - params.Raw = true 760 - } 761 - } 762 - 763 743 return p.executeRepo("repo/tree", w, params) 764 744 } 765 745
-6
appview/pages/templates/repo/tree.html
··· 88 88 </div> 89 89 </main> 90 90 {{end}} 91 - 92 - {{ define "repoAfter" }} 93 - {{- if or .HTMLReadme .Readme -}} 94 - {{ template "repo/fragments/readme" . }} 95 - {{- end -}} 96 - {{ end }}
-24
appview/repo/repo.go
··· 449 449 return 450 450 } 451 451 452 - // readme content 453 - var ( 454 - readmeContent string 455 - readmeFileName string 456 - ) 457 - 458 - for _, filename := range markup.ReadmeFilenames { 459 - path := fmt.Sprintf("%s/%s", treePath, filename) 460 - blobResp, err := tangled.RepoBlob(r.Context(), xrpcc, path, false, ref, repo) 461 - if err != nil { 462 - continue 463 - } 464 - 465 - if blobResp == nil { 466 - continue 467 - } 468 - 469 - readmeContent = blobResp.Content 470 - readmeFileName = path 471 - break 472 - } 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 { ··· 532 510 BreadCrumbs: breadcrumbs, 533 511 TreePath: treePath, 534 512 RepoInfo: f.RepoInfo(user), 535 - Readme: readmeContent, 536 - ReadmeFileName: readmeFileName, 537 513 RepoTreeResponse: result, 538 514 }) 539 515 }