diff options
| author | 2026-03-29 09:49:21 +0000 | |
|---|---|---|
| committer | 2026-03-29 09:49:21 +0000 | |
| commit | ec658d86dda3ac0e9b63635a4144c432223b9fc8 (patch) | |
| tree | 8e97122edc90ed45e73de3e192addd8deadc79b1 | |
| parent | object/stored: Split files and document properly (diff) | |
| signature | No signature | |
object: Split files
| -rw-r--r-- | object/doc.go | 7 | ||||
| -rw-r--r-- | object/object.go | 6 | ||||
| -rw-r--r-- | object/parse_with_header.go | 25 | ||||
| -rw-r--r-- | object/parse_without_header.go (renamed from object/parse.go) | 18 |
4 files changed, 32 insertions, 24 deletions
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_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.go b/object/parse_without_header.go index 7cc01a7a..d8774b9a 100644 --- a/object/parse.go +++ b/object/parse_without_header.go @@ -5,30 +5,12 @@ import ( "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 |
