X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/72dd37f1abb2b550aaaac48eac677403d5664797..041c2df698d4702816cf8472d212553d289a2c0c:/hotline/files.go

diff --git a/hotline/files.go b/hotline/files.go
index bccab35..e77f631 100644
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -2,84 +2,102 @@ package hotline
 
 import (
 	"encoding/binary"
+	"errors"
+	"io/fs"
 	"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
+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 {
-		var fileType []byte
 		var fnwi FileNameWithInfo
+
 		fileCreator := make([]byte, 4)
-		//fileSize := make([]byte, 4)
-		if !file.IsDir() {
-			fileType = []byte(fileTypeFromFilename(file.Name()))
-			fileCreator = []byte(fileCreatorFromFilename(file.Name()))
 
-			binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(file.Size()))
-			copy(fnwi.Type[:], fileType[:])
-			copy(fnwi.Creator[:], fileCreator[:])
-		} else {
-			fileType = []byte("fldr")
+		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
 			}
 			binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(len(dir)))
-			copy(fnwi.Type[:], fileType[:])
+			copy(fnwi.Type[:], []byte("fldr")[:])
 			copy(fnwi.Creator[:], fileCreator[:])
+		} else {
+			binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(file.Size()))
+			copy(fnwi.Type[:], []byte(fileTypeFromFilename(file.Name()).TypeCode)[:])
+			copy(fnwi.Creator[:], []byte(fileTypeFromFilename(file.Name()).CreatorCode)[:])
 		}
 
+		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 {
@@ -155,11 +173,20 @@ func EncodeFilePath(filePath string) []byte {
 	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
 }