Add partial support for file create/modify timestamps

[rbdr/mobius] / hotline / flattened_file_object.go

diff --git a/hotline/flattened_file_object.go b/hotline/flattened_file_object.go
index 8e2dbff750569e5640a83ad3f495db083abda5e1..0a14df006ff8208d71464e60f833999862114c63 100644 (file)
--- a/hotline/flattened_file_object.go
+++ b/hotline/flattened_file_object.go
@@ -2,7 +2,6 @@ package hotline
 
 import (
        "encoding/binary"
 
 import (
        "encoding/binary"

-       "fmt"

        "os"
 )
 
        "os"
 )
 


@@ -56,30 +55,30 @@ type FlatFileInformationFork struct {
        Comment          []byte // File comment
 }
 
        Comment          []byte // File comment
 }
 

-func NewFlatFileInformationFork(fileName string) FlatFileInformationFork {
+func NewFlatFileInformationFork(fileName string, modifyTime []byte) FlatFileInformationFork {

        return FlatFileInformationFork{
        return FlatFileInformationFork{

-               Platform:         []byte("AMAC"),                                         // TODO: Remove hardcode to support "AWIN" Platform (maybe?)
-               TypeSignature:    []byte(fileTypeFromFilename(fileName)),                 // TODO: Don't infer types from filename
-               CreatorSignature: []byte(fileCreatorFromFilename(fileName)),              // TODO: Don't infer types from filename
-               Flags:            []byte{0, 0, 0, 0},                                     // TODO: What is this?
-               PlatformFlags:    []byte{0, 0, 1, 0},                                     // TODO: What is this?
-               RSVD:             make([]byte, 32),                                       // Unimplemented in Hotline Protocol
-               CreateDate:       []byte{0x07, 0x70, 0x00, 0x00, 0xba, 0x74, 0x24, 0x73}, // TODO: implement
-               ModifyDate:       []byte{0x07, 0x70, 0x00, 0x00, 0xba, 0x74, 0x24, 0x73}, // TODO: implement
-               NameScript:       make([]byte, 2),                                        // TODO: What is this?
+               Platform:         []byte("AMAC"),                                     // TODO: Remove hardcode to support "AWIN" Platform (maybe?)
+               TypeSignature:    []byte(fileTypeFromFilename(fileName).TypeCode),    // TODO: Don't infer types from filename
+               CreatorSignature: []byte(fileTypeFromFilename(fileName).CreatorCode), // TODO: Don't infer types from filename
+               Flags:            []byte{0, 0, 0, 0},                                 // TODO: What is this?
+               PlatformFlags:    []byte{0, 0, 1, 0},                                 // TODO: What is this?
+               RSVD:             make([]byte, 32),                                   // Unimplemented in Hotline Protocol
+               CreateDate:       modifyTime,                                         // some filesystems don't support createTime
+               ModifyDate:       modifyTime,
+               NameScript:       make([]byte, 2), // TODO: What is this?

                Name:             []byte(fileName),
                Name:             []byte(fileName),

+               CommentSize:      []byte{0, 4},

                Comment:          []byte("TODO"), // TODO: implement (maybe?)
        }
 }
 
                Comment:          []byte("TODO"), // TODO: implement (maybe?)
        }
 }
 

-// Size of the flat file information fork, which is the fixed size of 72 bytes
-// plus the number of bytes in the FileName
-// TODO: plus the size of the Comment!
+// DataSize calculates the size of the flat file information fork, which is
+// 72 bytes for the fixed length fields plus the length of the Name + Comment

 func (ffif FlatFileInformationFork) DataSize() []byte {
        size := make([]byte, 4)
 func (ffif FlatFileInformationFork) DataSize() []byte {
        size := make([]byte, 4)

-       nameLen := len(ffif.Name)
+

        //TODO: Can I do math directly on two byte slices?
        //TODO: Can I do math directly on two byte slices?

-       dataSize := nameLen + 74
+       dataSize := len(ffif.Name) + len(ffif.Comment) + 74

 
        binary.BigEndian.PutUint32(size, uint32(dataSize))
 
 
        binary.BigEndian.PutUint32(size, uint32(dataSize))
 


@@ -87,7 +86,7 @@ func (ffif FlatFileInformationFork) DataSize() []byte {
 }
 
 func (ffo flattenedFileObject) TransferSize() []byte {
 }
 
 func (ffo flattenedFileObject) TransferSize() []byte {

-       payloadSize := len(ffo.Payload())
+       payloadSize := len(ffo.BinaryMarshal())

        dataSize := binary.BigEndian.Uint32(ffo.FlatFileDataForkHeader.DataSize)
 
        transferSize := make([]byte, 4)
        dataSize := binary.BigEndian.Uint32(ffo.FlatFileDataForkHeader.DataSize)
 
        transferSize := make([]byte, 4)


@@ -110,15 +109,6 @@ type FlatFileDataForkHeader struct {
        DataSize        []byte
 }
 
        DataSize        []byte
 }
 

-func NewFlatFileDataForkHeader() FlatFileDataForkHeader {
-       return FlatFileDataForkHeader{
-               ForkType:        []byte("DATA"),
-               CompressionType: []byte{0, 0, 0, 0},
-               RSVD:            []byte{0, 0, 0, 0},
-               //      DataSize:        []byte{0, 0, 0x03, 0xc3},
-       }
-}
-

 // ReadFlattenedFileObject parses a byte slice into a flattenedFileObject
 func ReadFlattenedFileObject(bytes []byte) flattenedFileObject {
        nameSize := bytes[110:112]
 // ReadFlattenedFileObject parses a byte slice into a flattenedFileObject
 func ReadFlattenedFileObject(bytes []byte) flattenedFileObject {
        nameSize := bytes[110:112]


@@ -171,7 +161,7 @@ func ReadFlattenedFileObject(bytes []byte) flattenedFileObject {
        return ffo
 }
 
        return ffo
 }
 

-func (f flattenedFileObject) Payload() []byte {
+func (f flattenedFileObject) BinaryMarshal() []byte {

        var out []byte
        out = append(out, f.FlatFileHeader.Format[:]...)
        out = append(out, f.FlatFileHeader.Version[:]...)
        var out []byte
        out = append(out, f.FlatFileHeader.Format[:]...)
        out = append(out, f.FlatFileHeader.Version[:]...)


@@ -194,9 +184,8 @@ func (f flattenedFileObject) Payload() []byte {
        out = append(out, f.FlatFileInformationFork.NameScript...)
        out = append(out, f.FlatFileInformationFork.ReadNameSize()...)
        out = append(out, f.FlatFileInformationFork.Name...)
        out = append(out, f.FlatFileInformationFork.NameScript...)
        out = append(out, f.FlatFileInformationFork.ReadNameSize()...)
        out = append(out, f.FlatFileInformationFork.Name...)

-
-       // TODO: Implement commentlen and comment field
-       out = append(out, []byte{0, 0}...)
+       out = append(out, f.FlatFileInformationFork.CommentSize...)
+       out = append(out, f.FlatFileInformationFork.Comment...)

 
        out = append(out, f.FlatFileDataForkHeader.ForkType...)
        out = append(out, f.FlatFileDataForkHeader.CompressionType...)
 
        out = append(out, f.FlatFileDataForkHeader.ForkType...)
        out = append(out, f.FlatFileDataForkHeader.CompressionType...)


@@ -206,12 +195,16 @@ func (f flattenedFileObject) Payload() []byte {
        return out
 }
 
        return out
 }
 

-func NewFlattenedFileObject(filePath, fileName string) (*flattenedFileObject, error) {
-       file, err := os.Open(fmt.Sprintf("%v/%v", filePath, fileName))
+func NewFlattenedFileObject(fileRoot string, filePath, fileName []byte) (*flattenedFileObject, error) {
+       fullFilePath, err := readPath(fileRoot, filePath, fileName)

        if err != nil {
                return nil, err
        }
        if err != nil {
                return nil, err
        }

-       defer file.Close()
+       file, err := os.Open(fullFilePath)
+       if err != nil {
+               return nil, err
+       }
+       defer func(file *os.File) { _ = file.Close() }(file)

 
        fileInfo, err := file.Stat()
        if err != nil {
 
        fileInfo, err := file.Stat()
        if err != nil {


@@ -221,9 +214,11 @@ func NewFlattenedFileObject(filePath, fileName string) (*flattenedFileObject, er
        dataSize := make([]byte, 4)
        binary.BigEndian.PutUint32(dataSize, uint32(fileInfo.Size()))
 
        dataSize := make([]byte, 4)
        binary.BigEndian.PutUint32(dataSize, uint32(fileInfo.Size()))
 

+       mTime := toHotlineTime(fileInfo.ModTime())
+

        return &flattenedFileObject{
                FlatFileHeader:          NewFlatFileHeader(),
        return &flattenedFileObject{
                FlatFileHeader:          NewFlatFileHeader(),

-               FlatFileInformationFork: NewFlatFileInformationFork(fileName),
+               FlatFileInformationFork: NewFlatFileInformationFork(string(fileName), mTime),

                FlatFileDataForkHeader: FlatFileDataForkHeader{
                        ForkType:        []byte("DATA"),
                        CompressionType: []byte{0, 0, 0, 0},
                FlatFileDataForkHeader: FlatFileDataForkHeader{
                        ForkType:        []byte("DATA"),
                        CompressionType: []byte{0, 0, 0, 0},