Implement multi-account edit

[rbdr/mobius] / hotline / transfer.go

diff --git a/hotline/transfer.go b/hotline/transfer.go
index 703dae0582b02c9457fa0ef35c802dd53cf77b58..78bd888ccc35e3b27f168fcdc4ab6e7c20b7f0e1 100644 (file)
--- a/hotline/transfer.go
+++ b/hotline/transfer.go
@@ -1,6 +1,7 @@
 package hotline
 
 import (
 package hotline
 
 import (

+       "bufio"

        "bytes"
        "encoding/binary"
        "errors"
        "bytes"
        "encoding/binary"
        "errors"


@@ -28,6 +29,7 @@ func (tf *transfer) Write(b []byte) (int, error) {
        return len(b), nil
 }
 
        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(conn io.Reader, targetFile io.Writer, resForkFile io.Writer) error {
        ffhBuf := make([]byte, 24)
        if _, err := conn.Read(ffhBuf); err != nil {


@@ -75,17 +77,20 @@ 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[:]))
 
        // 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 != 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 ffh.ForkCount == [2]byte{0, 3} {
                var resForkHeader FlatFileDataForkHeader
                resForkBuf := make([]byte, 16)

-
-               if _, err := conn.Read(resForkBuf); err != nil {
+               resForkBufWrter := bufio.NewWriterSize(resForkFile, 16)
+               if _, err := io.CopyN(resForkBufWrter, conn, 16); err != nil {

                        return err
                }
                err = binary.Read(bytes.NewReader(resForkBuf), binary.BigEndian, &resForkHeader)
                        return err
                }
                err = binary.Read(bytes.NewReader(resForkBuf), binary.BigEndian, &resForkHeader)


@@ -95,10 +100,14 @@ func receiveFile(conn io.Reader, targetFile io.Writer, resForkFile io.Writer) er
 
                fileSize = int(binary.BigEndian.Uint32(resForkHeader.DataSize[:]))
 
 
                fileSize = int(binary.BigEndian.Uint32(resForkHeader.DataSize[:]))
 

+               bw = bufio.NewWriterSize(resForkFile, fileCopyBufSize)

                _, err = io.CopyN(resForkFile, conn, int64(fileSize))
                if err != nil {
                        return err
                }
                _, err = io.CopyN(resForkFile, conn, int64(fileSize))
                if err != nil {
                        return err
                }

+               if err := bw.Flush(); err != nil {
+                       return err
+               }

        }
        return nil
 }
        }
        return nil
 }