X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/85767504e4dc622c5ff469733e49c0cebcee57f1..d34160c512a52cf1f5caf59fa00372d3a627e24c:/hotline/transfer.go

diff --git a/hotline/transfer.go b/hotline/transfer.go
index 703dae0..53dd356 100644
--- a/hotline/transfer.go
+++ b/hotline/transfer.go
@@ -4,12 +4,13 @@ import (
 	"bytes"
 	"encoding/binary"
 	"errors"
+	"fmt"
 	"io"
 )
 
 type transfer struct {
 	Protocol        [4]byte // "HTXF" 0x48545846
-	ReferenceNumber [4]byte // Unique ID generated for the transfer
+	ReferenceNumber [4]byte // Unique Type generated for the transfer
 	DataSize        [4]byte // File size
 	RSVD            [4]byte // Not implemented in Hotline Protocol
 }
@@ -28,76 +29,29 @@ func (tf *transfer) Write(b []byte) (int, error) {
 	return len(b), nil
 }
 
-func receiveFile(conn io.Reader, targetFile io.Writer, resForkFile io.Writer) error {
-	ffhBuf := make([]byte, 24)
-	if _, err := conn.Read(ffhBuf); err != nil {
-		return err
+func receiveFile(r io.Reader, targetFile, resForkFile, infoFork, counterWriter io.Writer) error {
+	var ffo flattenedFileObject
+	if _, err := ffo.ReadFrom(r); err != nil {
+		return fmt.Errorf("read flatted file object: %v", err)
 	}
 
-	var ffh FlatFileHeader
-	err := binary.Read(bytes.NewReader(ffhBuf), binary.BigEndian, &ffh)
+	// Write the information fork
+	_, err := io.Copy(infoFork, &ffo.FlatFileInformationFork)
 	if err != nil {
-		return err
+		return fmt.Errorf("write the information fork: %v", err)
 	}
 
-	ffifhBuf := make([]byte, 16)
-	if _, err := conn.Read(ffifhBuf); err != nil {
-		return err
+	if _, err = io.CopyN(targetFile, io.TeeReader(r, counterWriter), ffo.dataSize()); err != nil {
+		return fmt.Errorf("copy file data to partial file: %v", err)
 	}
 
-	var ffifh FlatFileInformationForkHeader
-	err = binary.Read(bytes.NewReader(ffifhBuf), binary.BigEndian, &ffifh)
-	if err != nil {
-		return err
-	}
-
-	var ffif FlatFileInformationFork
-
-	dataLen := binary.BigEndian.Uint32(ffifh.DataSize[:])
-	ffifBuf := make([]byte, dataLen)
-	if _, err := conn.Read(ffifBuf); err != nil {
-		return err
-	}
-	if err := ffif.UnmarshalBinary(ffifBuf); err != nil {
-		return err
-	}
-
-	var ffdfh FlatFileDataForkHeader
-	ffdfhBuf := make([]byte, 16)
-	if _, err := conn.Read(ffdfhBuf); err != nil {
-		return err
-	}
-	err = binary.Read(bytes.NewReader(ffdfhBuf), binary.BigEndian, &ffdfh)
-	if err != nil {
-		return err
-	}
-
-	// this will be zero if the file only has a resource fork
-	fileSize := int(binary.BigEndian.Uint32(ffdfh.DataSize[:]))
-
-	// Copy N bytes from conn to upload file
-	_, err = io.CopyN(targetFile, conn, int64(fileSize))
-	if err != nil {
-		return err
-	}
-
-	if ffh.ForkCount == [2]byte{0, 3} {
-		var resForkHeader FlatFileDataForkHeader
-		resForkBuf := make([]byte, 16)
-
-		if _, err := conn.Read(resForkBuf); err != nil {
-			return err
+	if ffo.FlatFileHeader.ForkCount == [2]byte{0, 3} {
+		if err := binary.Read(r, binary.BigEndian, &ffo.FlatFileResForkHeader); err != nil {
+			return fmt.Errorf("read resource fork header: %v", err)
 		}
-		err = binary.Read(bytes.NewReader(resForkBuf), binary.BigEndian, &resForkHeader)
-		if err != nil {
-			return err
-		}
-
-		fileSize = int(binary.BigEndian.Uint32(resForkHeader.DataSize[:]))
 
-		_, err = io.CopyN(resForkFile, conn, int64(fileSize))
-		if err != nil {
-			return err
+		if _, err = io.CopyN(resForkFile, io.TeeReader(r, counterWriter), ffo.rsrcSize()); err != nil {
+			return fmt.Errorf("read resource fork: %v", err)
 		}
 	}
 	return nil