shithub: furgit

Info  •  Files  •  Log  •  Branches

objectheader: Move out of internal

--- a/internal/objectheader/append.go

+++ /dev/null

@@ -1,27 +1,0 @@

-package objectheader

-

-import (

-	"strconv"

-

-	"codeberg.org/lindenii/furgit/objecttype"

-)

-

-// Append appends a canonical loose-object header ("type size\\x00") to dst.

-func Append(dst []byte, ty objecttype.Type, size int64) ([]byte, bool) {

-	if size < 0 {

-		return nil, false

-	}

-	tyName, ok := objecttype.Name(ty)

-	if !ok {

-		return nil, false

-	}

-

-	sizeStr := strconv.FormatInt(size, 10)

-	out := make([]byte, 0, len(dst)+len(tyName)+len(sizeStr)+2)

-	out = append(out, dst...)

-	out = append(out, tyName...)

-	out = append(out, ' ')

-	out = append(out, sizeStr...)

-	out = append(out, 0)

-	return out, true

-}

--- a/internal/objectheader/encode.go

+++ /dev/null

@@ -1,8 +1,0 @@

-package objectheader

-

-import "codeberg.org/lindenii/furgit/objecttype"

-

-// Encode returns a canonical loose-object header ("type size\\x00").

-func Encode(ty objecttype.Type, size int64) ([]byte, bool) {

-	return Append(nil, ty, size)

-}

--- a/internal/objectheader/parse.go

+++ /dev/null

@@ -1,40 +1,0 @@

-package objectheader

-

-import (

-	"bytes"

-	"strconv"

-

-	"codeberg.org/lindenii/furgit/objecttype"

-)

-

-// Parse parses a canonical loose-object header ("type size\\x00").

-// It returns the parsed type, size, bytes consumed (including trailing NUL),

-// and whether parsing succeeded.

-func Parse(data []byte) (objecttype.Type, int64, int, bool) {

-	space := bytes.IndexByte(data, ' ')

-	if space <= 0 {

-		return objecttype.TypeInvalid, 0, 0, false

-	}

-

-	nulRel := bytes.IndexByte(data[space+1:], 0)

-	if nulRel < 0 {

-		return objecttype.TypeInvalid, 0, 0, false

-	}

-	nul := space + 1 + nulRel

-

-	ty, ok := objecttype.ParseName(string(data[:space]))

-	if !ok {

-		return objecttype.TypeInvalid, 0, 0, false

-	}

-

-	sizeBytes := data[space+1 : nul]

-	if len(sizeBytes) == 0 {

-		return objecttype.TypeInvalid, 0, 0, false

-	}

-	size, err := strconv.ParseInt(string(sizeBytes), 10, 64)

-	if err != nil || size < 0 {

-		return objecttype.TypeInvalid, 0, 0, false

-	}

-

-	return ty, size, nul + 1, true

-}

--- a/object/blob_serialize.go

+++ b/object/blob_serialize.go

@@ -3,7 +3,7 @@

 import (

 	"errors"

-	"codeberg.org/lindenii/furgit/internal/objectheader"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

--- a/object/commit_serialize.go

+++ b/object/commit_serialize.go

@@ -5,7 +5,7 @@

 	"errors"

 	"fmt"

-	"codeberg.org/lindenii/furgit/internal/objectheader"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

--- a/object/parse.go

+++ b/object/parse.go

@@ -3,9 +3,9 @@

 import (

 	"fmt"

-	"codeberg.org/lindenii/furgit/internal/objectheader"

-	"codeberg.org/lindenii/furgit/objecttype"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objectid"

+	"codeberg.org/lindenii/furgit/objecttype"

 )

 // ParseObjectWithoutHeader parses a typed object body.

--- a/object/tag_serialize.go

+++ b/object/tag_serialize.go

@@ -5,7 +5,7 @@

 	"errors"

 	"fmt"

-	"codeberg.org/lindenii/furgit/internal/objectheader"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

--- a/object/tree_serialize.go

+++ b/object/tree_serialize.go

@@ -4,7 +4,7 @@

 	"errors"

 	"strconv"

-	"codeberg.org/lindenii/furgit/internal/objectheader"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

--- /dev/null

+++ b/objectheader/append.go

@@ -1,0 +1,27 @@

+package objectheader

+

+import (

+	"strconv"

+

+	"codeberg.org/lindenii/furgit/objecttype"

+)

+

+// Append appends a canonical loose-object header ("type size\\x00") to dst.

+func Append(dst []byte, ty objecttype.Type, size int64) ([]byte, bool) {

+	if size < 0 {

+		return nil, false

+	}

+	tyName, ok := objecttype.Name(ty)

+	if !ok {

+		return nil, false

+	}

+

+	sizeStr := strconv.FormatInt(size, 10)

+	out := make([]byte, 0, len(dst)+len(tyName)+len(sizeStr)+2)

+	out = append(out, dst...)

+	out = append(out, tyName...)

+	out = append(out, ' ')

+	out = append(out, sizeStr...)

+	out = append(out, 0)

+	return out, true

+}

--- /dev/null

+++ b/objectheader/encode.go

@@ -1,0 +1,8 @@

+package objectheader

+

+import "codeberg.org/lindenii/furgit/objecttype"

+

+// Encode returns a canonical loose-object header ("type size\\x00").

+func Encode(ty objecttype.Type, size int64) ([]byte, bool) {

+	return Append(nil, ty, size)

+}

--- /dev/null

+++ b/objectheader/parse.go

@@ -1,0 +1,40 @@

+package objectheader

+

+import (

+	"bytes"

+	"strconv"

+

+	"codeberg.org/lindenii/furgit/objecttype"

+)

+

+// Parse parses a canonical loose-object header ("type size\\x00").

+// It returns the parsed type, size, bytes consumed (including trailing NUL),

+// and whether parsing succeeded.

+func Parse(data []byte) (objecttype.Type, int64, int, bool) {

+	space := bytes.IndexByte(data, ' ')

+	if space <= 0 {

+		return objecttype.TypeInvalid, 0, 0, false

+	}

+

+	nulRel := bytes.IndexByte(data[space+1:], 0)

+	if nulRel < 0 {

+		return objecttype.TypeInvalid, 0, 0, false

+	}

+	nul := space + 1 + nulRel

+

+	ty, ok := objecttype.ParseName(string(data[:space]))

+	if !ok {

+		return objecttype.TypeInvalid, 0, 0, false

+	}

+

+	sizeBytes := data[space+1 : nul]

+	if len(sizeBytes) == 0 {

+		return objecttype.TypeInvalid, 0, 0, false

+	}

+	size, err := strconv.ParseInt(string(sizeBytes), 10, 64)

+	if err != nil || size < 0 {

+		return objecttype.TypeInvalid, 0, 0, false

+	}

+

+	return ty, size, nul + 1, true

+}

-- 

⑨