Bulk assets (mp3, png) are already compressed at the file level, so a DEFLATE pass on top bought negligible space for real CPU cost. Packs everything into a single ZIP_STORED archive instead, so every entry (not just locale/*) gets the reliable repeated seeking/re-opening that libzip only supports for uncompressed entries. Header shrinks from 32 to 16 bytes; version bumped to 2 so a stale pre-change dusk.dsk is rejected and rebuilt rather than misread. Co-Authored-By: Claude Sonnet 5 <[email protected]>
166 lines
4.3 KiB
C
166 lines
4.3 KiB
C
/**
|
|
* Copyright (c) 2026 Dominic Masters
|
|
*
|
|
* This software is released under the MIT License.
|
|
* https://opensource.org/licenses/MIT
|
|
*/
|
|
|
|
#include "assetdsk.h"
|
|
#include "util/memory.h"
|
|
#include "util/endian.h"
|
|
#include "assert/assert.h"
|
|
#include <zlib.h>
|
|
|
|
errorret_t assetDskParseHeader(
|
|
const uint8_t *bytes,
|
|
const size_t bytesSize,
|
|
assetdskheader_t *outHeader
|
|
) {
|
|
assertNotNull(bytes, "Bytes cannot be NULL.");
|
|
assertNotNull(outHeader, "Out header cannot be NULL.");
|
|
|
|
if(bytesSize < ASSET_DSK_HEADER_SIZE) {
|
|
errorThrow("dusk.dsk header is truncated.");
|
|
}
|
|
|
|
if(memoryCompare(bytes, ASSET_DSK_MAGIC, ASSET_DSK_MAGIC_SIZE) != 0) {
|
|
errorThrow("dusk.dsk has an invalid magic header.");
|
|
}
|
|
|
|
// Every field is a little-endian uint32_t regardless of host - convert
|
|
// to host order (a no-op on little-endian hosts, a real byteswap on
|
|
// Dolphin's big-endian PowerPC).
|
|
uint32_t fields[3];
|
|
memoryCopy(fields, bytes + ASSET_DSK_MAGIC_SIZE, sizeof(fields));
|
|
for(uint8_t i = 0; i < 3; i++) {
|
|
fields[i] = endianLittleToHost32(fields[i]);
|
|
}
|
|
|
|
const uint32_t version = fields[0];
|
|
if(version != ASSET_DSK_VERSION) {
|
|
errorThrow("dusk.dsk has an unsupported version: %u", version);
|
|
}
|
|
|
|
outHeader->size = fields[1];
|
|
outHeader->checksum = fields[2];
|
|
|
|
errorOk();
|
|
}
|
|
|
|
errorret_t assetDskOpenFromPath(
|
|
const char_t *path,
|
|
zip_t **outZip
|
|
) {
|
|
errorChain(assetDskOpenFromPathRange(path, 0, SIZE_MAX, outZip));
|
|
errorOk();
|
|
}
|
|
|
|
errorret_t assetDskOpenFromPathRange(
|
|
const char_t *path,
|
|
const size_t baseOffset,
|
|
const size_t baseSize,
|
|
zip_t **outZip
|
|
) {
|
|
assertNotNull(path, "Path cannot be NULL.");
|
|
assertNotNull(outZip, "Out zip cannot be NULL.");
|
|
|
|
*outZip = NULL;
|
|
|
|
FILE *headerFile = fopen(path, "rb");
|
|
if(headerFile == NULL) {
|
|
errorThrow("Failed to open dusk.dsk: %s", path);
|
|
}
|
|
|
|
if(fseek(headerFile, (long) baseOffset, SEEK_SET) != 0) {
|
|
fclose(headerFile);
|
|
errorThrow("Failed to seek to dusk.dsk range in file: %s", path);
|
|
}
|
|
|
|
uint8_t headerBytes[ASSET_DSK_HEADER_SIZE];
|
|
size_t headerRead = fread(headerBytes, 1, sizeof(headerBytes), headerFile);
|
|
fclose(headerFile);
|
|
if(headerRead != sizeof(headerBytes)) {
|
|
errorThrow("Failed to read dusk.dsk header: %s", path);
|
|
}
|
|
|
|
assetdskheader_t header;
|
|
errorChain(assetDskParseHeader(headerBytes, sizeof(headerBytes), &header));
|
|
|
|
if((size_t) ASSET_DSK_HEADER_SIZE + header.size > baseSize) {
|
|
errorThrow("dusk.dsk header describes a range beyond its containing file.");
|
|
}
|
|
|
|
zip_error_t zipError;
|
|
zip_error_init(&zipError);
|
|
|
|
zip_source_t *source = zip_source_file_create(
|
|
path,
|
|
(zip_uint64_t) (baseOffset + ASSET_DSK_HEADER_SIZE),
|
|
(zip_int64_t) header.size,
|
|
&zipError
|
|
);
|
|
if(source == NULL) {
|
|
errorThrow(
|
|
"Failed to create dusk.dsk source: %s", zip_error_strerror(&zipError)
|
|
);
|
|
}
|
|
|
|
*outZip = zip_open_from_source(source, ZIP_RDONLY, &zipError);
|
|
if(*outZip == NULL) {
|
|
zip_source_free(source);
|
|
errorThrow(
|
|
"Failed to open dusk.dsk archive: %s", zip_error_strerror(&zipError)
|
|
);
|
|
}
|
|
|
|
errorOk();
|
|
}
|
|
|
|
errorret_t assetDskOpenFromBuffer(
|
|
uint8_t *buffer,
|
|
const size_t bufferSize,
|
|
zip_t **outZip
|
|
) {
|
|
assertNotNull(buffer, "Buffer cannot be NULL.");
|
|
assertNotNull(outZip, "Out zip cannot be NULL.");
|
|
|
|
*outZip = NULL;
|
|
|
|
assetdskheader_t header;
|
|
errorChain(assetDskParseHeader(buffer, bufferSize, &header));
|
|
|
|
if((size_t) ASSET_DSK_HEADER_SIZE + header.size > bufferSize) {
|
|
errorThrow("dusk.dsk header describes a range beyond the buffer.");
|
|
}
|
|
|
|
uint8_t *data = buffer + ASSET_DSK_HEADER_SIZE;
|
|
uint32_t checksum = (uint32_t) crc32(0L, data, (uInt) header.size);
|
|
if(checksum != header.checksum) {
|
|
errorThrow("dusk.dsk archive failed checksum verification.");
|
|
}
|
|
|
|
zip_error_t zipError;
|
|
zip_error_init(&zipError);
|
|
|
|
// freep=0 - this is a non-owning window into the same caller-owned
|
|
// buffer, not an independent allocation libzip should free.
|
|
zip_source_t *source = zip_source_buffer_create(
|
|
data, header.size, 0, &zipError
|
|
);
|
|
if(source == NULL) {
|
|
errorThrow(
|
|
"Failed to create dusk.dsk source: %s", zip_error_strerror(&zipError)
|
|
);
|
|
}
|
|
|
|
*outZip = zip_open_from_source(source, ZIP_RDONLY, &zipError);
|
|
if(*outZip == NULL) {
|
|
zip_source_free(source);
|
|
errorThrow(
|
|
"Failed to open dusk.dsk archive: %s", zip_error_strerror(&zipError)
|
|
);
|
|
}
|
|
|
|
errorOk();
|
|
}
|