Refactoring, cleanup, test backfilling

[rbdr/mobius] / hotline / files.go

diff --git a/hotline/files.go b/hotline/files.go
index 901b98cbb01f981b0e1768ce9829f6dd884dca5e..bc2f8d523a0be5fb0e161d0a524b81cb3241019c 100644 (file)
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -40,8 +40,7 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
                return fields, fmt.Errorf("error reading path: %s: %w", path, err)
        }
 
-       for i, _ := range files {
-               file := files[i]
+       for _, file := range files {
                var fnwi FileNameWithInfo
 
                if ignoreFile(file.Name(), ignoreList) {
@@ -119,8 +118,8 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
                        }
 
                        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.ReplaceAll(file.Name(), ".incomplete", "")
@@ -170,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
@@ -188,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
 }