X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/22c599abc18895f73e96095f35b71cf3357d41b4..c5d9af5aa4d9fb20316be45ab1b775bcf61bcad5:/hotline/flattened_file_object.go

diff --git a/hotline/flattened_file_object.go b/hotline/flattened_file_object.go
index dfdd8a8..656cdd3 100644
--- a/hotline/flattened_file_object.go
+++ b/hotline/flattened_file_object.go
@@ -16,19 +16,19 @@ type flattenedFileObject struct {
 
 // FlatFileHeader is the first section of a "Flattened File Object".  All fields have static values.
 type FlatFileHeader struct {
-	Format    []byte // Always "FILP"
-	Version   []byte // Always 1
-	RSVD      []byte // Always empty zeros
-	ForkCount []byte // Always 2
+	Format    [4]byte  // Always "FILP"
+	Version   [2]byte  // Always 1
+	RSVD      [16]byte // Always empty zeros
+	ForkCount [2]byte  // Always 2
 }
 
 // NewFlatFileHeader returns a FlatFileHeader struct
 func NewFlatFileHeader() FlatFileHeader {
 	return FlatFileHeader{
-		Format:    []byte("FILP"),
-		Version:   []byte{0, 1},
-		RSVD:      make([]byte, 16),
-		ForkCount: []byte{0, 2},
+		Format:    [4]byte{0x46, 0x49, 0x4c, 0x50}, // FILP
+		Version:   [2]byte{0, 1},
+		RSVD:      [16]byte{},
+		ForkCount: [2]byte{0, 2},
 	}
 }
 
@@ -87,7 +87,7 @@ func (ffif FlatFileInformationFork) DataSize() []byte {
 }
 
 func (ffo flattenedFileObject) TransferSize() []byte {
-	payloadSize := len(ffo.Payload())
+	payloadSize := len(ffo.BinaryMarshal())
 	dataSize := binary.BigEndian.Uint32(ffo.FlatFileDataForkHeader.DataSize)
 
 	transferSize := make([]byte, 4)
@@ -110,15 +110,6 @@ type FlatFileDataForkHeader struct {
 	DataSize        []byte
 }
 
-func NewFlatFileDataForkHeader() FlatFileDataForkHeader {
-	return FlatFileDataForkHeader{
-		ForkType:        []byte("DATA"),
-		CompressionType: []byte{0, 0, 0, 0},
-		RSVD:            []byte{0, 0, 0, 0},
-		//	DataSize:        []byte{0, 0, 0x03, 0xc3},
-	}
-}
-
 // ReadFlattenedFileObject parses a byte slice into a flattenedFileObject
 func ReadFlattenedFileObject(bytes []byte) flattenedFileObject {
 	nameSize := bytes[110:112]
@@ -138,12 +129,7 @@ func ReadFlattenedFileObject(bytes []byte) flattenedFileObject {
 	//dataSize := binary.BigEndian.Uint32(dataSizeField)
 
 	ffo := flattenedFileObject{
-		FlatFileHeader: FlatFileHeader{
-			Format:    bytes[0:4],
-			Version:   bytes[4:6],
-			RSVD:      bytes[6:22],
-			ForkCount: bytes[22:24],
-		},
+		FlatFileHeader: NewFlatFileHeader(),
 		FlatFileInformationForkHeader: FlatFileInformationForkHeader{
 			ForkType:        bytes[24:28],
 			CompressionType: bytes[28:32],
@@ -176,12 +162,12 @@ func ReadFlattenedFileObject(bytes []byte) flattenedFileObject {
 	return ffo
 }
 
-func (f flattenedFileObject) Payload() []byte {
+func (f flattenedFileObject) BinaryMarshal() []byte {
 	var out []byte
-	out = append(out, f.FlatFileHeader.Format...)
-	out = append(out, f.FlatFileHeader.Version...)
-	out = append(out, f.FlatFileHeader.RSVD...)
-	out = append(out, f.FlatFileHeader.ForkCount...)
+	out = append(out, f.FlatFileHeader.Format[:]...)
+	out = append(out, f.FlatFileHeader.Version[:]...)
+	out = append(out, f.FlatFileHeader.RSVD[:]...)
+	out = append(out, f.FlatFileHeader.ForkCount[:]...)
 
 	out = append(out, []byte("INFO")...)
 	out = append(out, []byte{0, 0, 0, 0}...)
@@ -211,22 +197,22 @@ func (f flattenedFileObject) Payload() []byte {
 	return out
 }
 
-func NewFlattenedFileObject(filePath string, fileName string) (flattenedFileObject, error) {
+func NewFlattenedFileObject(filePath, fileName string) (*flattenedFileObject, error) {
 	file, err := os.Open(fmt.Sprintf("%v/%v", filePath, fileName))
 	if err != nil {
-		return flattenedFileObject{}, err
+		return nil, err
 	}
 	defer file.Close()
 
 	fileInfo, err := file.Stat()
 	if err != nil {
-		return flattenedFileObject{}, err
+		return nil, err
 	}
 
 	dataSize := make([]byte, 4)
 	binary.BigEndian.PutUint32(dataSize, uint32(fileInfo.Size()))
 
-	return flattenedFileObject{
+	return &flattenedFileObject{
 		FlatFileHeader:          NewFlatFileHeader(),
 		FlatFileInformationFork: NewFlatFileInformationFork(fileName),
 		FlatFileDataForkHeader: FlatFileDataForkHeader{