minor: v0.4.0

[rbdr/mobius] / hotline / files.go

diff --git a/hotline/files.go b/hotline/files.go
index bccab35868e0277ce50fad2c0ab25f2898951349..478041ba21066453d8a30a308544f76739f6fb33 100644 (file)
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -2,50 +2,32 @@ 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"
+func downcaseFileExtension(filename string) string {
+       splitStr := strings.Split(filename, ".")
+       ext := strings.ToLower(
+               splitStr[len(splitStr)-1],
+       )

 
 

-var fileCreatorCodes = map[string]string{
-       "sit": "SIT!",
-       "pdf": "CARO",
+       return ext

 }
 
 }
 

-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(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
-       }
-
-       return code
-}
-
-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
        files, err := ioutil.ReadDir(filePath)
        if err != nil {
                return fields, nil


@@ -55,10 +37,9 @@ func getFileNameList(filePath string) ([]Field, error) {
                var fileType []byte
                var fnwi FileNameWithInfo
                fileCreator := make([]byte, 4)
                var fileType []byte
                var fnwi FileNameWithInfo
                fileCreator := make([]byte, 4)

-               //fileSize := make([]byte, 4)

                if !file.IsDir() {
                if !file.IsDir() {

-                       fileType = []byte(fileTypeFromFilename(file.Name()))
-                       fileCreator = []byte(fileCreatorFromFilename(file.Name()))
+                       fileType = []byte(fileTypeFromFilename(file.Name()).TypeCode)
+                       fileCreator = []byte(fileTypeFromFilename(file.Name()).CreatorCode)

 
                        binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(file.Size()))
                        copy(fnwi.Type[:], fileType[:])
 
                        binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(file.Size()))
                        copy(fnwi.Type[:], fileType[:])


@@ -75,11 +56,13 @@ func getFileNameList(filePath string) ([]Field, error) {
                        copy(fnwi.Creator[:], fileCreator[:])
                }
 
                        copy(fnwi.Creator[:], fileCreator[:])
                }
 

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

                nameSize := make([]byte, 2)
                nameSize := make([]byte, 2)

-               binary.BigEndian.PutUint16(nameSize, uint16(len(file.Name())))
+               binary.BigEndian.PutUint16(nameSize, uint16(len(strippedName)))

                copy(fnwi.NameSize[:], nameSize[:])
 
                copy(fnwi.NameSize[:], nameSize[:])
 

-               fnwi.name = []byte(file.Name())
+               fnwi.name = []byte(strippedName)

 
                b, err := fnwi.MarshalBinary()
                if err != nil {
 
                b, err := fnwi.MarshalBinary()
                if err != nil {


@@ -155,11 +138,20 @@ func EncodeFilePath(filePath string) []byte {
        return bytes
 }
 
        return bytes
 }
 

-func ReadFilePath(filePathFieldData []byte) string {
-       var fp FilePath
-       err := fp.UnmarshalBinary(filePathFieldData)
-       if err != nil {
-               // TODO
+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 fp.String()
+       return file, nil

 }
 }