Fix broken io.Reader implementations

[rbdr/mobius] / hotline / files.go

diff --git a/hotline/files.go b/hotline/files.go
index 8d35a948da63caaa7ac5ef960b8def13eaf8cdb6..0963fbfd73e50f70c7365f24c737bb07eb249fd9 100644 (file)
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -3,6 +3,7 @@ package hotline
 import (
        "encoding/binary"
        "errors"
+       "io"
        "io/fs"
        "os"
        "path/filepath"
@@ -30,6 +31,8 @@ func fileTypeFromInfo(info fs.FileInfo) (ft fileType, err error) {
        return ft, nil
 }
 
+const maxFileSize = 4294967296
+
 func getFileNameList(path string, ignoreList []string) (fields []Field, err error) {
        files, err := os.ReadDir(path)
        if err != nil {
@@ -79,12 +82,12 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
                                }
 
                                binary.BigEndian.PutUint32(fnwi.FileSize[:], c)
-                               copy(fnwi.Type[:], []byte("fldr"))
+                               copy(fnwi.Type[:], "fldr")
                                copy(fnwi.Creator[:], fileCreator)
                        } else {
                                binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(rFile.Size()))
-                               copy(fnwi.Type[:], []byte(fileTypeFromFilename(rFile.Name()).TypeCode))
-                               copy(fnwi.Creator[:], []byte(fileTypeFromFilename(rFile.Name()).CreatorCode))
+                               copy(fnwi.Type[:], fileTypeFromFilename(rFile.Name()).TypeCode)
+                               copy(fnwi.Creator[:], fileTypeFromFilename(rFile.Name()).CreatorCode)
                        }
                } else if file.IsDir() {
                        dir, err := os.ReadDir(filepath.Join(path, file.Name()))
@@ -100,11 +103,11 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
                        }
 
                        binary.BigEndian.PutUint32(fnwi.FileSize[:], c)
-                       copy(fnwi.Type[:], []byte("fldr"))
+                       copy(fnwi.Type[:], "fldr")
                        copy(fnwi.Creator[:], fileCreator)
                } else {
-                       // the Hotline protocol does not support fileWrapper sizes > 4GiB due to the 4 byte field size, so skip them
-                       if fileInfo.Size() > 4294967296 {
+                       // the Hotline protocol does not support file sizes > 4GiB due to the 4 byte field size, so skip them
+                       if fileInfo.Size() > maxFileSize {
                                continue
                        }
 
@@ -121,16 +124,16 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
                strippedName := strings.ReplaceAll(file.Name(), ".incomplete", "")
                strippedName, err = txtEncoder.String(strippedName)
                if err != nil {
-                       return nil, err
+                       continue
                }
 
                nameSize := make([]byte, 2)
                binary.BigEndian.PutUint16(nameSize, uint16(len(strippedName)))
                copy(fnwi.NameSize[:], nameSize)
 
-               fnwi.name = []byte(strippedName)
+               fnwi.Name = []byte(strippedName)
 
-               b, err := fnwi.MarshalBinary()
+               b, err := io.ReadAll(&fnwi)
                if err != nil {
                        return nil, err
                }