X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/7cd900d61edbd6d322db3cecb913adf574389320..a2ef262a164fc735b9b8471ac0c8001eea2b9bf6:/hotline/flattened_file_object.go diff --git a/hotline/flattened_file_object.go b/hotline/flattened_file_object.go index 6ccd9d7..fbc319b 100644 --- a/hotline/flattened_file_object.go +++ b/hotline/flattened_file_object.go @@ -1,8 +1,10 @@ package hotline import ( + "bytes" "encoding/binary" "io" + "slices" ) type flattenedFileObject struct { @@ -11,6 +13,8 @@ type flattenedFileObject struct { FlatFileInformationFork FlatFileInformationFork FlatFileDataForkHeader FlatFileForkHeader FlatFileResForkHeader FlatFileForkHeader + + readOffset int // Internal offset to track read progress } // FlatFileHeader is the first section of a "Flattened File Object". All fields have static values. @@ -22,56 +26,55 @@ type FlatFileHeader struct { } type FlatFileInformationFork struct { - Platform []byte // Operating System used. ("AMAC" or "MWIN") - TypeSignature []byte // File type signature - CreatorSignature []byte // File creator signature - Flags []byte - PlatformFlags []byte - RSVD []byte - CreateDate []byte - ModifyDate []byte - NameScript []byte - NameSize []byte // Length of file name (Maximum 128 characters) - Name []byte // File name - CommentSize []byte // Length of the comment - Comment []byte // File comment -} - -func NewFlatFileInformationFork(fileName string, modifyTime []byte, typeSignature string, creatorSignature string) FlatFileInformationFork { + Platform [4]byte // Operating System used. ("AMAC" or "MWIN") + TypeSignature [4]byte // File type signature + CreatorSignature [4]byte // File creator signature + Flags [4]byte + PlatformFlags [4]byte + RSVD [32]byte + CreateDate [8]byte + ModifyDate [8]byte + NameScript [2]byte + NameSize [2]byte // Length of file name (Maximum 128 characters) + Name []byte // File name + CommentSize [2]byte // Length of the comment + Comment []byte // File comment + + readOffset int // Internal offset to track read progress +} + +func NewFlatFileInformationFork(fileName string, modifyTime [8]byte, typeSignature string, creatorSignature string) FlatFileInformationFork { return FlatFileInformationFork{ - Platform: []byte("AMAC"), // TODO: Remove hardcode to support "AWIN" Platform (maybe?) - TypeSignature: []byte(typeSignature), // TODO: Don't infer types from filename - CreatorSignature: []byte(creatorSignature), // 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 + Platform: [4]byte{0x41, 0x4D, 0x41, 0x43}, // "AMAC" TODO: Remove hardcode to support "AWIN" Platform (maybe?) + TypeSignature: [4]byte([]byte(typeSignature)), // TODO: Don't infer types from filename + CreatorSignature: [4]byte([]byte(creatorSignature)), // TODO: Don't infer types from filename + PlatformFlags: [4]byte{0, 0, 1, 0}, // TODO: What is this? + CreateDate: modifyTime, // some filesystems don't support createTime ModifyDate: modifyTime, - NameScript: make([]byte, 2), // TODO: What is this? Name: []byte(fileName), - CommentSize: []byte{0, 0}, Comment: []byte{}, // TODO: implement (maybe?) } } func (ffif *FlatFileInformationFork) friendlyType() []byte { - if name, ok := friendlyCreatorNames[string(ffif.TypeSignature)]; ok { + if name, ok := friendlyCreatorNames[string(ffif.TypeSignature[:])]; ok { return []byte(name) } - return ffif.TypeSignature + return ffif.TypeSignature[:] } func (ffif *FlatFileInformationFork) friendlyCreator() []byte { - if name, ok := friendlyCreatorNames[string(ffif.CreatorSignature)]; ok { + if name, ok := friendlyCreatorNames[string(ffif.CreatorSignature[:])]; ok { return []byte(name) } - return ffif.CreatorSignature + return ffif.CreatorSignature[:] } func (ffif *FlatFileInformationFork) setComment(comment []byte) error { + commentSize := make([]byte, 2) ffif.Comment = comment - binary.BigEndian.PutUint16(ffif.CommentSize, uint16(len(comment))) - + binary.BigEndian.PutUint16(commentSize, uint16(len(comment))) + ffif.CommentSize = [2]byte(commentSize) // TODO: return err if comment is too long return nil } @@ -99,8 +102,11 @@ func (ffif *FlatFileInformationFork) Size() [4]byte { } func (ffo *flattenedFileObject) TransferSize(offset int64) []byte { + ffoCopy := *ffo + // get length of the flattenedFileObject, including the info fork - payloadSize := len(ffo.BinaryMarshal()) + b, _ := io.ReadAll(&ffoCopy) + payloadSize := len(b) // length of data fork dataSize := binary.BigEndian.Uint32(ffo.FlatFileDataForkHeader.DataSize[:]) @@ -109,7 +115,7 @@ func (ffo *flattenedFileObject) TransferSize(offset int64) []byte { resForkSize := binary.BigEndian.Uint32(ffo.FlatFileResForkHeader.DataSize[:]) size := make([]byte, 4) - binary.BigEndian.PutUint32(size[:], dataSize+resForkSize+uint32(payloadSize)-uint32(offset)) + binary.BigEndian.PutUint32(size, dataSize+resForkSize+uint32(payloadSize)-uint32(offset)) return size } @@ -128,23 +134,63 @@ type FlatFileForkHeader struct { DataSize [4]byte } -func (ffif *FlatFileInformationFork) MarshalBinary() []byte { - var b []byte - b = append(b, ffif.Platform...) - b = append(b, ffif.TypeSignature...) - b = append(b, ffif.CreatorSignature...) - b = append(b, ffif.Flags...) - b = append(b, ffif.PlatformFlags...) - b = append(b, ffif.RSVD...) - b = append(b, ffif.CreateDate...) - b = append(b, ffif.ModifyDate...) - b = append(b, ffif.NameScript...) - b = append(b, ffif.ReadNameSize()...) - b = append(b, ffif.Name...) - b = append(b, ffif.CommentSize...) - b = append(b, ffif.Comment...) +func (ffif *FlatFileInformationFork) Read(p []byte) (int, error) { + buf := slices.Concat( + ffif.Platform[:], + ffif.TypeSignature[:], + ffif.CreatorSignature[:], + ffif.Flags[:], + ffif.PlatformFlags[:], + ffif.RSVD[:], + ffif.CreateDate[:], + ffif.ModifyDate[:], + ffif.NameScript[:], + ffif.ReadNameSize(), + ffif.Name, + ffif.CommentSize[:], + ffif.Comment, + ) + + if ffif.readOffset >= len(buf) { + return 0, io.EOF // All bytes have been read + } + + n := copy(p, buf[ffif.readOffset:]) + ffif.readOffset += n - return b + return n, nil +} + +// Write implements the io.Writer interface for FlatFileInformationFork +func (ffif *FlatFileInformationFork) Write(p []byte) (int, error) { + nameSize := p[70:72] + bs := binary.BigEndian.Uint16(nameSize) + total := 72 + bs + + ffif.Platform = [4]byte(p[0:4]) + ffif.TypeSignature = [4]byte(p[4:8]) + ffif.CreatorSignature = [4]byte(p[8:12]) + ffif.Flags = [4]byte(p[12:16]) + ffif.PlatformFlags = [4]byte(p[16:20]) + ffif.RSVD = [32]byte(p[20:52]) + ffif.CreateDate = [8]byte(p[52:60]) + ffif.ModifyDate = [8]byte(p[60:68]) + ffif.NameScript = [2]byte(p[68:70]) + ffif.NameSize = [2]byte(p[70:72]) + ffif.Name = p[72:total] + + if len(p) > int(total) { + ffif.CommentSize = [2]byte(p[total : total+2]) + commentLen := binary.BigEndian.Uint16(ffif.CommentSize[:]) + commentStartPos := int(total) + 2 + commentEndPos := int(total) + 2 + int(commentLen) + + ffif.Comment = p[commentStartPos:commentEndPos] + + //total = uint16(commentEndPos) + } + + return len(p), nil } func (ffif *FlatFileInformationFork) UnmarshalBinary(b []byte) error { @@ -152,21 +198,21 @@ func (ffif *FlatFileInformationFork) UnmarshalBinary(b []byte) error { bs := binary.BigEndian.Uint16(nameSize) nameEnd := 72 + bs - ffif.Platform = b[0:4] - ffif.TypeSignature = b[4:8] - ffif.CreatorSignature = b[8:12] - ffif.Flags = b[12:16] - ffif.PlatformFlags = b[16:20] - ffif.RSVD = b[20:52] - ffif.CreateDate = b[52:60] - ffif.ModifyDate = b[60:68] - ffif.NameScript = b[68:70] - ffif.NameSize = b[70:72] + ffif.Platform = [4]byte(b[0:4]) + ffif.TypeSignature = [4]byte(b[4:8]) + ffif.CreatorSignature = [4]byte(b[8:12]) + ffif.Flags = [4]byte(b[12:16]) + ffif.PlatformFlags = [4]byte(b[16:20]) + ffif.RSVD = [32]byte(b[20:52]) + ffif.CreateDate = [8]byte(b[52:60]) + ffif.ModifyDate = [8]byte(b[60:68]) + ffif.NameScript = [2]byte(b[68:70]) + ffif.NameSize = [2]byte(b[70:72]) ffif.Name = b[72:nameEnd] if len(b) > int(nameEnd) { - ffif.CommentSize = b[nameEnd : nameEnd+2] - commentLen := binary.BigEndian.Uint16(ffif.CommentSize) + ffif.CommentSize = [2]byte(b[nameEnd : nameEnd+2]) + commentLen := binary.BigEndian.Uint16(ffif.CommentSize[:]) commentStartPos := int(nameEnd) + 2 commentEndPos := int(nameEnd) + 2 + int(commentLen) @@ -177,42 +223,48 @@ func (ffif *FlatFileInformationFork) UnmarshalBinary(b []byte) error { return nil } -func (ffo *flattenedFileObject) BinaryMarshal() []byte { - var out []byte - out = append(out, ffo.FlatFileHeader.Format[:]...) - out = append(out, ffo.FlatFileHeader.Version[:]...) - out = append(out, ffo.FlatFileHeader.RSVD[:]...) - out = append(out, ffo.FlatFileHeader.ForkCount[:]...) - - out = append(out, []byte("INFO")...) - out = append(out, []byte{0, 0, 0, 0}...) - out = append(out, make([]byte, 4)...) - out = append(out, ffo.FlatFileInformationFork.DataSize()...) - - out = append(out, ffo.FlatFileInformationFork.Platform...) - out = append(out, ffo.FlatFileInformationFork.TypeSignature...) - out = append(out, ffo.FlatFileInformationFork.CreatorSignature...) - out = append(out, ffo.FlatFileInformationFork.Flags...) - out = append(out, ffo.FlatFileInformationFork.PlatformFlags...) - out = append(out, ffo.FlatFileInformationFork.RSVD...) - out = append(out, ffo.FlatFileInformationFork.CreateDate...) - out = append(out, ffo.FlatFileInformationFork.ModifyDate...) - out = append(out, ffo.FlatFileInformationFork.NameScript...) - out = append(out, ffo.FlatFileInformationFork.ReadNameSize()...) - out = append(out, ffo.FlatFileInformationFork.Name...) - out = append(out, ffo.FlatFileInformationFork.CommentSize...) - out = append(out, ffo.FlatFileInformationFork.Comment...) +// Read implements the io.Reader interface for flattenedFileObject +func (ffo *flattenedFileObject) Read(p []byte) (int, error) { + buf := slices.Concat( + ffo.FlatFileHeader.Format[:], + ffo.FlatFileHeader.Version[:], + ffo.FlatFileHeader.RSVD[:], + ffo.FlatFileHeader.ForkCount[:], + []byte("INFO"), + []byte{0, 0, 0, 0}, + make([]byte, 4), + ffo.FlatFileInformationFork.DataSize(), + ffo.FlatFileInformationFork.Platform[:], + ffo.FlatFileInformationFork.TypeSignature[:], + ffo.FlatFileInformationFork.CreatorSignature[:], + ffo.FlatFileInformationFork.Flags[:], + ffo.FlatFileInformationFork.PlatformFlags[:], + ffo.FlatFileInformationFork.RSVD[:], + ffo.FlatFileInformationFork.CreateDate[:], + ffo.FlatFileInformationFork.ModifyDate[:], + ffo.FlatFileInformationFork.NameScript[:], + ffo.FlatFileInformationFork.ReadNameSize(), + ffo.FlatFileInformationFork.Name, + ffo.FlatFileInformationFork.CommentSize[:], + ffo.FlatFileInformationFork.Comment, + ffo.FlatFileDataForkHeader.ForkType[:], + ffo.FlatFileDataForkHeader.CompressionType[:], + ffo.FlatFileDataForkHeader.RSVD[:], + ffo.FlatFileDataForkHeader.DataSize[:], + ) + + if ffo.readOffset >= len(buf) { + return 0, io.EOF // All bytes have been read + } - out = append(out, ffo.FlatFileDataForkHeader.ForkType[:]...) - out = append(out, ffo.FlatFileDataForkHeader.CompressionType[:]...) - out = append(out, ffo.FlatFileDataForkHeader.RSVD[:]...) - out = append(out, ffo.FlatFileDataForkHeader.DataSize[:]...) + n := copy(p, buf[ffo.readOffset:]) + ffo.readOffset += n - return out + return n, nil } -func (ffo *flattenedFileObject) ReadFrom(r io.Reader) (int, error) { - var n int +func (ffo *flattenedFileObject) ReadFrom(r io.Reader) (int64, error) { + var n int64 if err := binary.Read(r, binary.BigEndian, &ffo.FlatFileHeader); err != nil { return n, err @@ -228,7 +280,8 @@ func (ffo *flattenedFileObject) ReadFrom(r io.Reader) (int, error) { return n, err } - if err := ffo.FlatFileInformationFork.UnmarshalBinary(ffifBuf); err != nil { + _, err := io.Copy(&ffo.FlatFileInformationFork, bytes.NewReader(ffifBuf)) + if err != nil { return n, err }