X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/165b7ac9486067e349fc8cc71f1d10851c8db40e..5cc444c89968dda9060d4e2f458b1babb9b603cd:/hotline/transfer.go

diff --git a/hotline/transfer.go b/hotline/transfer.go
index 706dea9..1257f8a 100644
--- a/hotline/transfer.go
+++ b/hotline/transfer.go
@@ -1,7 +1,6 @@
 package hotline
 
 import (
-	"bufio"
 	"bytes"
 	"encoding/binary"
 	"errors"
@@ -29,83 +28,28 @@ func (tf *transfer) Write(b []byte) (int, error) {
 	return len(b), nil
 }
 
-const fileCopyBufSize = 524288 // 512k
-func receiveFile(conn io.Reader, targetFile io.Writer, resForkFile io.Writer) error {
-	ffhBuf := make([]byte, 24)
-	if _, err := conn.Read(ffhBuf); err != nil {
+func receiveFile(r io.Reader, targetFile, resForkFile, infoFork, counterWriter io.Writer) error {
+	var ffo flattenedFileObject
+	if _, err := ffo.ReadFrom(r); err != nil {
 		return 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
 	}
 
-	ffifhBuf := make([]byte, 16)
-	if _, err := conn.Read(ffifhBuf); err != nil {
+	if _, err = io.CopyN(targetFile, io.TeeReader(r, counterWriter), ffo.dataSize()); err != nil {
 		return 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[:]))
-
-	bw := bufio.NewWriterSize(targetFile, fileCopyBufSize)
-	_, err = io.CopyN(bw, conn, int64(fileSize))
-	if err != nil {
-		return err
-	}
-	if err := bw.Flush(); 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
-		}
-		err = binary.Read(bytes.NewReader(resForkBuf), binary.BigEndian, &resForkHeader)
-		if err != nil {
+	if ffo.FlatFileHeader.ForkCount == [2]byte{0, 3} {
+		if err := binary.Read(r, binary.BigEndian, &ffo.FlatFileResForkHeader); err != nil {
 			return err
 		}
 
-		fileSize = int(binary.BigEndian.Uint32(resForkHeader.DataSize[:]))
-
-		bw = bufio.NewWriterSize(resForkFile, fileCopyBufSize)
-		_, err = io.CopyN(resForkFile, conn, int64(fileSize))
-		if err != nil {
-			return err
-		}
-		if err := bw.Flush(); err != nil {
+		if _, err = io.CopyN(resForkFile, io.TeeReader(r, counterWriter), ffo.rsrcSize()); err != nil {
 			return err
 		}
 	}