zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-05-09 22:14:56 +00:00
Code Issues Packages Projects Wiki Activity

Unlinker: Make Unlinker handle each zone directly after loading so it doesn't run out of memory when trying to load too many zones at once

Browse Source
This commit is contained in:
Jan 2019-12-24 18:42:25 +01:00
parent 7121f2e215
commit e8de3a3f39
1 changed files with 51 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/Unlinker/main.cpp
View File

@ -63,6 +63,54 @@ std::string ResolveOutputFolderPath(const std::string& path, Zone* zone)
return std::regex_replace(path, std::regex("%zoneName%"), zone->m_name); return std::regex_replace(path, std::regex("%zoneName%"), zone->m_name);
} }
bool HandleZone(Zone* zone, ArgumentParser* argumentParser)
{
if (argumentParser->IsOptionSpecified(optionList))
{
const ContentPrinter printer(zone);
printer.PrintContent();
}
else
{
const bool minimalisticZoneDefinition = argumentParser->IsOptionSpecified(optionMinimalZoneFile);
std::string outputFolderPath;
if (argumentParser->IsOptionSpecified(optionOutputFolder))
{
outputFolderPath = ResolveOutputFolderPath(argumentParser->GetValueForOption(optionOutputFolder), zone);
}
else
{
outputFolderPath = ResolveOutputFolderPath("./%zoneName%", zone);
}
FileAPI::DirectoryCreate(outputFolderPath);
const std::string zoneDefinitionFileFolder = utils::Path::Combine(outputFolderPath, "zone_source");
FileAPI::DirectoryCreate(zoneDefinitionFileFolder);
FileAPI::File zoneDefinitionFile = FileAPI::Open(
utils::Path::Combine(zoneDefinitionFileFolder, zone->m_name + ".zone"),
FileAPI::Mode::MODE_WRITE);
if (zoneDefinitionFile.IsOpen())
{
ZoneLoading::WriteZoneDefinition(zone, &zoneDefinitionFile, minimalisticZoneDefinition);
ZoneLoading::DumpZone(zone, outputFolderPath);
}
else
{
printf("Failed to open file for zone definition file of zone '%s'.\n", zone->m_name.c_str());
return false;
}
zoneDefinitionFile.Close();
}
return true;
}
int main(const int argc, const char** argv) int main(const int argc, const char** argv)
{ {
ArgumentParser argumentParser(commandLineOptions, _countof(commandLineOptions)); ArgumentParser argumentParser(commandLineOptions, _countof(commandLineOptions));
@ -87,8 +135,6 @@ int main(const int argc, const char** argv)
return 1; return 1;
} }
std::vector<Zone*> loadedZones;
for (unsigned argIndex = 1; argIndex < argCount; argIndex++) for (unsigned argIndex = 1; argIndex < argCount; argIndex++)
{ {
const std::string& zonePath = arguments[argIndex]; const std::string& zonePath = arguments[argIndex];
@ -100,55 +146,12 @@ int main(const int argc, const char** argv)
return 1; return 1;
} }
loadedZones.push_back(zone); if(!HandleZone(zone, &argumentParser))
{
return 1;
} }
if (argumentParser.IsOptionSpecified(optionList)) delete zone;
{
for (auto zone : loadedZones)
{
ContentPrinter printer(zone);
printer.PrintContent();
}
}
else
{
const bool minimalisticZoneDefinition = argumentParser.IsOptionSpecified(optionMinimalZoneFile);
for (auto zone : loadedZones)
{
std::string outputFolderPath;
if (argumentParser.IsOptionSpecified(optionOutputFolder))
{
outputFolderPath = ResolveOutputFolderPath(argumentParser.GetValueForOption(optionOutputFolder), zone);
}
else
{
outputFolderPath = ResolveOutputFolderPath("./%zoneName%", zone);
}
FileAPI::DirectoryCreate(outputFolderPath);
std::string zoneDefinitionFileFolder = utils::Path::Combine(outputFolderPath, "zone_source");
FileAPI::DirectoryCreate(zoneDefinitionFileFolder);
FileAPI::File zoneDefinitionFile = FileAPI::Open(
utils::Path::Combine(zoneDefinitionFileFolder, zone->m_name + ".zone"),
FileAPI::Mode::MODE_WRITE);
if (zoneDefinitionFile.IsOpen())
{
ZoneLoading::WriteZoneDefinition(zone, &zoneDefinitionFile, minimalisticZoneDefinition);
ZoneLoading::DumpZone(zone, outputFolderPath);
}
else
{
printf("Failed to open file for zone definition file of zone '%s'.\n", zone->m_name.c_str());
}
zoneDefinitionFile.Close();
}
} }
return 0; return 0;