Merge pull request #39 from benabernathy/mobius_38

[rbdr/mobius] / hotline / transfer.go

diff --git a/hotline/transfer.go b/hotline/transfer.go
index 703dae0582b02c9457fa0ef35c802dd53cf77b58..4e6f79f0e3380c4337e6dda59f54a3696a3218b3 100644 (file)
--- a/hotline/transfer.go
+++ b/hotline/transfer.go
@@ -1,6 +1,7 @@
 package hotline
 
 import (
+       "bufio"
        "bytes"
        "encoding/binary"
        "errors"
@@ -28,9 +29,10 @@ 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 {
+       if _, err := io.ReadFull(conn, ffhBuf); err != nil {
                return err
        }
 
@@ -41,7 +43,7 @@ func receiveFile(conn io.Reader, targetFile io.Writer, resForkFile io.Writer) er
        }
 
        ffifhBuf := make([]byte, 16)
-       if _, err := conn.Read(ffifhBuf); err != nil {
+       if _, err := io.ReadFull(conn, ffifhBuf); err != nil {
                return err
        }
 
@@ -55,7 +57,7 @@ func receiveFile(conn io.Reader, targetFile io.Writer, resForkFile io.Writer) er
 
        dataLen := binary.BigEndian.Uint32(ffifh.DataSize[:])
        ffifBuf := make([]byte, dataLen)
-       if _, err := conn.Read(ffifBuf); err != nil {
+       if _, err := io.ReadFull(conn, ffifBuf); err != nil {
                return err
        }
        if err := ffif.UnmarshalBinary(ffifBuf); err != nil {
@@ -64,7 +66,7 @@ func receiveFile(conn io.Reader, targetFile io.Writer, resForkFile io.Writer) er
 
        var ffdfh FlatFileDataForkHeader
        ffdfhBuf := make([]byte, 16)
-       if _, err := conn.Read(ffdfhBuf); err != nil {
+       if _, err := io.ReadFull(conn, ffdfhBuf); err != nil {
                return err
        }
        err = binary.Read(bytes.NewReader(ffdfhBuf), binary.BigEndian, &ffdfh)
@@ -75,30 +77,41 @@ func receiveFile(conn io.Reader, targetFile io.Writer, resForkFile io.Writer) er
        // 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))
+       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 := io.ReadFull(conn, resForkHeader.ForkType[:]); err != nil {
+                       return err
+               }
 
-               if _, err := conn.Read(resForkBuf); err != nil {
+               if _, err := io.ReadFull(conn, resForkHeader.CompressionType[:]); err != nil {
                        return err
                }
-               err = binary.Read(bytes.NewReader(resForkBuf), binary.BigEndian, &resForkHeader)
-               if err != nil {
+
+               if _, err := io.ReadFull(conn, resForkHeader.RSVD[:]); err != nil {
                        return err
                }
 
-               fileSize = int(binary.BigEndian.Uint32(resForkHeader.DataSize[:]))
+               if _, err := io.ReadFull(conn, resForkHeader.DataSize[:]); err != nil {
+                       return err
+               }
 
-               _, err = io.CopyN(resForkFile, conn, int64(fileSize))
+               bw = bufio.NewWriterSize(resForkFile, fileCopyBufSize)
+               _, err = io.CopyN(resForkFile, conn, int64(binary.BigEndian.Uint32(resForkHeader.DataSize[:])))
                if err != nil {
                        return err
                }
+               if err := bw.Flush(); err != nil {
+                       return err
+               }
        }
        return nil
 }