diff options
author | Laria Carolin Chabowski <laria@laria.me> | 2019-06-27 22:43:01 +0200 |
---|---|---|
committer | Laria Carolin Chabowski <laria@laria.me> | 2019-06-27 22:43:01 +0200 |
commit | 976122914b1eee6f050e2ae25096377efbf0a3da (patch) | |
tree | 71091efa0dfa1d060e5ba74f38f369180dd42d09 /projects/readme.go | |
parent | eb1a9abb1976271d874efd66ea31b04372744ae3 (diff) | |
download | code.laria.me-976122914b1eee6f050e2ae25096377efbf0a3da.tar.gz code.laria.me-976122914b1eee6f050e2ae25096377efbf0a3da.tar.bz2 code.laria.me-976122914b1eee6f050e2ae25096377efbf0a3da.zip |
Replace brittle git2go dependency
Diffstat (limited to 'projects/readme.go')
-rw-r--r-- | projects/readme.go | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/projects/readme.go b/projects/readme.go index c57b831..85fa71f 100644 --- a/projects/readme.go +++ b/projects/readme.go @@ -2,7 +2,7 @@ package projects import ( "bytes" - "github.com/libgit2/git2go" + "code.laria.me/code.laria.me/git" "html" "html/template" "io" @@ -46,39 +46,17 @@ func formatMarkdown(raw []byte) template.HTML { } func gitReadme(gitpath string) (raw []byte, name string, err error) { - repo, err := git.OpenRepository(gitpath) + ents, err := git.ReadTree(gitpath, "master") if err != nil { return raw, name, err } - master_tree_obj, err := repo.RevparseSingle("master:") // Root tree of commit at top of master - if err != nil { - return raw, name, err - } - - master_tree, err := master_tree_obj.AsTree() - if err != nil { - return raw, name, err - } - - var inner_err error = nil - err = master_tree.Walk(func(_ string, entry *git.TreeEntry) int { - if !(strings.HasPrefix(strings.ToLower(entry.Name), "readme") && entry.Type == git.ObjectBlob) { - return 1 - } - - name = entry.Name - blob, err := repo.LookupBlob(entry.Id) - if err == nil { - raw = blob.Contents() - } else { - inner_err = err + for _, ent := range ents { + if ent.Type == "blob" && strings.HasPrefix(strings.ToLower(ent.Name), "readme") { + name = ent.Name + raw, err = git.ReadBlob(gitpath, ent.Object) + return } - return 1 - }) - - if err == nil && inner_err != nil { - err = inner_err } return |