From 7a52525ff474629316a3986f8b7391ca191da52e Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sat, 05 Apr 2025 23:21:58 +0800 Subject: [PATCH] Remove unused types/functions --- git_hooks_handle_other.go | 5 ----- git_misc.go | 131 ----------------------------------------------------- http_handle_repo_index.go | 8 -------- diff --git a/git_hooks_handle_other.go b/git_hooks_handle_other.go index 6fe6d9ef26c06d7f123cc1be3870a5f5acc1ca82..d4a6aead791e5c11b20a9f2849c63385091dd469 100644 --- a/git_hooks_handle_other.go +++ b/git_hooks_handle_other.go @@ -25,11 +25,6 @@ "go.lindenii.runxiyu.org/forge/internal/ansiec" "go.lindenii.runxiyu.org/forge/internal/misc" ) -var ( - errGetFD = errors.New("unable to get file descriptor") - errGetUcred = errors.New("failed getsockopt") -) - // hooksHandler handles a connection from hookc via the // unix socket. func (s *Server) hooksHandler(conn net.Conn) { diff --git a/git_misc.go b/git_misc.go index 37f427b373e51e3a0a2ada673388c0a16f8a15cb..40247f1bc2db1b78128f8e9c5341b9500785d768 100644 --- a/git_misc.go +++ b/git_misc.go @@ -8,8 +8,6 @@ "context" "errors" "io" "iter" - "os" - "strings" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" @@ -65,42 +63,6 @@ repo, err = git.PlainOpen(fsPath) return } -// go-git's tree entries are not friendly for use in HTML templates. -// This struct is a wrapper that is friendlier for use in templating. -type displayTreeEntry struct { - Name string - Mode string - Size uint64 - IsFile bool - IsSubtree bool -} - -// makeDisplayTree takes git trees of form [object.Tree] and creates a slice of -// [displayTreeEntry] for easier templating. -func makeDisplayTree(tree *object.Tree) (displayTree []displayTreeEntry) { - for _, entry := range tree.Entries { - displayEntry := displayTreeEntry{} //exhaustruct:ignore - var err error - var osMode os.FileMode - - if osMode, err = entry.Mode.ToOSFileMode(); err != nil { - displayEntry.Mode = "x---------" - } else { - displayEntry.Mode = osMode.String() - } - - displayEntry.IsFile = entry.Mode.IsFile() - - size, _ := tree.Size(entry.Name) - displayEntry.Size = uint64(size) //#nosec G115 - - displayEntry.Name = strings.TrimPrefix(entry.Name, "/") - - displayTree = append(displayTree, displayEntry) - } - return displayTree -} - // commitIterSeqErr creates an [iter.Seq[*object.Commit]] from an // [object.CommitIter], and additionally returns a pointer to error. // The pointer to error is guaranteed to be populated with either nil or the @@ -123,99 +85,6 @@ return } } }, &err -} - -// getRecentCommits fetches numCommits commits, starting from the headHash in a -// repo. -func getRecentCommits(repo *git.Repository, headHash plumbing.Hash, numCommits int) (recentCommits []*object.Commit, err error) { - var commitIter object.CommitIter - var thisCommit *object.Commit - - commitIter, err = repo.Log(&git.LogOptions{From: headHash}) //exhaustruct:ignore - if err != nil { - return nil, err - } - recentCommits = make([]*object.Commit, 0) - defer commitIter.Close() - if numCommits < 0 { - for { - thisCommit, err = commitIter.Next() - if errors.Is(err, io.EOF) { - return recentCommits, nil - } else if err != nil { - return nil, err - } - recentCommits = append(recentCommits, thisCommit) - } - } else { - for range numCommits { - thisCommit, err = commitIter.Next() - if errors.Is(err, io.EOF) { - return recentCommits, nil - } else if err != nil { - return nil, err - } - recentCommits = append(recentCommits, thisCommit) - } - } - return recentCommits, err -} - -// getRecentCommitsDisplay generates a slice of [commitDisplay] friendly for -// use in HTML templates, consisting of numCommits commits from headhash in the -// repo. -func getRecentCommitsDisplay(repo *git.Repository, headHash plumbing.Hash, numCommits int) (recentCommits []commitDisplayOld, err error) { - var commitIter object.CommitIter - var thisCommit *object.Commit - - commitIter, err = repo.Log(&git.LogOptions{From: headHash}) //exhaustruct:ignore - if err != nil { - return nil, err - } - recentCommits = make([]commitDisplayOld, 0) - defer commitIter.Close() - if numCommits < 0 { - for { - thisCommit, err = commitIter.Next() - if errors.Is(err, io.EOF) { - return recentCommits, nil - } else if err != nil { - return nil, err - } - recentCommits = append(recentCommits, commitDisplayOld{ - thisCommit.Hash, - thisCommit.Author, - thisCommit.Committer, - thisCommit.Message, - thisCommit.TreeHash, - }) - } - } else { - for range numCommits { - thisCommit, err = commitIter.Next() - if errors.Is(err, io.EOF) { - return recentCommits, nil - } else if err != nil { - return nil, err - } - recentCommits = append(recentCommits, commitDisplayOld{ - thisCommit.Hash, - thisCommit.Author, - thisCommit.Committer, - thisCommit.Message, - thisCommit.TreeHash, - }) - } - } - return recentCommits, err -} - -type commitDisplayOld struct { - Hash plumbing.Hash - Author object.Signature - Committer object.Signature - Message string - TreeHash plumbing.Hash } // commitToPatch creates an [object.Patch] from the first parent of a given diff --git a/http_handle_repo_index.go b/http_handle_repo_index.go index 567f329a4422df633f103be75a28484acafd6fb0..bb5d57e7b59223739eead553ad9dd3cadb067a07 100644 --- a/http_handle_repo_index.go +++ b/http_handle_repo_index.go @@ -11,14 +11,6 @@ "go.lindenii.runxiyu.org/forge/internal/render" "go.lindenii.runxiyu.org/forge/internal/web" ) -type commitDisplay struct { - Hash string - Author string - Email string - Date string - Message string -} - // httpHandleRepoIndex provides the front page of a repo using git2d. func (s *Server) httpHandleRepoIndex(w http.ResponseWriter, req *http.Request, params map[string]any) { repoName := params["repo_name"].(string) -- 2.48.1