Fix broken io.Reader implementations

[rbdr/mobius] / hotline / transfer.go

diff --git a/hotline/transfer.go b/hotline/transfer.go
index 73331970e33648900b0642de8754a234da933f0f..1257f8a33825285d2501373e4b44f870c21fa416 100644 (file)
--- a/hotline/transfer.go
+++ b/hotline/transfer.go
@@ -1,7 +1,6 @@
 package hotline
 
 import (
-       "bufio"
        "bytes"
        "encoding/binary"
        "errors"
@@ -29,26 +28,19 @@ func (tf *transfer) Write(b []byte) (int, error) {
        return len(b), nil
 }
 
-const fileCopyBufSize = 4096
-
-func receiveFile(r io.Reader, targetFile, resForkFile, infoFork io.Writer) error {
+func receiveFile(r io.Reader, targetFile, resForkFile, infoFork, counterWriter io.Writer) error {
        var ffo flattenedFileObject
        if _, err := ffo.ReadFrom(r); err != nil {
                return err
        }
 
        // Write the information fork
-       _, err := infoFork.Write(ffo.FlatFileInformationFork.MarshalBinary())
+       _, err := io.Copy(infoFork, &ffo.FlatFileInformationFork)
        if err != nil {
                return err
        }
 
-       // read and write the data fork
-       bw := bufio.NewWriterSize(targetFile, fileCopyBufSize)
-       if _, err = io.CopyN(bw, r, ffo.dataSize()); err != nil {
-               return err
-       }
-       if err := bw.Flush(); err != nil {
+       if _, err = io.CopyN(targetFile, io.TeeReader(r, counterWriter), ffo.dataSize()); err != nil {
                return err
        }
 
@@ -57,44 +49,9 @@ func receiveFile(r io.Reader, targetFile, resForkFile, infoFork io.Writer) error
                        return err
                }
 
-               bw = bufio.NewWriterSize(resForkFile, fileCopyBufSize)
-               _, err = io.CopyN(resForkFile, r, ffo.rsrcSize())
-               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
                }
        }
        return nil
 }
-
-func sendFile(w io.Writer, r io.Reader, offset int) (err error) {
-       br := bufio.NewReader(r)
-       if _, err := br.Discard(offset); err != nil {
-               return err
-       }
-
-       rSendBuffer := make([]byte, 1024)
-       for {
-               var bytesRead int
-
-               if bytesRead, err = br.Read(rSendBuffer); err == io.EOF {
-                       if _, err := w.Write(rSendBuffer[:bytesRead]); err != nil {
-                               return err
-                       }
-                       return nil
-               }
-               if err != nil {
-                       return err
-               }
-               // totalSent += int64(bytesRead)
-
-               // fileTransfer.BytesSent += bytesRead
-
-               if _, err := w.Write(rSendBuffer[:bytesRead]); err != nil {
-                       return err
-               }
-       }
-
-}