unify repository metadata access
1 file changed, 31 insertions(+), 39 deletions(-)
changed files
M routes/routes.go → routes/routes.go
@@ -43,12 +43,10 @@ return d.NotFound(rc) } pageData := templates.PageData{ - Meta: d.c.Meta, - Name: repoName, - Ref: gr.MainBranch, - Description: gr.Description, - Servername: d.c.Server.Name, - Gomod: gr.Gomod, + Meta: d.c.Meta, + Repo: gr, + Ref: gr.MainBranch, + Servername: d.c.Server.Name, } rc.SetContentType("text/html; charset=utf-8")@@ -76,11 +74,10 @@ rc.SetContentType("text/html; charset=utf-8") pageData := templates.PageData{ - Meta: d.c.Meta, - Name: repoName, - Ref: ref, - Description: gr.Description, - Parent: treePath, + Meta: d.c.Meta, + Repo: gr, + Ref: ref, + Parent: treePath, } return templates.TreePage(pageData, files, gr.ReadmeContent, filepath.Dir(treePath)).Render(rc)@@ -114,12 +111,11 @@ rc.SetContentType("text/html; charset=utf-8") pageData := templates.PageData{ - Meta: d.c.Meta, - Name: repoName, - Ref: ref, - Description: gr.Description, - Path: treePath, - Content: contents, + Meta: d.c.Meta, + Repo: gr, + Ref: ref, + Path: treePath, + Content: contents, } if len(pageData.Content) > 0 {@@ -219,11 +215,10 @@ return err } pageData := templates.PageData{ - Meta: d.c.Meta, - Name: repoName, - Ref: ref, - Description: gr.Description, - Log: true, + Meta: d.c.Meta, + Repo: gr, + Ref: ref, + Log: true, } rc.SetContentType("text/html; charset=utf-8")@@ -246,12 +241,11 @@ return err } pageData := templates.PageData{ - Meta: d.c.Meta, - Name: repoName, - Stat: diff.Stat, - Diff: diff.Diff, - Ref: ref, - Description: gr.Description, + Meta: d.c.Meta, + Repo: gr, + Stat: diff.Stat, + Diff: diff.Diff, + Ref: ref, } rc.SetContentType("text/html; charset=utf-8")@@ -266,23 +260,22 @@ ref := rc.UserValue("ref").(string) filePath := strings.TrimSuffix(rc.UserValue("file").(string), "/") - g, found := d.repos.BySlug[repoName] + gr, found := d.repos.BySlug[repoName] if !found { return d.NotFound(rc) } - diff, err := g.DiffFile(filePath) + diff, err := gr.DiffFile(filePath) if err != nil { return err } pageData := templates.PageData{ - Meta: d.c.Meta, - Name: repoName, - Ref: ref, - Description: g.Description, - Path: filePath, - Diff: diff.Diff, + Meta: d.c.Meta, + Repo: gr, + Ref: ref, + Path: filePath, + Diff: diff.Diff, } rc.SetContentType("text/html; charset=utf-8")@@ -310,9 +303,8 @@ return err } pageData := templates.PageData{ - Meta: d.c.Meta, - Name: repoName, - Description: gr.Description, + Meta: d.c.Meta, + Repo: gr, } rc.SetContentType("text/html; charset=utf-8")