Macintosh-Tools/machfs
1
0
Fork 0
mirror of https://github.com/elliotnunn/machfs.git synced 2024-11-25 23:49:16 +00:00
Code Issues Projects Releases Wiki Activity

okay, still only works with hfsutils

Browse Source
This commit is contained in:
Elliot Nunn 2018-10-03 16:28:02 +08:00
parent 78bd2a03a2
commit 95e6097268
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
thing.py
View File

@ -25,6 +25,7 @@ def _dump_btree_recs(buf, start):
bthDepth, bthRoot, bthNRecs, bthFNode, bthLNode, bthNodeSize, bthKeyLen, bthNNodes, bthFree = \ bthDepth, bthRoot, bthNRecs, bthFNode, bthLNode, bthNodeSize, bthKeyLen, bthNNodes, bthFree = \
struct.unpack_from('>HLLLLHHLL', header_rec) struct.unpack_from('>HLLLLHHLL', header_rec)
# print('btree', bthDepth, bthRoot, bthNRecs, bthFNode, bthLNode, bthNodeSize, bthKeyLen, bthNNodes, bthFree) # print('btree', bthDepth, bthRoot, bthNRecs, bthFNode, bthLNode, bthNodeSize, bthKeyLen, bthNNodes, bthFree)
print('btree', bthKeyLen)
# And iterate through the linked list of leaf nodes # And iterate through the linked list of leaf nodes
this_leaf = bthFNode this_leaf = bthFNode
@ -89,7 +90,7 @@ class _Node:
return bytes(buf) return bytes(buf)
def _mkbtree(records): def _mkbtree(records, bthKeyLen):
biglist = [[[]]] # [level][node][record] biglist = [[[]]] # [level][node][record]
bthNRecs = 0 bthNRecs = 0
@ -134,7 +135,7 @@ def _mkbtree(records):
for i, level in enumerate(biglist, 1): for i, level in enumerate(biglist, 1):
for node in level: for node in level:
if len(node) == 0: continue if len(node) > 0:
firstkey, firstval = node[0] firstkey, firstval = node[0]
spiderdict[i, firstkey] = len(nodelist) spiderdict[i, firstkey] = len(nodelist)
@ -172,8 +173,7 @@ def _mkbtree(records):
nodelist.append(mapnode) nodelist.append(mapnode)
mapnodes.append(mapnode) mapnodes.append(mapnode)
mapnode.ndType = 2 mapnode.ndType = 2
ndNHeight = 1 # fix, not sure about this ndNHeight = 1
mapnode.records = [] # fix this
# now we run back and forth to join up nodes of similar type # now we run back and forth to join up nodes of similar type
most_recent = {} most_recent = {}
@ -204,7 +204,6 @@ def _mkbtree(records):
# bthNRecs set above # bthNRecs set above
# bthFNode/bthLNode also set above # bthFNode/bthLNode also set above
bthNodeSize = 512 bthNodeSize = 512
bthKeyLen = 37
bthNNodes = len(nodelist) + bthFree # how do we calculate this? bthNNodes = len(nodelist) + bthFree # how do we calculate this?
# bthFree set above # bthFree set above
hnode.records[0] = struct.pack('>HLLLLHHLL76x', hnode.records[0] = struct.pack('>HLLLLHHLL76x',
@ -467,7 +466,7 @@ class Volume(_AbstractFolder):
blkaccum = [] blkaccum = []
# <<< put the empty extents overflow file in here >>> # <<< put the empty extents overflow file in here >>>
extoflowfile = _mkbtree([]) extoflowfile = _mkbtree([], 7)
# also need to do some cleverness to ensure that this gets picked up... # also need to do some cleverness to ensure that this gets picked up...
drXTFlSize = len(extoflowfile) drXTFlSize = len(extoflowfile)
drXTExtRec_Start = len(blkaccum) drXTExtRec_Start = len(blkaccum)
@ -517,12 +516,12 @@ class Volume(_AbstractFolder):
drFilCnt += 1 drFilCnt += 1
cdrType = 2 cdrType = 2
filFlags = 0 # todo must fix filFlags = 1 << 1 # file thread record exists, but is not locked, nor "file record is used"
filTyp = 0 filTyp = 0
filUsrWds = struct.pack('>4s4sHHHxxxxxx', obj.type, obj.creator, obj.flags, obj.x, obj.y) filUsrWds = struct.pack('>4s4sHHHxxxxxx', obj.type, obj.creator, obj.flags, obj.x, obj.y)
filFlNum = wrap.cnid filFlNum = wrap.cnid
filStBlk, filLgLen, filPyLen = 0, len(obj.data), _pad_up(len(obj.data), drAlBlkSiz) # todo must fix filStBlk, filLgLen, filPyLen = wrap.dfrk[0], len(obj.data), _pad_up(len(obj.data), drAlBlkSiz)
filRStBlk, filRLgLen, filRPyLen = 0, len(obj.rsrc), _pad_up(len(obj.rsrc), drAlBlkSiz) # todo must fix filRStBlk, filRLgLen, filRPyLen = wrap.rfrk[0], len(obj.rsrc), _pad_up(len(obj.rsrc), drAlBlkSiz)
filCrDat, filMdDat, filBkDat = obj.crdat, obj.mddat, obj.bkdat filCrDat, filMdDat, filBkDat = obj.crdat, obj.mddat, obj.bkdat
filFndrInfo = bytes(16) # todo must fix filFndrInfo = bytes(16) # todo must fix
filClpSize = 0 # todo must fix filClpSize = 0 # todo must fix
@ -567,7 +566,7 @@ class Volume(_AbstractFolder):
# now it is time to sort these records! fuck that shit... # now it is time to sort these records! fuck that shit...
# catalog.sort... # catalog.sort...
catalogfile = _mkbtree(catalog) catalogfile = _mkbtree(catalog, 37)
# also need to do some cleverness to ensure that this gets picked up... # also need to do some cleverness to ensure that this gets picked up...
drCTFlSize = len(catalogfile) drCTFlSize = len(catalogfile)
drCTExtRec_Start = len(blkaccum) drCTExtRec_Start = len(blkaccum)
@ -590,7 +589,7 @@ class Volume(_AbstractFolder):
drAlBlSt = 3 + bitmap_blk_cnt drAlBlSt = 3 + bitmap_blk_cnt
drFreeBks = drNmAlBlks - len(blkaccum) drFreeBks = drNmAlBlks - len(blkaccum)
drWrCnt = 0 # ????volume write count drWrCnt = 0 # ????volume write count
drVCSize = drVBMCSize = drCtlCSize = 99 drVCSize = drVBMCSize = drCtlCSize = 0
vib = struct.pack('>2sLLHHHHHLLHLH28pLHLLLHLL32sHHHLHHxxxxxxxxLHHxxxxxxxx', vib = struct.pack('>2sLLHHHHHLLHLH28pLHLLLHLL32sHHHLHHxxxxxxxxLHHxxxxxxxx',
drSigWord, self.drCrDate, self.drLsMod, self.drAtrb, drNmFls, drSigWord, self.drCrDate, self.drLsMod, self.drAtrb, drNmFls,
@ -619,7 +618,11 @@ else:
import pprint import pprint
print(_mkbtree([])) # Volume().read(open('SourceForEmulator.dmg', 'rb').read())
# exit()
# print(_mkbtree([]))
# h = Volume() # h = Volume()
# h.read(open(infile,'rb').read()) # h.read(open(infile,'rb').read())
@ -634,6 +637,7 @@ print(_mkbtree([]))
h = Volume() h = Volume()
f = File() f = File()
h[b'file'] = f h[b'file'] = f
f.data = b'mydatafork\r'
wr = h.write(800*1024) wr = h.write(800*1024)
open(infile,'wb').write(wr) open(infile,'wb').write(wr)