object/type, format/packfile: API cleanups

7 files changed, 10 insertions, 18 deletions

diff --git a/object/store/packed/delta_build_chain.go b/object/store/packed/delta_build_chain.go
index 59f83542..a528f705 100644
--- a/object/store/packed/delta_build_chain.go
+++ b/object/store/packed/delta_build_chain.go
@@ -3,7 +3,6 @@ package packed
 import (
 	"fmt"
 
-	packfmt "codeberg.org/lindenii/furgit/format/packfile"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
@@ -26,7 +25,7 @@ func (store *Store) deltaBuildChain(start location) (deltaChain, error) {
 			return deltaChain{}, err
 		}
 
-		if packfmt.IsBaseObjectType(meta.ty) {
+		if meta.ty.IsBaseObject() {
 			chain.baseLoc = current
 			chain.baseType = meta.ty
 
diff --git a/object/store/packed/delta_resolve_chain_start.go b/object/store/packed/delta_resolve_chain_start.go
index 047073cb..ac214576 100644
--- a/object/store/packed/delta_resolve_chain_start.go
+++ b/object/store/packed/delta_resolve_chain_start.go
@@ -3,7 +3,6 @@ package packed
 import (
 	"fmt"
 
-	packfmt "codeberg.org/lindenii/furgit/format/packfile"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
@@ -38,7 +37,7 @@ func (store *Store) deltaResolveChainStart(chain deltaChain) (objecttype.Type, [
 		return objecttype.TypeInvalid, nil, 0, err
 	}
 
-	if !packfmt.IsBaseObjectType(meta.ty) {
+	if !meta.ty.IsBaseObject() {
 		return objecttype.TypeInvalid, nil, 0, fmt.Errorf("objectstore/packed: delta chain base is not a base object")
 	}
 
diff --git a/object/store/packed/delta_resolve_content.go b/object/store/packed/delta_resolve_content.go
index 9a24873b..7b4d5319 100644
--- a/object/store/packed/delta_resolve_content.go
+++ b/object/store/packed/delta_resolve_content.go
@@ -1,9 +1,6 @@
 package packed
 
-import (
-	packfmt "codeberg.org/lindenii/furgit/format/packfile"
-	objecttype "codeberg.org/lindenii/furgit/object/type"
-)
+import objecttype "codeberg.org/lindenii/furgit/object/type"
 
 // deltaResolveContent resolves one object's content bytes from its pack location.
 func (store *Store) deltaResolveContent(start location) (objecttype.Type, []byte, error) {
@@ -18,7 +15,7 @@ func (store *Store) deltaResolveContent(start location) (objecttype.Type, []byte
 	}
 
 	declaredSize := meta.size
-	if !packfmt.IsBaseObjectType(meta.ty) {
+	if !meta.ty.IsBaseObject() {
 		declaredSize, err = deltaDeclaredSizeAt(pack, meta.dataOffset)
 		if err != nil {
 			return objecttype.TypeInvalid, nil, err
diff --git a/object/store/packed/pack.go b/object/store/packed/pack.go
index 5abc6c15..928ced70 100644
--- a/object/store/packed/pack.go
+++ b/object/store/packed/pack.go
@@ -47,7 +47,7 @@ func openPackFile(name string, file *os.File, size int64) (*packFile, error) {
 	}
 
 	version := binary.BigEndian.Uint32(data[4:8])
-	if !packfmt.VersionSupported(version) {
+	if !packfmt.SupportedVersion(version) {
 		_ = syscall.Munmap(data)
 
 		return nil, fmt.Errorf("objectstore/packed: pack %q unsupported version %d", name, version)
diff --git a/object/store/packed/read_header_resolve.go b/object/store/packed/read_header_resolve.go
index f61cd104..849cfbc7 100644
--- a/object/store/packed/read_header_resolve.go
+++ b/object/store/packed/read_header_resolve.go
@@ -3,7 +3,6 @@ package packed
 import (
 	"fmt"
 
-	packfmt "codeberg.org/lindenii/furgit/format/packfile"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
@@ -26,7 +25,7 @@ func (store *Store) resolveHeaderAt(start location) (objecttype.Type, int64, err
 		}
 
 		if declaredSize < 0 {
-			if packfmt.IsBaseObjectType(meta.ty) {
+			if meta.ty.IsBaseObject() {
 				declaredSize = meta.size
 			} else {
 				size, err := deltaDeclaredSizeAt(pack, meta.dataOffset)
@@ -38,7 +37,7 @@ func (store *Store) resolveHeaderAt(start location) (objecttype.Type, int64, err
 			}
 		}
 
-		if packfmt.IsBaseObjectType(meta.ty) {
+		if meta.ty.IsBaseObject() {
 			return meta.ty, declaredSize, nil
 		}
 
diff --git a/object/store/packed/read_reader.go b/object/store/packed/read_reader.go
index 03e70628..8539e0bf 100644
--- a/object/store/packed/read_reader.go
+++ b/object/store/packed/read_reader.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 
-	packfmt "codeberg.org/lindenii/furgit/format/packfile"
 	"codeberg.org/lindenii/furgit/internal/iolimit"
 	objectheader "codeberg.org/lindenii/furgit/object/header"
 	objectid "codeberg.org/lindenii/furgit/object/id"
@@ -30,7 +29,7 @@ func (store *Store) ReadReaderContent(id objectid.ObjectID) (objecttype.Type, in
 		return objecttype.TypeInvalid, 0, nil, err
 	}
 
-	if packfmt.IsBaseObjectType(meta.ty) {
+	if meta.ty.IsBaseObject() {
 		zr, err := zlibReaderAt(pack, meta.dataOffset)
 		if err != nil {
 			return objecttype.TypeInvalid, 0, nil, err
@@ -67,7 +66,7 @@ func (store *Store) ReadReaderFull(id objectid.ObjectID) (io.ReadCloser, error)
 		return nil, err
 	}
 
-	if packfmt.IsBaseObjectType(meta.ty) {
+	if meta.ty.IsBaseObject() {
 		header, ok := objectheader.Encode(meta.ty, meta.size)
 		if !ok {
 			return nil, fmt.Errorf("objectstore/packed: failed to encode object header for type %d", meta.ty)
diff --git a/object/store/packed/read_size.go b/object/store/packed/read_size.go
index 5e744a06..ffec8b13 100644
--- a/object/store/packed/read_size.go
+++ b/object/store/packed/read_size.go
@@ -3,7 +3,6 @@ package packed
 import (
 	"fmt"
 
-	packfmt "codeberg.org/lindenii/furgit/format/packfile"
 	objectid "codeberg.org/lindenii/furgit/object/id"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
@@ -29,7 +28,7 @@ func (store *Store) resolveSizeAt(start location) (int64, error) {
 		return 0, err
 	}
 
-	if packfmt.IsBaseObjectType(meta.ty) {
+	if meta.ty.IsBaseObject() {
 		return meta.size, nil
 	}