Extensive refactor, quality of life enhancements

[rbdr/mobius] / hotline / files.go

diff --git a/hotline/files.go b/hotline/files.go
index f2fc171982a7026ead70b0e059ed4db71beaef64..a1db329b6ebfad16c7a88df914ea006298263835 100644 (file)
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -34,7 +34,7 @@ func fileTypeFromInfo(info fs.FileInfo) (ft fileType, err error) {
 
 const maxFileSize = 4294967296
 
 
 const maxFileSize = 4294967296
 

-func getFileNameList(path string, ignoreList []string) (fields []Field, err error) {
+func GetFileNameList(path string, ignoreList []string) (fields []Field, err error) {

        files, err := os.ReadDir(path)
        if err != nil {
                return fields, fmt.Errorf("error reading path: %s: %w", path, err)
        files, err := os.ReadDir(path)
        if err != nil {
                return fields, fmt.Errorf("error reading path: %s: %w", path, err)


@@ -112,14 +112,14 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
                                continue
                        }
 
                                continue
                        }
 

-                       hlFile, err := newFileWrapper(&OSFileStore{}, path+"/"+file.Name(), 0)
+                       hlFile, err := NewFileWrapper(&OSFileStore{}, path+"/"+file.Name(), 0)

                        if err != nil {
                        if err != nil {

-                               return nil, fmt.Errorf("newFileWrapper: %w", 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.FileSize[:], hlFile.TotalSize())
+                       copy(fnwi.Type[:], hlFile.Ffo.FlatFileInformationFork.TypeSignature[:])
+                       copy(fnwi.Creator[:], hlFile.Ffo.FlatFileInformationFork.CreatorSignature[:])

                }
 
                strippedName := strings.ReplaceAll(file.Name(), ".incomplete", "")
                }
 
                strippedName := strings.ReplaceAll(file.Name(), ".incomplete", "")


@@ -169,15 +169,19 @@ func CalcTotalSize(filePath string) ([]byte, error) {
        return bs, nil
 }
 
        return bs, nil
 }
 

+// CalcItemCount recurses through a file path and counts the number of non-hidden files.

 func CalcItemCount(filePath string) ([]byte, error) {
 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
                }
 
        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(), ".") {
                if !strings.HasPrefix(info.Name(), ".") {

-                       itemcount += 1
+                       itemCount++

                }
 
                return nil
                }
 
                return nil


@@ -187,7 +191,7 @@ func CalcItemCount(filePath string) ([]byte, error) {
        }
 
        bs := make([]byte, 2)
        }
 
        bs := make([]byte, 2)

-       binary.BigEndian.PutUint16(bs, itemcount-1)
+       binary.BigEndian.PutUint16(bs, itemCount-1)

 
        return bs, nil
 }
 
        return bs, nil
 }