Refactoring and cleanup

[rbdr/mobius] / hotline / file_name_with_info.go

diff --git a/hotline/file_name_with_info.go b/hotline/file_name_with_info.go
index eecf5ec0552e45523324a832924d12dd99bd95ad..4d59dd038bd8aef6e0aa8d274809d57dc45fcf3d 100644 (file)
--- a/hotline/file_name_with_info.go
+++ b/hotline/file_name_with_info.go
@@ -1,53 +1,53 @@
 package hotline
 
 import (
 package hotline
 
 import (

+       "bytes"

        "encoding/binary"
        "encoding/binary"

-       "github.com/jhalter/mobius/concat"
+       "io"
+       "slices"

 )
 
 )
 

-// FileNameWithInfo field content is presented in this structure:
-// Type        4               Folder (‘fldr’) or other
-// Creator     4
-// File size   4
-// 4           Reserved?
-// Name script 2
-// Name size   2
-// Name data   size

 type FileNameWithInfo struct {
 type FileNameWithInfo struct {

-       Type       []byte // file type code
-       Creator    []byte // File creator code
-       FileSize   []byte // File Size in bytes
-       RSVD       []byte
-       NameScript []byte // TODO: What is this?
-       NameSize   []byte // Length of name field
-       Name       []byte // File name
+       fileNameWithInfoHeader
+       Name []byte // File Name

 }
 
 }
 

-func (f FileNameWithInfo) Payload() []byte {
-       name := f.Name
-       nameSize := make([]byte, 2)
-       binary.BigEndian.PutUint16(nameSize, uint16(len(name)))
+// fileNameWithInfoHeader contains the fixed length fields of FileNameWithInfo
+type fileNameWithInfoHeader struct {
+       Type       [4]byte // File type code
+       Creator    [4]byte // File creator code
+       FileSize   [4]byte // File Size in bytes
+       RSVD       [4]byte
+       NameScript [2]byte // ??
+       NameSize   [2]byte // Length of Name field
+}
+
+func (f *fileNameWithInfoHeader) nameLen() int {
+       return int(binary.BigEndian.Uint16(f.NameSize[:]))
+}

 
 

-       return concat.Slices(
-               f.Type,
-               f.Creator,
-               f.FileSize,
-               []byte{0, 0, 0, 0},
-               f.NameScript,
-               nameSize,
-               f.Name,
-       )
+// Read implements io.Reader for FileNameWithInfo
+func (f *FileNameWithInfo) Read(b []byte) (int, error) {
+       return copy(b,
+               slices.Concat(
+                       f.Type[:],
+                       f.Creator[:],
+                       f.FileSize[:],
+                       f.RSVD[:],
+                       f.NameScript[:],
+                       f.NameSize[:],
+                       f.Name,
+               ),
+       ), io.EOF

 }
 
 }
 

-func (f *FileNameWithInfo) Read(p []byte) (n int, err error) {
-       // TODO: check p for expected len
-       f.Type = p[0:4]
-       f.Creator = p[4:8]
-       f.FileSize = p[8:12]
-       f.RSVD = p[12:16]
-       f.NameScript = p[16:18]
-       f.NameSize = p[18:20]
-       f.Name = p[20:]
+func (f *FileNameWithInfo) Write(p []byte) (int, error) {
+       err := binary.Read(bytes.NewReader(p), binary.BigEndian, &f.fileNameWithInfoHeader)
+       if err != nil {
+               return 0, err
+       }
+       headerLen := binary.Size(f.fileNameWithInfoHeader)
+       f.Name = p[headerLen : headerLen+f.nameLen()]

 
 

-       return len(p), err
+       return len(p), nil

 }
 }