Add initial support for resource and info forks

[rbdr/mobius] / hotline / files.go

diff --git a/hotline/files.go b/hotline/files.go
index 19375e9a831a83cfea1baad80d64b78a9a30ade3..b66580fcfef1d5e119823ce842406c2935f54e82 100644 (file)
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -2,6 +2,8 @@ package hotline
 
 import (
        "encoding/binary"
+       "errors"
+       "io/fs"
        "io/ioutil"
        "os"
        "path/filepath"
@@ -25,40 +27,112 @@ func fileTypeFromFilename(fn string) fileType {
        return defaultFileType
 }
 
+func fileTypeFromInfo(info fs.FileInfo) (ft fileType, err error) {
+       if info.IsDir() {
+               ft.CreatorCode = "n/a "
+               ft.TypeCode = "fldr"
+       } else {
+               ft = fileTypeFromFilename(info.Name())
+       }
+
+       return ft, nil
+}
+
 func getFileNameList(filePath string) (fields []Field, err error) {
-       files, err := ioutil.ReadDir(filePath)
+       files, err := os.ReadDir(filePath)
        if err != nil {
                return fields, nil
        }
 
        for _, file := range files {
-               var fileType []byte
                var fnwi FileNameWithInfo
+
+               if strings.HasPrefix(file.Name(), ".") {
+                       continue
+               }
+
                fileCreator := make([]byte, 4)
-               if !file.IsDir() {
-                       fileType = []byte(fileTypeFromFilename(file.Name()).TypeCode)
-                       fileCreator = []byte(fileTypeFromFilename(file.Name()).CreatorCode)
 
-                       binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(file.Size()))
-                       copy(fnwi.Type[:], fileType[:])
-                       copy(fnwi.Creator[:], fileCreator[:])
-               } else {
-                       fileType = []byte("fldr")
+               fileInfo, err := file.Info()
+               if err != nil {
+                       return fields, err
+               }
 
+               if fileInfo.Mode()&os.ModeSymlink != 0 {
+                       resolvedPath, err := os.Readlink(filePath + "/" + file.Name())
+                       if err != nil {
+                               return fields, err
+                       }
+
+                       rFile, err := os.Stat(filePath + "/" + resolvedPath)
+                       if errors.Is(err, os.ErrNotExist) {
+                               continue
+                       }
+                       if err != nil {
+                               return fields, err
+                       }
+
+                       if rFile.IsDir() {
+                               dir, err := ioutil.ReadDir(filePath + "/" + file.Name())
+                               if err != nil {
+                                       return fields, err
+                               }
+
+                               var c uint32
+                               for _, f := range dir {
+                                       if !strings.HasPrefix(f.Name(), ".") {
+                                               c += 1
+                                       }
+                               }
+
+                               binary.BigEndian.PutUint32(fnwi.FileSize[:], c)
+                               copy(fnwi.Type[:], []byte("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)[:])
+                       }
+
+               } else if file.IsDir() {
                        dir, err := ioutil.ReadDir(filePath + "/" + file.Name())
                        if err != nil {
                                return fields, err
                        }
-                       binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(len(dir)))
-                       copy(fnwi.Type[:], fileType[:])
+
+                       var c uint32
+                       for _, f := range dir {
+                               if !strings.HasPrefix(f.Name(), ".") {
+                                       c += 1
+                               }
+                       }
+
+                       binary.BigEndian.PutUint32(fnwi.FileSize[:], c)
+                       copy(fnwi.Type[:], []byte("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 {
+                               continue
+                       }
+
+                       hlFile, err := newFileWrapper(&OSFileStore{}, filePath+"/"+file.Name(), 0)
+                       if err != nil {
+                               return nil, err
+                       }
+
+                       copy(fnwi.FileSize[:], hlFile.totalSize()[:])
+                       copy(fnwi.Type[:], hlFile.ffo.FlatFileInformationFork.TypeSignature[:])
+                       copy(fnwi.Creator[:], hlFile.ffo.FlatFileInformationFork.CreatorSignature[:])
                }
 
+               strippedName := strings.Replace(file.Name(), ".incomplete", "", -1)
+
                nameSize := make([]byte, 2)
-               binary.BigEndian.PutUint16(nameSize, uint16(len(file.Name())))
+               binary.BigEndian.PutUint16(nameSize, uint16(len(strippedName)))
                copy(fnwi.NameSize[:], nameSize[:])
 
-               fnwi.name = []byte(file.Name())
+               fnwi.name = []byte(strippedName)
 
                b, err := fnwi.MarshalBinary()
                if err != nil {
@@ -98,12 +172,14 @@ func CalcTotalSize(filePath string) ([]byte, error) {
 func CalcItemCount(filePath string) ([]byte, error) {
        var itemcount uint16
        err := filepath.Walk(filePath, func(path string, info os.FileInfo, err error) error {
-               itemcount += 1
-
                if err != nil {
                        return err
                }
 
+               if !strings.HasPrefix(info.Name(), ".") {
+                       itemcount += 1
+               }
+
                return nil
        })
        if err != nil {