From ec658d86dda3ac0e9b63635a4144c432223b9fc8 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sun, 29 Mar 2026 09:49:21 +0000 Subject: object: Split files --- object/doc.go | 7 ++++++ object/object.go | 6 ----- object/parse.go | 50 ------------------------------------------ object/parse_with_header.go | 25 +++++++++++++++++++++ object/parse_without_header.go | 32 +++++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 56 deletions(-) create mode 100644 object/doc.go delete mode 100644 object/parse.go create mode 100644 object/parse_with_header.go create mode 100644 object/parse_without_header.go (limited to 'object') diff --git a/object/doc.go b/object/doc.go new file mode 100644 index 00000000..f675b963 --- /dev/null +++ b/object/doc.go @@ -0,0 +1,7 @@ +// Package object provides the shared [Object] interface and parsing functions +// for Git object values. +// +// Concrete object forms such as [blob], [tree], [commit], and [tag] live in +// subpackages. Use [codeberg.org/lindenii/furgit/object/stored] when object +// values need to be paired with the object IDs they were loaded under. +package object diff --git a/object/object.go b/object/object.go index fd996c72..d1b1bc4f 100644 --- a/object/object.go +++ b/object/object.go @@ -1,9 +1,3 @@ -// Package object provides the shared [Object] interface and parsing functions -// for Git object values. -// -// Concrete object forms such as [blob], [tree], [commit], and [tag] live in -// subpackages. Use [codeberg.org/lindenii/furgit/object/stored] when object -// values need to be paired with the object IDs they were loaded under. package object import objecttype "codeberg.org/lindenii/furgit/object/type" diff --git a/object/parse.go b/object/parse.go deleted file mode 100644 index 7cc01a7a..00000000 --- a/object/parse.go +++ /dev/null @@ -1,50 +0,0 @@ -package object - -import ( - "fmt" - - "codeberg.org/lindenii/furgit/object/blob" - "codeberg.org/lindenii/furgit/object/commit" - objectheader "codeberg.org/lindenii/furgit/object/header" - objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/object/tag" - "codeberg.org/lindenii/furgit/object/tree" - objecttype "codeberg.org/lindenii/furgit/object/type" -) - -// ParseObjectWithHeader parses a loose object in "type size\x00body" format. -// -//nolint:ireturn -func ParseObjectWithHeader(raw []byte, algo objectid.Algorithm) (Object, error) { - ty, size, headerLen, ok := objectheader.Parse(raw) - if !ok { - return nil, fmt.Errorf("object: malformed object header") - } - - body := raw[headerLen:] - if int64(len(body)) != size { - return nil, fmt.Errorf("object: size mismatch: header says %d bytes, body has %d", size, len(body)) - } - - return ParseObjectWithoutHeader(ty, body, algo) -} - -// ParseObjectWithoutHeader parses a typed object body. -// -//nolint:ireturn -func ParseObjectWithoutHeader(ty objecttype.Type, body []byte, algo objectid.Algorithm) (Object, error) { - switch ty { - case objecttype.TypeBlob: - return blob.Parse(body) - case objecttype.TypeTree: - return tree.Parse(body, algo) - case objecttype.TypeCommit: - return commit.Parse(body, algo) - case objecttype.TypeTag: - return tag.Parse(body, algo) - case objecttype.TypeInvalid, objecttype.TypeFuture, objecttype.TypeOfsDelta, objecttype.TypeRefDelta: - return nil, fmt.Errorf("object: unsupported object type %d", ty) - default: - return nil, fmt.Errorf("object: unsupported object type %d", ty) - } -} diff --git a/object/parse_with_header.go b/object/parse_with_header.go new file mode 100644 index 00000000..b2ddfff4 --- /dev/null +++ b/object/parse_with_header.go @@ -0,0 +1,25 @@ +package object + +import ( + "fmt" + + objectheader "codeberg.org/lindenii/furgit/object/header" + objectid "codeberg.org/lindenii/furgit/object/id" +) + +// ParseObjectWithHeader parses a loose object in "type size\x00body" format. +// +//nolint:ireturn +func ParseObjectWithHeader(raw []byte, algo objectid.Algorithm) (Object, error) { + ty, size, headerLen, ok := objectheader.Parse(raw) + if !ok { + return nil, fmt.Errorf("object: malformed object header") + } + + body := raw[headerLen:] + if int64(len(body)) != size { + return nil, fmt.Errorf("object: size mismatch: header says %d bytes, body has %d", size, len(body)) + } + + return ParseObjectWithoutHeader(ty, body, algo) +} diff --git a/object/parse_without_header.go b/object/parse_without_header.go new file mode 100644 index 00000000..d8774b9a --- /dev/null +++ b/object/parse_without_header.go @@ -0,0 +1,32 @@ +package object + +import ( + "fmt" + + "codeberg.org/lindenii/furgit/object/blob" + "codeberg.org/lindenii/furgit/object/commit" + objectid "codeberg.org/lindenii/furgit/object/id" + "codeberg.org/lindenii/furgit/object/tag" + "codeberg.org/lindenii/furgit/object/tree" + objecttype "codeberg.org/lindenii/furgit/object/type" +) + +// ParseObjectWithoutHeader parses a typed object body. +// +//nolint:ireturn +func ParseObjectWithoutHeader(ty objecttype.Type, body []byte, algo objectid.Algorithm) (Object, error) { + switch ty { + case objecttype.TypeBlob: + return blob.Parse(body) + case objecttype.TypeTree: + return tree.Parse(body, algo) + case objecttype.TypeCommit: + return commit.Parse(body, algo) + case objecttype.TypeTag: + return tag.Parse(body, algo) + case objecttype.TypeInvalid, objecttype.TypeFuture, objecttype.TypeOfsDelta, objecttype.TypeRefDelta: + return nil, fmt.Errorf("object: unsupported object type %d", ty) + default: + return nil, fmt.Errorf("object: unsupported object type %d", ty) + } +} -- cgit v1.3.1-10-gc9f91