appview,knotmirror: use knotmirror to read the repository #1164

appview/config/config.go

reviewed

This file has not been changed.

appview/pulls/pulls.go

reviewed

This file has not been changed.

appview/repo/archive.go

reviewed

This file has not been changed.

appview/repo/artifact.go

reviewed

This file has not been changed.

appview/repo/branches.go

reviewed

This file has not been changed.

appview/repo/compare.go

reviewed

This file has not been changed.

+1 -1

appview/repo/index.go

reviewed

··· 164 164 xrpcc := &indigoxrpc.Client{Host: rp.config.KnotMirror.Url} 165 165 ls, err := tangled.GitTempListLanguages(ctx, xrpcc, currentRef, repo.RepoAt().String()) 166 166 if err != nil { 167 167 - return nil, fmt.Errorf("calling knotmirror: %w", err) 167 167 + return nil, fmt.Errorf("calling knotmirror git.listLanguages: %w", err) 168 168 } 169 169 170 170 if ls == nil || ls.Languages == nil {

appview/repo/log.go

reviewed

This file has not been changed.

appview/repo/settings.go

reviewed

This file has not been changed.

appview/repo/tags.go

reviewed

This file has not been changed.

appview/repo/tree.go

reviewed

This file has not been changed.

knotmirror/config/config.go

reviewed

This file has not been changed.

knotmirror/knotmirror.go

reviewed

This patch was likely rebased, as context lines do not match.

knotmirror/xrpc/git_getArchive.go

reviewed

This file has not been changed.

knotmirror/xrpc/git_getBlob.go

reviewed

This file has not been changed.

knotmirror/xrpc/git_getBranch.go

reviewed

This file has not been changed.

knotmirror/xrpc/git_getTag.go

reviewed

This file has not been changed.

knotmirror/xrpc/git_getTree.go

reviewed

This file has not been changed.

knotmirror/xrpc/git_listBranches.go

reviewed

This file has not been changed.

knotmirror/xrpc/git_listCommits.go

reviewed

This file has not been changed.

+2 -3

knotmirror/xrpc/git_listLanguages.go

reviewed

··· 29 29 30 30 out, err := x.listLanguages(r.Context(), repo, ref) 31 31 if err != nil { 32 32 - // TODO: better error return 33 32 l.Error("failed to list languages", "err", err) 34 34 - writeJson(w, http.StatusInternalServerError, atclient.ErrorBody{Name: "InternalServerError", Message: "failed to list languages"}) 33 33 + writeErr(w, err) 35 34 return 36 35 } 37 36 ··· 46 45 47 46 gr, err := git.Open(repoPath, ref) 48 47 if err != nil { 49 49 - return nil, fmt.Errorf("opening git repo: %w", err) 48 48 + return nil, &atclient.APIError{StatusCode: http.StatusNotFound, Name: "RepoNotFound", Message: "failed to find git repo"} 50 49 } 51 50 52 51 ctx, cancel := context.WithTimeout(ctx, 1*time.Second)

knotmirror/xrpc/git_listTags.go

reviewed

This file has not been changed.

+25 -16

knotmirror/xrpc/xrpc.go

reviewed

··· 3 3 import ( 4 4 "database/sql" 5 5 "encoding/json" 6 6 + "errors" 6 7 "log/slog" 7 8 "net/http" 8 9 10 10 + "github.com/bluesky-social/indigo/atproto/atclient" 9 11 "github.com/go-chi/chi/v5" 10 12 "tangled.org/core/api/tangled" 11 13 "tangled.org/core/idresolver" 12 14 "tangled.org/core/knotmirror/config" 15 15 + "tangled.org/core/log" 13 16 ) 14 17 15 18 type Xrpc struct { ··· 24 27 cfg, 25 28 db, 26 29 resolver, 27 27 - logger, 30 30 + log.SubLogger(logger, "xrpc"), 28 31 } 29 32 } 30 33 31 34 func (x *Xrpc) Router() http.Handler { 32 35 r := chi.NewRouter() 33 36 34 34 - r.Route("/xrpc", func(r chi.Router) { 35 35 - r.Get("/"+tangled.GitTempGetArchiveNSID, x.GetArchive) 36 36 - r.Get("/"+tangled.GitTempGetBlobNSID, x.GetBlob) 37 37 - r.Get("/"+tangled.GitTempGetBranchNSID, x.GetBranch) 38 38 - // r.Get("/"+tangled.GitTempGetCommitNSID, x.GetCommit) // todo 39 39 - // r.Get("/"+tangled.GitTempGetDiffNSID, x.GetDiff) // todo 40 40 - // r.Get("/"+tangled.GitTempGetEntityNSID, x.GetEntity) // todo 41 41 - // r.Get("/"+tangled.GitTempGetHeadNSID, x.GetHead) // todo 42 42 - r.Get("/"+tangled.GitTempGetTagNSID, x.GetTag) // using types.Response 43 43 - r.Get("/"+tangled.GitTempGetTreeNSID, x.GetTree) 44 44 - r.Get("/"+tangled.GitTempListBranchesNSID, x.ListBranches) // wip, unknown output 45 45 - r.Get("/"+tangled.GitTempListCommitsNSID, x.ListCommits) 46 46 - r.Get("/"+tangled.GitTempListLanguagesNSID, x.ListLanguages) 47 47 - r.Get("/"+tangled.GitTempListTagsNSID, x.ListTags) 48 48 - }) 37 37 + r.Get("/"+tangled.GitTempGetArchiveNSID, x.GetArchive) 38 38 + r.Get("/"+tangled.GitTempGetBlobNSID, x.GetBlob) 39 39 + r.Get("/"+tangled.GitTempGetBranchNSID, x.GetBranch) 40 40 + // r.Get("/"+tangled.GitTempGetCommitNSID, x.GetCommit) // todo 41 41 + // r.Get("/"+tangled.GitTempGetDiffNSID, x.GetDiff) // todo 42 42 + // r.Get("/"+tangled.GitTempGetEntityNSID, x.GetEntity) // todo 43 43 + // r.Get("/"+tangled.GitTempGetHeadNSID, x.GetHead) // todo 44 44 + r.Get("/"+tangled.GitTempGetTagNSID, x.GetTag) // using types.Response 45 45 + r.Get("/"+tangled.GitTempGetTreeNSID, x.GetTree) 46 46 + r.Get("/"+tangled.GitTempListBranchesNSID, x.ListBranches) // wip, unknown output 47 47 + r.Get("/"+tangled.GitTempListCommitsNSID, x.ListCommits) 48 48 + r.Get("/"+tangled.GitTempListLanguagesNSID, x.ListLanguages) 49 49 + r.Get("/"+tangled.GitTempListTagsNSID, x.ListTags) 49 50 50 51 return r 51 52 } ··· 58 59 } 59 60 return nil 60 61 } 62 62 + 63 63 + func writeErr(w http.ResponseWriter, err error) error { 64 64 + var apiErr *atclient.APIError 65 65 + if errors.As(err, &apiErr) { 66 66 + return writeJson(w, apiErr.StatusCode, atclient.ErrorBody{Name: apiErr.Name, Message: apiErr.Message}) 67 67 + } 68 68 + return writeJson(w, http.StatusInternalServerError, atclient.ErrorBody{Name: "InternalServerError", Message: "internal server error"}) 69 69 + }

knotserver/git/git.go

reviewed

This file has not been changed.