X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/43ecc0f42eaeface5f640479df7372bfb8021f23..7778a321b14898bc8dabe4bb19c8ce5cb0100654:/hotline/files.go

diff --git a/hotline/files.go b/hotline/files.go
index 1db698b..19375e9 100644
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -8,44 +8,24 @@ import (
 	"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
-	}
-
-	return code
-}
-
-func fileCreatorFromFilename(fn string) string {
-	ext := strings.Split(fn, ".")
-	code := fileCreatorCodes[ext[len(ext)-1]]
-	if code == "" {
-		code = defaultCreator
+func fileTypeFromFilename(fn string) fileType {
+	ft, ok := fileTypes[downcaseFileExtension(fn)]
+	if ok {
+		return ft
 	}
-
-	return code
+	return defaultFileType
 }
 
-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
@@ -53,13 +33,15 @@ func getFileNameList(filePath string) ([]Field, error) {
 
 	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()))
+			fileType = []byte(fileTypeFromFilename(file.Name()).TypeCode)
+			fileCreator = []byte(fileTypeFromFilename(file.Name()).CreatorCode)
 
-			binary.BigEndian.PutUint32(fileSize, uint32(file.Size()))
+			binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(file.Size()))
+			copy(fnwi.Type[:], fileType[:])
+			copy(fnwi.Creator[:], fileCreator[:])
 		} else {
 			fileType = []byte("fldr")
 
@@ -67,19 +49,22 @@ func getFileNameList(filePath string) ([]Field, error) {
 			if err != nil {
 				return fields, err
 			}
-			binary.BigEndian.PutUint32(fileSize, uint32(len(dir)))
+			binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(len(dir)))
+			copy(fnwi.Type[:], fileType[:])
+			copy(fnwi.Creator[:], fileCreator[:])
 		}
 
-		fields = append(fields, NewField(
-			fieldFileNameWithInfo,
-			FileNameWithInfo{
-				Type:       fileType,
-				Creator:    fileCreator,
-				FileSize:   fileSize,
-				NameScript: []byte{0, 0},
-				Name:       []byte(file.Name()),
-			}.Payload(),
-		))
+		nameSize := make([]byte, 2)
+		binary.BigEndian.PutUint16(nameSize, uint16(len(file.Name())))
+		copy(fnwi.NameSize[:], nameSize[:])
+
+		fnwi.name = []byte(file.Name())
+
+		b, err := fnwi.MarshalBinary()
+		if err != nil {
+			return nil, err
+		}
+		fields = append(fields, NewField(fieldFileNameWithInfo, b))
 	}
 
 	return fields, nil
@@ -148,8 +133,3 @@ func EncodeFilePath(filePath string) []byte {
 
 	return bytes
 }
-
-func ReadFilePath(filePathFieldData []byte) string {
-	fp := NewFilePath(filePathFieldData)
-	return fp.String()
-}