DEVTOOLS: dumper-companion: Support images with multiple partitions; don't warn about missing deps when not running mac mode #5412
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…don't warn about missing deps when not running mac mode Additionally fix a copy/paste error and remove an unused variable.
WalkthroughWalkthroughThe recent changes in the Changes
TipsChat with CodeRabbit Bot (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Comment on lines
+304
to
+341
| partitions = [] | ||
| with source_volume.open(mode="rb") as f: | ||
| f.seek(0x200) | ||
| if f.read(4) == b"PM\x00\x00": | ||
| partition_num = 1 | ||
| partition_type = "" | ||
| while partition_type != "Apple_HFS": | ||
| partition_num = 1 | ||
|
|
||
| while True: | ||
| data = f.read(4) | ||
| if data == b"PM\x00\x00": | ||
| num_partitions, partition_start, partition_size = unpack( | ||
| ">III", f.read(12) | ||
| ) | ||
| f.seek(32, 1) | ||
| partition_type = f.read(32).decode("ascii").split("\x00")[0] | ||
| if partition_num <= num_partitions and partition_type != "Apple_HFS": | ||
| f.seek(0x20, 1) | ||
| partition_type = f.read(0x20).decode("ascii").split("\x00")[0] | ||
| if partition_type == "Apple_HFS" and partition_size > 0: | ||
| # Found an HFS partition, log it | ||
| partitions.append((partition_start * 0x200, partition_size * 0x200)) | ||
| if partition_num <= num_partitions: | ||
| # Move onto the next partition | ||
| partition_num += 1 | ||
| f.seek(partition_num * 0x200 + 4) | ||
| f.seek(partition_num * 0x200) | ||
| else: | ||
| # We found the one we want or there's none | ||
| # Finished parsing the partition map | ||
| break | ||
| f.seek(partition_start * 0x200) | ||
| vol.read(f.read(partition_size * 0x200)) | ||
| else: | ||
| # Didn't find the Apple Partition Map, break so we can just | ||
| # load the entire image | ||
| break | ||
|
|
||
| if partitions: | ||
| for partition_start, partition_size in partitions: | ||
| f.seek(partition_start) | ||
| vol.read(f.read(partition_size)) | ||
| extract_partition(args, vol) | ||
| else: | ||
| f.seek(0) | ||
| vol.read(f.read()) | ||
| extract_partition(args, vol) | ||
|
|
There was a problem hiding this comment.
The logic for handling partitioned volumes seems sound. It reads the partition map, identifies HFS partitions, and then extracts each partition using the new extract_partition function. However, error handling is missing. Consider adding try-except blocks to handle potential IO errors.
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This was inspired by a LucasArts disc having an additional (empty) HFS partition on the disc. Missing dependency warning was moved so as to not annoy users who only want to use the other modes.