wader/fq
1
1
Fork 0
mirror of https://github.com/wader/fq.git synced 2024-12-23 13:22:58 +03:00
Code Issues Projects Releases Wiki Activity

refactors some decoder logic in apple_bookmark for better querying

Browse Source
This commit is contained in:
David McDonald 2022-11-29 19:20:27 -06:00
parent 44c91d8296
commit 0c216dff48
2 changed files with 57 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
format/applebookmark/apple_bookmark.go
View File

@ -2,7 +2,6 @@ package applebookmark
import (
"embed"
"fmt"
"time"
"github.com/wader/fq/format"
@ -153,10 +152,35 @@ type tocHeader struct {
entryArrayOffset int64
}
func decodeTOCHeader(d *decode.D, idx int) *tocHeader {
func (hdr *tocHeader) decodeEntries(d *decode.D) {
for k := uint64(0); k < hdr.numEntries; k++ {
entry := new(tocEntry)
d.FieldStruct("entry", func(d *decode.D) {
// entry.key = d.FieldU32("key", elementTypeMap)
entry.key = d.FieldU32("key", elementTypeMap)
// if the key has the top bit set, then (key & 0x7fffffff)
// gives the offset of a string record.
if entry.key&0x80000000 != 0 {
d.FieldStruct("key_string", func(d *decode.D) {
d.SeekAbs(calcOffset(entry.key&0x7fffffff), decodeRecord)
})
}
entry.recordOffset = calcOffset(d.FieldU32("offset_to_record"))
d.FieldU32("reserved")
d.SeekAbs(entry.recordOffset, decodeRecord)
})
}
}
func decodeTOCHeader(d *decode.D) *tocHeader {
hdr := new(tocHeader)
d.FieldStruct(fmt.Sprintf("toc_header_%d", idx), func(d *decode.D) {
d.FieldStruct("toc_header", func(d *decode.D) {
hdr.tocSize = d.FieldU32("toc_size")
d.FieldU32("magic", d.AssertU(0xfffffffe))
d.FieldU32("identifier")
@ -262,60 +286,27 @@ func bookmarkDecode(d *decode.D, _ any) any {
tocOffset := calcOffset(d.FieldU32("first_toc_offset"))
var currentHdr *tocHeader
var tocHeaders []*tocHeader
for i := 0; tocOffset != headerEndBitPos; i++ {
// seek to the TOC, and decode the header and entries
// for this TOC instance. SeekAbs restores our offset each time.
d.FieldArrayLoop("toc_headers", func() bool {
return tocOffset != headerEndBitPos
}, func(d *decode.D) {
d.SeekAbs(tocOffset, func(d *decode.D) {
tocHdr := decodeTOCHeader(d, i)
// store the toc header. we're going to decode the entries in one
// big array once we have decoded all toc's
tocHeaders = append(tocHeaders, tocHdr)
// save the next toc_offset value. 0 indicates that we have reached
// the last TOC instance.
tocOffset = calcOffset(tocHdr.nextTOCOffset)
currentHdr = decodeTOCHeader(d)
tocOffset = calcOffset(currentHdr.nextTOCOffset)
tocHeaders = append(tocHeaders, currentHdr)
})
})
j := 0
// now that we've collected all toc headers, iterate through each one's
// entries and decode associated records.
d.FieldArrayLoop("bookmark_entries",
func() bool { return j < len(tocHeaders) },
func(d *decode.D) {
tocHdr := tocHeaders[j]
j++
d.SeekAbs(tocHdr.entryArrayOffset, func(d *decode.D) {
for k := uint64(0); k < tocHdr.numEntries; k++ {
entry := new(tocEntry)
d.FieldStruct("entry", func(d *decode.D) {
// entry.key = d.FieldU32("key", elementTypeMap)
entry.key = d.FieldU32("key", elementTypeMap)
// if the key has the top bit set, then (key & 0x7fffffff)
// gives the offset of a string record.
if entry.key&0x80000000 != 0 {
d.FieldStruct("key_string", func(d *decode.D) {
d.SeekAbs(calcOffset(entry.key&0x7fffffff), decodeRecord)
})
}
entry.recordOffset = calcOffset(d.FieldU32("offset_to_record"))
d.FieldU32("reserved")
d.SeekAbs(entry.recordOffset, decodeRecord)
})
}
})
})
}
// now that we've collected all toc headers, iterate through each one's
// entries and decode associated records.
d.FieldArray("bookmark_entries",
func(d *decode.D) {
for _, hdr := range tocHeaders {
d.SeekAbs(hdr.entryArrayOffset, hdr.decodeEntries)
}
})
return nil
}

28
format/applebookmark/apple_bookmark.jq
View File

@ -1,28 +1,28 @@
def _apple_bookmark_torepr:
def _f:
( if .type == "String" then .data | tovalue
elif .type == "Data" then .data | tovalue
elif .type == "Byte" then .data | tovalue
elif .type == "Short" then .data | tovalue
elif .type == "data" then .data | tovalue
elif .type == "byte" then .data | tovalue
elif .type == "short" then .data | tovalue
elif .type == "Int" then .data | tovalue
elif .type == "Long" then .data | tovalue
elif .type == "Float" then .data | tovalue
elif .type == "Double" then .data | tovalue
elif .type == "Date" then .data | tovalue
elif .type == "BooleanFalse" then false
elif .type == "BooleanTrue" then true
elif .type == "Array" then
elif .type == "long" then .data | tovalue
elif .type == "float" then .data | tovalue
elif .type == "double" then .data | tovalue
elif .type == "date" then .data | tovalue
elif .type == "boolean_false" then false
elif .type == "boolean_true" then true
elif .type == "array" then
( .data
| map(.record | _f)
)
elif .type == "Dictionary" then
elif .type == "dictionary" then
( .data
| map({key: (.key | _f), value: (.value | _f)})
| from_entries
)
elif .type == "UUID" then .data | tovalue
elif .type == "URL" then .data | tovalue
elif .type == "RelativeURL" then
elif .type == "uuid" then .data | tovalue
elif .type == "url" then .data | tovalue
elif .type == "relative_url" then
.data | map(.record.data)
end
);