Fix io.Reader implementations and wrap more errors

[rbdr/mobius] / hotline / file_header.go

diff --git a/hotline/file_header.go b/hotline/file_header.go
index 71a1c003044199913a553d14f6d41f50429a3521..469f321fad59c40479170994f0e1e4ffad2b5571 100644 (file)
--- a/hotline/file_header.go
+++ b/hotline/file_header.go
@@ -10,6 +10,8 @@ type FileHeader struct {
        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 {
@@ -28,10 +30,18 @@ func NewFileHeader(fileName string, isDir bool) FileHeader {
 }
 
 func (fh *FileHeader) Read(p []byte) (int, error) {
-       return copy(p, slices.Concat(
+       buf := slices.Concat(
                fh.Size[:],
                fh.Type[:],
                fh.FilePath,
-       ),
-       ), io.EOF
+       )
+
+       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
 }