Fix failing tests

[rbdr/mobius] / hotline / files.go

diff --git a/hotline/files.go b/hotline/files.go
index 1db698baa45a9e74b76e50495e2a651bb86148a5..dc196536d8b7abfc870c07f96ecb0dbc2a48eef5 100644 (file)
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -2,84 +2,135 @@ package hotline
 
 import (
        "encoding/binary"
 
 import (
        "encoding/binary"

+       "errors"
+       "io/fs"

        "io/ioutil"
        "os"
        "path/filepath"
        "strings"
 )
 
        "io/ioutil"
        "os"
        "path/filepath"
        "strings"
 )
 

-const defaultCreator = "TTXT"
-const defaultType = "TEXT"
-
-var fileCreatorCodes = map[string]string{
-       "sit": "SIT!",
-       "pdf": "CARO",
-}
-
-var fileTypeCodes = map[string]string{
-       "sit": "SIT!",
-       "jpg": "JPEG",
-       "pdf": "PDF ",
-}
-
-func fileTypeFromFilename(fn string) string {
-       ext := strings.Split(fn, ".")
-       code := fileTypeCodes[ext[len(ext)-1]]
-
-       if code == "" {
-               code = defaultType
+func fileTypeFromFilename(filename string) fileType {
+       fileExt := strings.ToLower(filepath.Ext(filename))
+       ft, ok := fileTypes[fileExt]
+       if ok {
+               return ft

        }
        }

-
-       return code
+       return defaultFileType

 }
 
 }
 

-func fileCreatorFromFilename(fn string) string {
-       ext := strings.Split(fn, ".")
-       code := fileCreatorCodes[ext[len(ext)-1]]
-       if code == "" {
-               code = defaultCreator
+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 code
+       return ft, nil

 }
 
 }
 

-func getFileNameList(filePath string) ([]Field, error) {
-       var fields []Field
-
-       files, err := ioutil.ReadDir(filePath)
+func getFileNameList(path string) (fields []Field, err error) {
+       files, err := os.ReadDir(path)

        if err != nil {
                return fields, nil
        }
 
        for _, file := range files {
        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)
                fileCreator := make([]byte, 4)

-               fileSize := make([]byte, 4)
-               if !file.IsDir() {
-                       fileType = []byte(fileTypeFromFilename(file.Name()))
-                       fileCreator = []byte(fileCreatorFromFilename(file.Name()))

 
 

-                       binary.BigEndian.PutUint32(fileSize, uint32(file.Size()))
-               } 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.Join(path, file.Name()))
+                       if err != nil {
+                               return fields, err
+                       }
+
+                       rFile, err := os.Stat(filepath.Join(path, resolvedPath))
+                       if errors.Is(err, os.ErrNotExist) {
+                               continue
+                       }
+                       if err != nil {
+                               return fields, err
+                       }
+
+                       if rFile.IsDir() {
+                               dir, err := ioutil.ReadDir(filepath.Join(path, 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)[:])
+                       }

 
 

-                       dir, err := ioutil.ReadDir(filePath + "/" + file.Name())
+               } else if file.IsDir() {
+                       dir, err := ioutil.ReadDir(filepath.Join(path, file.Name()))

                        if err != nil {
                                return fields, err
                        }
                        if err != nil {
                                return fields, err
                        }

-                       binary.BigEndian.PutUint32(fileSize, uint32(len(dir)))
+
+                       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{}, path+"/"+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[:])

                }
 
                }
 

-               fields = append(fields, NewField(
-                       fieldFileNameWithInfo,
-                       FileNameWithInfo{
-                               Type:       fileType,
-                               Creator:    fileCreator,
-                               FileSize:   fileSize,
-                               NameScript: []byte{0, 0},
-                               Name:       []byte(file.Name()),
-                       }.Payload(),
-               ))
+               strippedName := strings.Replace(file.Name(), ".incomplete", "", -1)
+
+               nameSize := make([]byte, 2)
+               binary.BigEndian.PutUint16(nameSize, uint16(len(strippedName)))
+               copy(fnwi.NameSize[:], nameSize[:])
+
+               fnwi.name = []byte(strippedName)
+
+               b, err := fnwi.MarshalBinary()
+               if err != nil {
+                       return nil, err
+               }
+               fields = append(fields, NewField(fieldFileNameWithInfo, b))

        }
 
        return fields, nil
        }
 
        return fields, nil


@@ -113,12 +164,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 {
 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 err != nil {
                        return err
                }
 

+               if !strings.HasPrefix(info.Name(), ".") {
+                       itemcount += 1
+               }
+

                return nil
        })
        if err != nil {
                return nil
        })
        if err != nil {


@@ -148,8 +201,3 @@ func EncodeFilePath(filePath string) []byte {
 
        return bytes
 }
 
        return bytes
 }

-
-func ReadFilePath(filePathFieldData []byte) string {
-       fp := NewFilePath(filePathFieldData)
-       return fp.String()
-}