Extensive refactor and clean up

[rbdr/mobius] / hotline / files.go

diff --git a/hotline/files.go b/hotline/files.go
index 9c3efe2e182cc5ff45caa9c1c50e914d5c814f29..bc2f8d523a0be5fb0e161d0a524b81cb3241019c 100644 (file)
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -3,6 +3,8 @@ package hotline
 import (
        "encoding/binary"
        "errors"
+       "fmt"
+       "io"
        "io/fs"
        "os"
        "path/filepath"
@@ -30,10 +32,12 @@ 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 {
-               return fields, nil
+               return fields, fmt.Errorf("error reading path: %s: %w", path, err)
        }
 
        for _, file := range files {
@@ -47,16 +51,17 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
 
                fileInfo, err := file.Info()
                if err != nil {
-                       return fields, err
+                       return fields, fmt.Errorf("error getting file info: %s: %w", file.Name(), err)
                }
 
+               // Check if path is a symlink.  If so, follow it.
                if fileInfo.Mode()&os.ModeSymlink != 0 {
                        resolvedPath, err := os.Readlink(filepath.Join(path, file.Name()))
                        if err != nil {
-                               return fields, err
+                               return fields, fmt.Errorf("error following symlink: %s: %w", resolvedPath, err)
                        }
 
-                       rFile, err := os.Stat(filepath.Join(path, resolvedPath))
+                       rFile, err := os.Stat(resolvedPath)
                        if errors.Is(err, os.ErrNotExist) {
                                continue
                        }
@@ -78,17 +83,17 @@ 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()))
                        if err != nil {
-                               return fields, err
+                               return fields, fmt.Errorf("readDir: %w", err)
                        }
 
                        var c uint32
@@ -99,35 +104,39 @@ 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
                        }
 
                        hlFile, err := newFileWrapper(&OSFileStore{}, path+"/"+file.Name(), 0)
                        if err != nil {
-                               return nil, err
+                               return nil, fmt.Errorf("newFileWrapper: %w", err)
                        }
 
                        copy(fnwi.FileSize[:], hlFile.totalSize())
-                       copy(fnwi.Type[:], hlFile.ffo.FlatFileInformationFork.TypeSignature)
-                       copy(fnwi.Creator[:], hlFile.ffo.FlatFileInformationFork.CreatorSignature)
+                       copy(fnwi.Type[:], hlFile.ffo.FlatFileInformationFork.TypeSignature[:])
+                       copy(fnwi.Creator[:], hlFile.ffo.FlatFileInformationFork.CreatorSignature[:])
                }
 
-               strippedName := strings.Replace(file.Name(), ".incomplete", "", -1)
+               strippedName := strings.ReplaceAll(file.Name(), ".incomplete", "")
+               strippedName, err = txtEncoder.String(strippedName)
+               if err != nil {
+                       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
+                       return nil, fmt.Errorf("error io.ReadAll: %w", err)
                }
                fields = append(fields, NewField(FieldFileNameWithInfo, b))
        }
@@ -160,15 +169,19 @@ func CalcTotalSize(filePath string) ([]byte, error) {
        return bs, nil
 }
 
+// CalcItemCount recurses through a file path and counts the number of non-hidden files.
 func CalcItemCount(filePath string) ([]byte, error) {
-       var itemcount uint16
+       var itemCount uint16
+
+       // Walk the directory and count items
        err := filepath.Walk(filePath, func(path string, info os.FileInfo, err error) error {
                if err != nil {
                        return err
                }
 
+               // Skip hidden files
                if !strings.HasPrefix(info.Name(), ".") {
-                       itemcount += 1
+                       itemCount++
                }
 
                return nil
@@ -178,7 +191,7 @@ func CalcItemCount(filePath string) ([]byte, error) {
        }
 
        bs := make([]byte, 2)
-       binary.BigEndian.PutUint16(bs, itemcount-1)
+       binary.BigEndian.PutUint16(bs, itemCount-1)
 
        return bs, nil
 }