Fix failing test, replace use of reflect package with assert

[rbdr/mobius] / hotline / transfer.go

diff --git a/hotline/transfer.go b/hotline/transfer.go
index b8bec1dd9122b40540f48ac033c0c026c0e830b6..5cb28c8e60fba1927470860ba22597485c28fe83 100644 (file)
--- a/hotline/transfer.go
+++ b/hotline/transfer.go
@@ -4,47 +4,54 @@ import (
        "bytes"
        "encoding/binary"
        "errors"
        "bytes"
        "encoding/binary"
        "errors"

+       "io"

 )
 
 )
 

-type Transfer struct {
+type transfer struct {

        Protocol        [4]byte // "HTXF" 0x48545846
        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
 }
 
        DataSize        [4]byte // File size
        RSVD            [4]byte // Not implemented in Hotline Protocol
 }
 

-func NewReadTransfer(b []byte) (Transfer, error) {
-       r := bytes.NewReader(b)
-       var transfer Transfer
+var HTXF = [4]byte{0x48, 0x54, 0x58, 0x46} // (HTXF) is the only supported transfer protocol

 
 

-       if err := binary.Read(r, binary.BigEndian, &transfer); err != nil {
-               return transfer, err
+func (tf *transfer) Write(b []byte) (int, error) {
+       if err := binary.Read(bytes.NewReader(b), binary.BigEndian, tf); err != nil {
+               return 0, err

        }
 
        }
 

-       // 0x48545846 (HTXF) is the only supported transfer protocol
-       if transfer.Protocol != [4]byte{0x48, 0x54, 0x58, 0x46} {
-               return transfer, errors.New("invalid protocol")
+       if tf.Protocol != HTXF {
+               return 0, errors.New("invalid protocol")

        }
 
        }
 

-       return transfer, nil
+       return len(b), nil

 }
 
 }
 

-//
-//type FolderTransfer struct {
-//     Protocol        [4]byte // "HTXF" 0x48545846
-//     ReferenceNumber [4]byte // Unique ID generated for the transfer
-//     DataSize        [4]byte // File size
-//     RSVD            [4]byte // Not implemented in Hotline Protocol
-//     Action          [2]byte // Next file action
-//}
-//
-//func ReadFolderTransfer(b []byte) (FolderTransfer, error) {
-//     r := bytes.NewReader(b)
-//     var decodedEvent FolderTransfer
-//
-//     if err := binary.Read(r, binary.BigEndian, &decodedEvent); err != nil {
-//             return decodedEvent, err
-//     }
-//
-//     return decodedEvent, 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
+       }
+
+       // Write the information fork
+       _, err := io.Copy(infoFork, &ffo.FlatFileInformationFork)
+       if err != nil {
+               return err
+       }
+
+       if _, err = io.CopyN(targetFile, io.TeeReader(r, counterWriter), ffo.dataSize()); err != nil {
+               return err
+       }
+
+       if ffo.FlatFileHeader.ForkCount == [2]byte{0, 3} {
+               if err := binary.Read(r, binary.BigEndian, &ffo.FlatFileResForkHeader); err != nil {
+                       return err
+               }
+
+               if _, err = io.CopyN(resForkFile, io.TeeReader(r, counterWriter), ffo.rsrcSize()); err != nil {
+                       return err
+               }
+       }
+       return nil
+}