Clean up various linter warnings

[rbdr/mobius] / hotline / file_header.go

diff --git a/hotline/file_header.go b/hotline/file_header.go
index 60c652e36eb5cf1be776b192ed5bdc822cc71315..469f321fad59c40479170994f0e1e4ffad2b5571 100644 (file)
--- a/hotline/file_header.go
+++ b/hotline/file_header.go
@@ -2,35 +2,46 @@ package hotline
 
 import (
        "encoding/binary"
 
 import (
        "encoding/binary"

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

 )
 
 type FileHeader struct {
 )
 
 type FileHeader struct {

-       Size     []byte // Total size of FileHeader payload
-       Type     []byte // 0 for file, 1 for dir
-       FilePath []byte // encoded file path
+       Size     [2]byte // Total size of FileHeader payload
+       Type     [2]byte // 0 for file, 1 for dir
+       FilePath []byte  // encoded file path
+
+       readOffset int // Internal offset to track read progress

 }
 
 func NewFileHeader(fileName string, isDir bool) FileHeader {
        fh := FileHeader{
 }
 
 func NewFileHeader(fileName string, isDir bool) FileHeader {
        fh := FileHeader{

-               Size:     make([]byte, 2),
-               Type:     []byte{0x00, 0x00},
+               Type:     [2]byte{0x00, 0x00},

                FilePath: EncodeFilePath(fileName),
        }
        if isDir {
                FilePath: EncodeFilePath(fileName),
        }
        if isDir {

-               fh.Type = []byte{0x00, 0x01}
+               fh.Type = [2]byte{0x00, 0x01}

        }
 
        encodedPathLen := uint16(len(fh.FilePath) + len(fh.Type))
        }
 
        encodedPathLen := uint16(len(fh.FilePath) + len(fh.Type))

-       binary.BigEndian.PutUint16(fh.Size, encodedPathLen)
+       binary.BigEndian.PutUint16(fh.Size[:], encodedPathLen)

 
        return fh
 }
 
 
        return fh
 }
 

-func (fh *FileHeader) Payload() []byte {
-       return concat.Slices(
-               fh.Size,
-               fh.Type,
+func (fh *FileHeader) Read(p []byte) (int, error) {
+       buf := slices.Concat(
+               fh.Size[:],
+               fh.Type[:],

                fh.FilePath,
        )
                fh.FilePath,
        )

+
+       if fh.readOffset >= len(buf) {
+               return 0, io.EOF // All bytes have been read
+       }
+
+       n := copy(p, buf[fh.readOffset:])
+       fh.readOffset += n
+
+       return n, nil

 }
 }