X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/16a4ad707a05df25c9d12b8cc89fb3a9e3be0dba..f4a69647659df356f7f1d1ab1d8b4eedcc34dfba:/hotline/files.go?ds=sidebyside

diff --git a/hotline/files.go b/hotline/files.go
index 478041b..42e25db 100644
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -27,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 {
@@ -34,26 +45,47 @@ func getFileNameList(filePath string) (fields []Field, err error) {
 	}
 
 	for _, file := range files {
-		var fileType []byte
 		var fnwi FileNameWithInfo
+
 		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")
+		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 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)
@@ -148,7 +180,7 @@ func effectiveFile(filePath string) (*os.File, error) {
 	}
 
 	if errors.Is(err, fs.ErrNotExist) {
-		file, err = os.OpenFile(filePath+incompleteFileSuffix, os.O_APPEND|os.O_WRONLY, 0644)
+		file, err = os.OpenFile(filePath+incompleteFileSuffix, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644)
 		if err != nil {
 			return nil, err
 		}