Fix folder upload hang with resource forks

[rbdr/mobius] / hotline / files.go

diff --git a/hotline/files.go b/hotline/files.go
index 69c22b33b9d0728f3ac7e11c70d699fa6aa57a20..4f55eba13f29946a2cec4feed35040271e4276f2 100644 (file)
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -2,84 +2,114 @@ 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"
+const incompleteFileSuffix = ".incomplete"

 
 

-var fileCreatorCodes = map[string]string{
-       "sit": "SIT!",
-       "pdf": "CARO",
-}
+func downcaseFileExtension(filename string) string {
+       splitStr := strings.Split(filename, ".")
+       ext := strings.ToLower(
+               splitStr[len(splitStr)-1],
+       )

 
 

-var fileTypeCodes = map[string]string{
-       "sit": "SIT!",
-       "jpg": "JPEG",
-       "pdf": "PDF ",
+       return ext

 }
 
 }
 

-func fileTypeFromFilename(fn string) string {
-       ext := strings.Split(fn, ".")
-       code := fileTypeCodes[ext[len(ext)-1]]
-
-       if code == "" {
-               code = defaultType
+func fileTypeFromFilename(fn string) fileType {
+       ft, ok := fileTypes[downcaseFileExtension(fn)]
+       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 os.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
-
+func getFileNameList(filePath string) (fields []Field, err error) {

        files, err := ioutil.ReadDir(filePath)
        if err != nil {
                return fields, nil
        }
 
        for _, file := range files {
        files, err := ioutil.ReadDir(filePath)
        if err != nil {
                return fields, nil
        }
 
        for _, file := range files {

-               var fileType string
-               var fileCreator []byte
-               var fileSize uint32
-               if !file.IsDir() {
-                       fileType = fileTypeFromFilename(file.Name())
-                       fileCreator = []byte(fileCreatorFromFilename(file.Name()))
-                       fileSize = uint32(file.Size())
-               } else {
-                       fileType = "fldr"
-                       fileCreator = make([]byte, 4)
+               var fnwi FileNameWithInfo
+
+               fileCreator := make([]byte, 4)
+
+               if file.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
+                               }
+                               binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(len(dir)))
+                               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
                        }
                        dir, err := ioutil.ReadDir(filePath + "/" + file.Name())
                        if err != nil {
                                return fields, err
                        }

-                       fileSize = uint32(len(dir))
+                       binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(len(dir)))
+                       copy(fnwi.Type[:], []byte("fldr")[:])
+                       copy(fnwi.Creator[:], fileCreator[:])
+               } else {
+                       // the Hotline protocol does not support file sizes > 4GiB due to the 4 byte field size, so skip them
+                       if file.Size() > 4294967296 {
+                               continue
+                       }
+                       binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(file.Size()))
+                       copy(fnwi.Type[:], []byte(fileTypeFromFilename(file.Name()).TypeCode)[:])
+                       copy(fnwi.Creator[:], []byte(fileTypeFromFilename(file.Name()).CreatorCode)[:])

                }
 
                }
 

-               fields = append(fields, NewField(
-                       fieldFileNameWithInfo,
-                       FileNameWithInfo{
-                               Type:       fileType,
-                               Creator:    fileCreator,
-                               FileSize:   fileSize,
-                               NameScript: []byte{0, 0},
-                               Name:       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


@@ -149,7 +179,18 @@ func EncodeFilePath(filePath string) []byte {
        return bytes
 }
 
        return bytes
 }
 

-func ReadFilePath(filePathFieldData []byte) string {
-       fp := NewFilePath(filePathFieldData)
-       return fp.String()
+// effectiveFile wraps os.Open to check for the presence of a partial file transfer as a fallback
+func effectiveFile(filePath string) (*os.File, error) {
+       file, err := os.Open(filePath)
+       if err != nil && !errors.Is(err, fs.ErrNotExist) {
+               return nil, err
+       }
+
+       if errors.Is(err, fs.ErrNotExist) {
+               file, err = os.OpenFile(filePath+incompleteFileSuffix, os.O_APPEND|os.O_WRONLY, 0644)
+               if err != nil {
+                       return nil, err
+               }
+       }
+       return file, nil

 }
 }