Support newer bootleby format #499
Merged
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
|
Fixes #498 |
labbott
force-pushed
the
newer_bootleby
branch
2 times, most recently
from
b1f5314 to
b61ee3c
Compare
Newer bootleby looks like a hubris archive
lzrd
approved these changes
Jul 30, 2024
mkeeter
reviewed
Jul 30, 2024
| @@ -42,13 +42,20 @@ fn rebootleby(context: &mut ExecutionContext) -> Result<()> { | |||
| let mut zip = | |||
| ZipArchive::new(bundle_reader).context("opening bundle file as ZIP")?; | |||
|
|
|||
| let img_bootleby = { | |||
| let img_bootleby = if zip.file_names().any(|x| x == "bootleby.bin") { | |||
There was a problem hiding this comment.
You could probably do something like this (untested)
let img_bootleby = {
let mut entry = zip
.by_name("bootleby.bin")
.or_else("img/final.bin")
.context("can't find bootleby.bin or img/final.bin in bundle")?;
let mut data = vec![];
entry.read_to_end(&mut data).context("reading bootleby binary")?;
data
};There was a problem hiding this comment.
yeah I wanted to do something like that but or_else requires a closure FnOnce(E) -> Result<T, F>. I gave up trying to figure out the correct combinator incantation.
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.
Newer bootleby looks like a hubris archive