Implement some special case file descriptions

[rbdr/mobius] / hotline / files.go

diff --git a/hotline/files.go b/hotline/files.go
index 19375e9a831a83cfea1baad80d64b78a9a30ade3..7c2cd1a8bf3688ec8e56ead5b632a69cca470280 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,6 +27,17 @@ func fileTypeFromFilename(fn string) fileType {
        return defaultFileType
 }
 
+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 ft, nil
+}
+
 func getFileNameList(filePath string) (fields []Field, err error) {
        files, err := ioutil.ReadDir(filePath)
        if err != nil {
@@ -54,11 +67,13 @@ func getFileNameList(filePath string) (fields []Field, err error) {
                        copy(fnwi.Creator[:], fileCreator[:])
                }
 
+               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 {
@@ -133,3 +148,21 @@ func EncodeFilePath(filePath string) []byte {
 
        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
+}