DolphinTool: Allow converting non-GC/Wii files #10507
Conversation
JosJuice
force-pushed
the
convertcommand-non-gc-wii
branch
from
3bdc14a
to
a732f1e
Compare
| return 1; | ||
| } | ||
|
|
||
| // Open the volume | ||
| std::unique_ptr<DiscIO::Volume> volume = DiscIO::CreateDisc(input_file_path); |
There was a problem hiding this comment.
Should we expose the std::unique_ptr<VolumeDisc> TryCreateDisc(std::unique_ptr<BlobReader>& reader) function and use it here so we don't create redundant blob readers?
There was a problem hiding this comment.
That wouldn't work. TryCreateDisc moves the blob reader if the operation is successful, and we need to be able to keep using the blob reader after creating the volume.
Do you think adding a GetBlobReader function to the Volume class could make sense instead?
There was a problem hiding this comment.
Hm, fair enough.
The BlobReader appears to be stateless (ie, we don't require its user to remember the last read position or anything) so we can probably do that, yes.
There was a problem hiding this comment.
Hm, but if I move the blob reader into CreateDisc(std::unique_ptr<BlobReader>), the blob reader is gone if creating the volume fails... And we can't know if creating the volume will fail until we actually call it. So we would still need to expose TryCreateDisc, which I'm a little reluctant to do because its behavior of sometimes moving what you pass in is non-intuitive.
This problem is a bit tricker than I thought. Could we skip it for this PR?
There was a problem hiding this comment.
Yeah sure, it's not really a big deal, I just thought about it while reading the diff.
This was requested by a forum user, and I thought why not. It's a simple change to make since DiscIO already supports it, and I assume command-line users know roughly what they're doing.
JosJuice
force-pushed
the
convertcommand-non-gc-wii
branch
from
a732f1e
to
d0d2702
Compare
| success = DiscIO::ConvertToGCZ(blob_reader.get(), input_file_path, output_file_path, | ||
| volume->GetVolumeType() == DiscIO::Platform::WiiDisc ? 1 : 0, | ||
| { | ||
| u32 sub_type = std::numeric_limits<u32>::max(); |
There was a problem hiding this comment.
Is this an existing convention for non-GC/non-Wii GCZ files to have a sub_type of 0xFFFFFFFF, or did you make this up?
There was a problem hiding this comment.
I made it up. Dolphin has never had the ability to convert non-GC/Wii files to GCZ before, and there's no documentation on the format other than the source code.
|
Untested, but looks good to me. |
|
Converted a few isos back-and-forth, worked fine. |
This was requested by a forum user, and I thought why not. It's a simple change to make since DiscIO already supports it, and I assume command-line users know roughly what they're doing.