mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 17:24:47 +01:00
Code Issues Releases Wiki Activity

Use ZStandard for Park and Replay Files (#24734)

Browse Source
This commit is contained in:
LRFLEW
2025-08-06 14:50:18 -05:00
committed by GitHub
parent 8ef4b207b9
commit 52e3c774bc
21 changed files with 284 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/openrct2/command_line/ConvertCommand.cpp
View File

@@ -12,6 +12,8 @@
#include "../GameState.h"
#include "../OpenRCT2.h"
#include "../ParkImporter.h"
#include "../PlatformEnvironment.h"
#include "../config/Config.h"
#include "../core/Console.hpp"
#include "../core/Path.hpp"
#include "../object/ObjectManager.h"
@@ -20,14 +22,33 @@
#include "CommandLine.hpp"
#include <cassert>
#include <limits>
#include <memory>
using namespace OpenRCT2;
static int32_t _compressLevel = kParkFileSaveCompressionLevel;
// clang-format off
static constexpr CommandLineOptionDefinition kConvertOptions[]
{
{ CMDLINE_TYPE_INTEGER, &_compressLevel, 'l', "compress-level", "The compression level to use when writing the converted file" },
kOptionTableEnd
};
static exitcode_t HandleCommandConvert(CommandLineArgEnumerator* argEnumerator);
const CommandLineCommand CommandLine::kConvertCommands[]{
// Main commands
DefineCommand("", "<source> [destination]", kConvertOptions, HandleCommandConvert),
kCommandTableEnd
};
// clang-format on
static void WriteConvertFromAndToMessage(FileExtension sourceFileType, FileExtension destinationFileType);
static u8string GetFileTypeFriendlyName(FileExtension fileType);
exitcode_t CommandLine::HandleCommandConvert(CommandLineArgEnumerator* enumerator)
static exitcode_t HandleCommandConvert(CommandLineArgEnumerator* enumerator)
{
exitcode_t result = CommandLine::HandleCommandDefault();
if (result != EXITCODE_CONTINUE)
@@ -48,10 +69,10 @@ exitcode_t CommandLine::HandleCommandConvert(CommandLineArgEnumerator* enumerato
// Get the destination path
const utf8* rawDestinationPath;
if (!enumerator->TryPopString(&rawDestinationPath))
if (!enumerator->TryPopString(&rawDestinationPath) || String::startsWith(rawDestinationPath, "-"))
{
Console::Error::WriteLine("Expected a destination path.");
return EXITCODE_FAIL;
// if no destination path is provided, convert the park file in-place
rawDestinationPath = rawSourcePath;
}
const auto destinationPath = Path::GetAbsolute(rawDestinationPath);
@@ -75,12 +96,12 @@ exitcode_t CommandLine::HandleCommandConvert(CommandLineArgEnumerator* enumerato
case FileExtension::PARK:
if (destinationFileType == FileExtension::PARK)
{
Console::Error::WriteLine("File is already an OpenRCT2 saved game or scenario.");
return EXITCODE_FAIL;
Console::Error::WriteLine(
"File is already an OpenRCT2 saved game or scenario. Updating file version and recompressing.");
}
break;
default:
Console::Error::WriteLine("Only conversion from .SC4, .SV4, .SC6 or .SV6 is supported.");
Console::Error::WriteLine("Only conversion from .SC4, .SV4, .SC6, .SV6, or .PARK is supported.");
return EXITCODE_FAIL;
}
@@ -125,7 +146,7 @@ exitcode_t CommandLine::HandleCommandConvert(CommandLineArgEnumerator* enumerato
auto* windowMgr = Ui::GetWindowManager();
windowMgr->CloseByClass(WindowClass::MainWindow);
exporter->Export(gameState, destinationPath);
exporter->Export(gameState, destinationPath, static_cast<int16_t>(_compressLevel));
}
catch (const std::exception& ex)
{