Merge pull request #42 from jhalter/implement_user_ban

[rbdr/mobius] / hotline / files.go

diff --git a/hotline/files.go b/hotline/files.go
index 478041ba21066453d8a30a308544f76739f6fb33..dc196536d8b7abfc870c07f96ecb0dbc2a48eef5 100644 (file)
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -10,50 +10,112 @@ import (
        "strings"
 )
 
        "strings"
 )
 

-func downcaseFileExtension(filename string) string {
-       splitStr := strings.Split(filename, ".")
-       ext := strings.ToLower(
-               splitStr[len(splitStr)-1],
-       )
-
-       return ext
-}
-
-func fileTypeFromFilename(fn string) fileType {
-       ft, ok := fileTypes[downcaseFileExtension(fn)]
+func fileTypeFromFilename(filename string) fileType {
+       fileExt := strings.ToLower(filepath.Ext(filename))
+       ft, ok := fileTypes[fileExt]

        if ok {
                return ft
        }
        return defaultFileType
 }
 
        if ok {
                return ft
        }
        return defaultFileType
 }
 

-func getFileNameList(filePath string) (fields []Field, err error) {
-       files, err := ioutil.ReadDir(filePath)
+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(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
                var fnwi FileNameWithInfo

+
+               if strings.HasPrefix(file.Name(), ".") {
+                       continue
+               }
+

                fileCreator := make([]byte, 4)
                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.Join(path, file.Name()))
+                       if err != nil {
+                               return fields, err
+                       }

 
 

-                       dir, err := ioutil.ReadDir(filePath + "/" + file.Name())
+                       rFile, err := os.Stat(filepath.Join(path, resolvedPath))
+                       if errors.Is(err, os.ErrNotExist) {
+                               continue
+                       }

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

-                       binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(len(dir)))
-                       copy(fnwi.Type[:], fileType[:])
+
+                       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)[:])
+                       }
+
+               } else if file.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[:])
                        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[:])

                }
 
                strippedName := strings.Replace(file.Name(), ".incomplete", "", -1)
                }
 
                strippedName := strings.Replace(file.Name(), ".incomplete", "", -1)


@@ -102,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 {


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

-
-const incompleteFileSuffix = ".incomplete"
-
-// 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
-}