Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ code/
.vscode/
tools/
modding/*
.cache

# Doxygen output
docs/html
Expand Down
14 changes: 14 additions & 0 deletions src/Companion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1313,6 +1313,20 @@ void Companion::Process() {
}

if(wrapper != nullptr) {
// Add additional files specified by the user
for (const auto& filePath : this->gAdditionalFiles) {
std::ifstream input(this->gSourceDirectory / filePath, std::ios::binary);
if (input.is_open()) {
std::vector<char> data((std::istreambuf_iterator<char>(input)), std::istreambuf_iterator<char>());
input.close();
std::string filename = fs::path(filePath).filename().string();
wrapper->AddFile(filename, data);
SPDLOG_INFO("Added additional file: {}", filename);
} else {
SPDLOG_WARN("Could not open additional file: {}", filePath);
}
}

SPDLOG_CRITICAL("Writing version file");
wrapper->AddFile("version", vWriter.ToVector());
vWriter.Close();
Expand Down
2 changes: 2 additions & 0 deletions src/Companion.h
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ class Companion {
std::string RelativePathToSrcDir(const std::string& path) const;
std::string RelativePathToDestDir(const std::string& path) const;
void RegisterCompanionFile(const std::string path, std::vector<char> data);
void SetAdditionalFiles(const std::vector<std::string>& files) { this->gAdditionalFiles = files; }

TorchConfig& GetConfig() { return this->gConfig; }
BinaryWrapper* GetCurrentWrapper() { return this->gCurrentWrapper; }
Expand Down Expand Up @@ -226,6 +227,7 @@ class Companion {

std::unordered_map<std::string, std::vector<char>> gCompanionFiles;
std::unordered_map<std::string, std::vector<ParseResultData>> gParseResults;
std::vector<std::string> gAdditionalFiles;

std::unordered_map<std::string, std::string> gModdedAssetPaths;
std::variant<std::vector<std::string>, std::string> gWriteOrder;
Expand Down
3 changes: 3 additions & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ int main(int argc, char *argv[]) {
bool debug = false;
std::string srcdir;
std::string destdir;
std::vector<std::string> additionalFiles;

app.require_subcommand();

Expand All @@ -43,9 +44,11 @@ int main(int argc, char *argv[]) {
o2r->add_flag("-v,--verbose", debug, "Verbose Debug Mode");
o2r->add_option("-s,--srcdir", srcdir, "Set source directory to locate config.yml and asset metadata for processing")->check(CLI::ExistingDirectory);
o2r->add_option("-d,--destdir", destdir, "Set destination directory for export");
o2r->add_option("-a,--additional-files", additionalFiles, "Additional files to include in the o2r archive (e.g., mods.toml)")->check(CLI::ExistingFile);

o2r->parse_complete_callback([&] {
const auto instance = Companion::Instance = new Companion(filename, ArchiveType::O2R, debug, srcdir, destdir);
instance->SetAdditionalFiles(additionalFiles);
instance->Init(ExportType::Binary);
});

Expand Down