From 7daf45b862b8f53ecabc969615437994edb49fe8 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sun, 6 Apr 2025 08:35:58 +0800 Subject: git2c, git2d: Rename cmd1 and cmd2 descriptively --- git2d/cmd1.c | 2 +- git2d/cmd2.c | 2 +- git2d/session.c | 4 +- git2d/x.h | 4 +- internal/git2c/cmd1.go | 63 -------------------- internal/git2c/cmd2.go | 92 ----------------------------- internal/git2c/cmd_index.go | 63 ++++++++++++++++++++ internal/git2c/cmd_treeraw.go | 92 +++++++++++++++++++++++++++++ internal/unsorted/http_handle_repo_index.go | 2 +- internal/unsorted/http_handle_repo_raw.go | 2 +- internal/unsorted/http_handle_repo_tree.go | 2 +- 11 files changed, 164 insertions(+), 164 deletions(-) delete mode 100644 internal/git2c/cmd1.go delete mode 100644 internal/git2c/cmd2.go create mode 100644 internal/git2c/cmd_index.go create mode 100644 internal/git2c/cmd_treeraw.go diff --git a/git2d/cmd1.c b/git2d/cmd1.c index d84d270..5d1988d 100644 --- a/git2d/cmd1.c +++ b/git2d/cmd1.c @@ -6,7 +6,7 @@ #include "x.h" int -cmd1(git_repository *repo, struct bare_writer *writer) +cmd_index(git_repository *repo, struct bare_writer *writer) { /* HEAD tree */ git_object *obj = NULL; diff --git a/git2d/cmd2.c b/git2d/cmd2.c index 6edacf2..7201a82 100644 --- a/git2d/cmd2.c +++ b/git2d/cmd2.c @@ -6,7 +6,7 @@ #include "x.h" int -cmd2(git_repository *repo, struct bare_reader *reader, struct bare_writer *writer) +cmd_treeraw(git_repository *repo, struct bare_reader *reader, struct bare_writer *writer) { /* Path */ char path[4096] = {0}; diff --git a/git2d/session.c b/git2d/session.c index 5efd218..23131ea 100644 --- a/git2d/session.c +++ b/git2d/session.c @@ -48,12 +48,12 @@ session(void *_conn) } switch (cmd) { case 1: - err = cmd1(repo, &writer); + err = cmd_index(repo, &writer); if (err != 0) goto free_repo; break; case 2: - err = cmd2(repo, &reader, &writer); + err = cmd_treeraw(repo, &reader, &writer); if (err != 0) goto free_repo; break; diff --git a/git2d/x.h b/git2d/x.h index 5a9b32a..96ade20 100644 --- a/git2d/x.h +++ b/git2d/x.h @@ -32,7 +32,7 @@ bare_error conn_write(void *buffer, const void *src, uint64_t sz); void * session(void *_conn); -int cmd1(git_repository *repo, struct bare_writer *writer); -int cmd2(git_repository *repo, struct bare_reader *reader, struct bare_writer *writer); +int cmd_index(git_repository *repo, struct bare_writer *writer); +int cmd_treeraw(git_repository *repo, struct bare_reader *reader, struct bare_writer *writer); #endif // X_H diff --git a/internal/git2c/cmd1.go b/internal/git2c/cmd1.go deleted file mode 100644 index 68493a2..0000000 --- a/internal/git2c/cmd1.go +++ /dev/null @@ -1,63 +0,0 @@ -// SPDX-License-Identifier: AGPL-3.0-only -// SPDX-FileCopyrightText: Copyright (c) 2025 Runxi Yu - -package git2c - -import ( - "encoding/hex" - "errors" - "fmt" - "io" -) - -func (c *Client) Cmd1(repoPath string) ([]Commit, *FilenameContents, error) { - if err := c.writer.WriteData([]byte(repoPath)); err != nil { - return nil, nil, fmt.Errorf("sending repo path failed: %w", err) - } - if err := c.writer.WriteUint(1); err != nil { - return nil, nil, fmt.Errorf("sending command failed: %w", err) - } - - status, err := c.reader.ReadUint() - if err != nil { - return nil, nil, fmt.Errorf("reading status failed: %w", err) - } - if status != 0 { - return nil, nil, fmt.Errorf("git2d error: %d", status) - } - - // README - readmeRaw, err := c.reader.ReadData() - if err != nil { - readmeRaw = nil - } - - readmeFilename := "README.md" // TODO - readme := &FilenameContents{Filename: readmeFilename, Content: readmeRaw} - - // Commits - var commits []Commit - for { - id, err := c.reader.ReadData() - if err != nil { - if errors.Is(err, io.EOF) { - break - } - return nil, nil, fmt.Errorf("reading commit ID failed: %w", err) - } - title, _ := c.reader.ReadData() - authorName, _ := c.reader.ReadData() - authorEmail, _ := c.reader.ReadData() - authorDate, _ := c.reader.ReadData() - - commits = append(commits, Commit{ - Hash: hex.EncodeToString(id), - Author: string(authorName), - Email: string(authorEmail), - Date: string(authorDate), - Message: string(title), - }) - } - - return commits, readme, nil -} diff --git a/internal/git2c/cmd2.go b/internal/git2c/cmd2.go deleted file mode 100644 index 3bff332..0000000 --- a/internal/git2c/cmd2.go +++ /dev/null @@ -1,92 +0,0 @@ -// SPDX-License-Identifier: AGPL-3.0-only -// SPDX-FileCopyrightText: Copyright (c) 2025 Runxi Yu - -package git2c - -import ( - "errors" - "fmt" - "io" -) - -func (c *Client) Cmd2(repoPath, pathSpec string) ([]TreeEntry, string, error) { - if err := c.writer.WriteData([]byte(repoPath)); err != nil { - return nil, "", fmt.Errorf("sending repo path failed: %w", err) - } - if err := c.writer.WriteUint(2); err != nil { - return nil, "", fmt.Errorf("sending command failed: %w", err) - } - if err := c.writer.WriteData([]byte(pathSpec)); err != nil { - return nil, "", fmt.Errorf("sending path failed: %w", err) - } - - status, err := c.reader.ReadUint() - if err != nil { - return nil, "", fmt.Errorf("reading status failed: %w", err) - } - - switch status { - case 0: - kind, err := c.reader.ReadUint() - if err != nil { - return nil, "", fmt.Errorf("reading object kind failed: %w", err) - } - - switch kind { - case 1: - // Tree - count, err := c.reader.ReadUint() - if err != nil { - return nil, "", fmt.Errorf("reading entry count failed: %w", err) - } - - var files []TreeEntry - for range count { - typeCode, err := c.reader.ReadUint() - if err != nil { - return nil, "", fmt.Errorf("error reading entry type: %w", err) - } - mode, err := c.reader.ReadUint() - if err != nil { - return nil, "", fmt.Errorf("error reading entry mode: %w", err) - } - size, err := c.reader.ReadUint() - if err != nil { - return nil, "", fmt.Errorf("error reading entry size: %w", err) - } - name, err := c.reader.ReadData() - if err != nil { - return nil, "", fmt.Errorf("error reading entry name: %w", err) - } - - files = append(files, TreeEntry{ - Name: string(name), - Mode: fmt.Sprintf("%06o", mode), - Size: size, - IsFile: typeCode == 2, - IsSubtree: typeCode == 1, - }) - } - - return files, "", nil - - case 2: - // Blob - content, err := c.reader.ReadData() - if err != nil && !errors.Is(err, io.EOF) { - return nil, "", fmt.Errorf("error reading file content: %w", err) - } - - return nil, string(content), nil - - default: - return nil, "", fmt.Errorf("unknown kind: %d", kind) - } - - case 3: - return nil, "", fmt.Errorf("path not found: %s", pathSpec) - - default: - return nil, "", fmt.Errorf("unknown status code: %d", status) - } -} diff --git a/internal/git2c/cmd_index.go b/internal/git2c/cmd_index.go new file mode 100644 index 0000000..a705a63 --- /dev/null +++ b/internal/git2c/cmd_index.go @@ -0,0 +1,63 @@ +// SPDX-License-Identifier: AGPL-3.0-only +// SPDX-FileCopyrightText: Copyright (c) 2025 Runxi Yu + +package git2c + +import ( + "encoding/hex" + "errors" + "fmt" + "io" +) + +func (c *Client) CmdIndex(repoPath string) ([]Commit, *FilenameContents, error) { + if err := c.writer.WriteData([]byte(repoPath)); err != nil { + return nil, nil, fmt.Errorf("sending repo path failed: %w", err) + } + if err := c.writer.WriteUint(1); err != nil { + return nil, nil, fmt.Errorf("sending command failed: %w", err) + } + + status, err := c.reader.ReadUint() + if err != nil { + return nil, nil, fmt.Errorf("reading status failed: %w", err) + } + if status != 0 { + return nil, nil, fmt.Errorf("git2d error: %d", status) + } + + // README + readmeRaw, err := c.reader.ReadData() + if err != nil { + readmeRaw = nil + } + + readmeFilename := "README.md" // TODO + readme := &FilenameContents{Filename: readmeFilename, Content: readmeRaw} + + // Commits + var commits []Commit + for { + id, err := c.reader.ReadData() + if err != nil { + if errors.Is(err, io.EOF) { + break + } + return nil, nil, fmt.Errorf("reading commit ID failed: %w", err) + } + title, _ := c.reader.ReadData() + authorName, _ := c.reader.ReadData() + authorEmail, _ := c.reader.ReadData() + authorDate, _ := c.reader.ReadData() + + commits = append(commits, Commit{ + Hash: hex.EncodeToString(id), + Author: string(authorName), + Email: string(authorEmail), + Date: string(authorDate), + Message: string(title), + }) + } + + return commits, readme, nil +} diff --git a/internal/git2c/cmd_treeraw.go b/internal/git2c/cmd_treeraw.go new file mode 100644 index 0000000..c93480a --- /dev/null +++ b/internal/git2c/cmd_treeraw.go @@ -0,0 +1,92 @@ +// SPDX-License-Identifier: AGPL-3.0-only +// SPDX-FileCopyrightText: Copyright (c) 2025 Runxi Yu + +package git2c + +import ( + "errors" + "fmt" + "io" +) + +func (c *Client) CmdTreeRaw(repoPath, pathSpec string) ([]TreeEntry, string, error) { + if err := c.writer.WriteData([]byte(repoPath)); err != nil { + return nil, "", fmt.Errorf("sending repo path failed: %w", err) + } + if err := c.writer.WriteUint(2); err != nil { + return nil, "", fmt.Errorf("sending command failed: %w", err) + } + if err := c.writer.WriteData([]byte(pathSpec)); err != nil { + return nil, "", fmt.Errorf("sending path failed: %w", err) + } + + status, err := c.reader.ReadUint() + if err != nil { + return nil, "", fmt.Errorf("reading status failed: %w", err) + } + + switch status { + case 0: + kind, err := c.reader.ReadUint() + if err != nil { + return nil, "", fmt.Errorf("reading object kind failed: %w", err) + } + + switch kind { + case 1: + // Tree + count, err := c.reader.ReadUint() + if err != nil { + return nil, "", fmt.Errorf("reading entry count failed: %w", err) + } + + var files []TreeEntry + for range count { + typeCode, err := c.reader.ReadUint() + if err != nil { + return nil, "", fmt.Errorf("error reading entry type: %w", err) + } + mode, err := c.reader.ReadUint() + if err != nil { + return nil, "", fmt.Errorf("error reading entry mode: %w", err) + } + size, err := c.reader.ReadUint() + if err != nil { + return nil, "", fmt.Errorf("error reading entry size: %w", err) + } + name, err := c.reader.ReadData() + if err != nil { + return nil, "", fmt.Errorf("error reading entry name: %w", err) + } + + files = append(files, TreeEntry{ + Name: string(name), + Mode: fmt.Sprintf("%06o", mode), + Size: size, + IsFile: typeCode == 2, + IsSubtree: typeCode == 1, + }) + } + + return files, "", nil + + case 2: + // Blob + content, err := c.reader.ReadData() + if err != nil && !errors.Is(err, io.EOF) { + return nil, "", fmt.Errorf("error reading file content: %w", err) + } + + return nil, string(content), nil + + default: + return nil, "", fmt.Errorf("unknown kind: %d", kind) + } + + case 3: + return nil, "", fmt.Errorf("path not found: %s", pathSpec) + + default: + return nil, "", fmt.Errorf("unknown status code: %d", status) + } +} diff --git a/internal/unsorted/http_handle_repo_index.go b/internal/unsorted/http_handle_repo_index.go index f2bb480..03eed77 100644 --- a/internal/unsorted/http_handle_repo_index.go +++ b/internal/unsorted/http_handle_repo_index.go @@ -25,7 +25,7 @@ func (s *Server) httpHandleRepoIndex(w http.ResponseWriter, req *http.Request, p } defer client.Close() - commits, readme, err := client.Cmd1(repoPath) + commits, readme, err := client.CmdIndex(repoPath) if err != nil { web.ErrorPage500(s.templates, w, params, err.Error()) return diff --git a/internal/unsorted/http_handle_repo_raw.go b/internal/unsorted/http_handle_repo_raw.go index 7849d48..3d999e5 100644 --- a/internal/unsorted/http_handle_repo_raw.go +++ b/internal/unsorted/http_handle_repo_raw.go @@ -32,7 +32,7 @@ func (s *Server) httpHandleRepoRaw(writer http.ResponseWriter, request *http.Req } defer client.Close() - files, content, err := client.Cmd2(repoPath, pathSpec) + files, content, err := client.CmdTreeRaw(repoPath, pathSpec) if err != nil { web.ErrorPage500(s.templates, writer, params, err.Error()) return diff --git a/internal/unsorted/http_handle_repo_tree.go b/internal/unsorted/http_handle_repo_tree.go index cbbba98..96920f6 100644 --- a/internal/unsorted/http_handle_repo_tree.go +++ b/internal/unsorted/http_handle_repo_tree.go @@ -33,7 +33,7 @@ func (s *Server) httpHandleRepoTree(writer http.ResponseWriter, request *http.Re } defer client.Close() - files, content, err := client.Cmd2(repoPath, pathSpec) + files, content, err := client.CmdTreeRaw(repoPath, pathSpec) if err != nil { web.ErrorPage500(s.templates, writer, params, err.Error()) return -- cgit v1.2.3