More cleanup

[rbdr/mobius] / hotline / files.go

diff --git a/hotline/files.go b/hotline/files.go
index 1db698baa45a9e74b76e50495e2a651bb86148a5..0c233348c0a093af58383a590725ba76648efa71 100644 (file)
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -43,9 +43,7 @@ func fileCreatorFromFilename(fn string) string {
        return code
 }
 
        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


@@ -53,13 +51,16 @@ func getFileNameList(filePath string) ([]Field, error) {
 
        for _, file := range files {
                var fileType []byte
 
        for _, file := range files {
                var fileType []byte

+               var fnwi FileNameWithInfo

                fileCreator := make([]byte, 4)
                fileCreator := make([]byte, 4)

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

                if !file.IsDir() {
                        fileType = []byte(fileTypeFromFilename(file.Name()))
                        fileCreator = []byte(fileCreatorFromFilename(file.Name()))
 
                if !file.IsDir() {
                        fileType = []byte(fileTypeFromFilename(file.Name()))
                        fileCreator = []byte(fileCreatorFromFilename(file.Name()))
 

-                       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")
 
                } else {
                        fileType = []byte("fldr")
 


@@ -67,19 +68,22 @@ func getFileNameList(filePath string) ([]Field, error) {
                        if err != nil {
                                return fields, err
                        }
                        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
        }
 
        return fields, nil


@@ -148,8 +152,3 @@ func EncodeFilePath(filePath string) []byte {
 
        return bytes
 }
 
        return bytes
 }

-
-func ReadFilePath(filePathFieldData []byte) string {
-       fp := NewFilePath(filePathFieldData)
-       return fp.String()
-}