X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/92a7e455a347e5be7fb69b6846b9f27ca698ae12..29f329aedcdcf4e07a6dc3d9161439dd35ecfe11:/hotline/flattened_file_object.go?ds=inline

diff --git a/hotline/flattened_file_object.go b/hotline/flattened_file_object.go
index 02804f6..0a14df0 100644
--- a/hotline/flattened_file_object.go
+++ b/hotline/flattened_file_object.go
@@ -55,30 +55,30 @@ type FlatFileInformationFork struct {
 	Comment          []byte // File comment
 }
 
-func NewFlatFileInformationFork(fileName string) FlatFileInformationFork {
+func NewFlatFileInformationFork(fileName string, modifyTime []byte) 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),
+		CommentSize:      []byte{0, 4},
 		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)
-	nameLen := len(ffif.Name)
+
 	//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))
 
@@ -184,9 +184,8 @@ func (f flattenedFileObject) BinaryMarshal() []byte {
 	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...)
@@ -205,7 +204,7 @@ func NewFlattenedFileObject(fileRoot string, filePath, fileName []byte) (*flatte
 	if err != nil {
 		return nil, err
 	}
-	defer file.Close()
+	defer func(file *os.File) { _ = file.Close() }(file)
 
 	fileInfo, err := file.Stat()
 	if err != nil {
@@ -215,9 +214,11 @@ func NewFlattenedFileObject(fileRoot string, filePath, fileName []byte) (*flatte
 	dataSize := make([]byte, 4)
 	binary.BigEndian.PutUint32(dataSize, uint32(fileInfo.Size()))
 
+	mTime := toHotlineTime(fileInfo.ModTime())
+
 	return &flattenedFileObject{
 		FlatFileHeader:          NewFlatFileHeader(),
-		FlatFileInformationFork: NewFlatFileInformationFork(string(fileName)),
+		FlatFileInformationFork: NewFlatFileInformationFork(string(fileName), mTime),
 		FlatFileDataForkHeader: FlatFileDataForkHeader{
 			ForkType:        []byte("DATA"),
 			CompressionType: []byte{0, 0, 0, 0},