From addf2071f4a0a4f2ed15178d2aad48209bc9785e Mon Sep 17 00:00:00 2001 From: modeco80 Date: Wed, 15 Jan 2025 19:26:43 -0500 Subject: [PATCH] tools/eupak: Refactor out `Arguments` from public view They aren't needed for public view anymore. --- src/tools/eupak/tasks/CreateTask.hpp | 21 +++++++++------------ src/tools/eupak/tasks/InfoTask.hpp | 10 +++++----- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/tools/eupak/tasks/CreateTask.hpp b/src/tools/eupak/tasks/CreateTask.hpp index a42b857..20f4002 100644 --- a/src/tools/eupak/tasks/CreateTask.hpp +++ b/src/tools/eupak/tasks/CreateTask.hpp @@ -18,18 +18,6 @@ namespace eupak::tasks { struct CreateTask : ITask { - /// Arguments. - /// This is no longer directly used by clients - /// and should later be factored out of surface. - struct Arguments { - fs::path inputDirectory; - fs::path outputFile; - - bool verbose; - europa::structs::PakVersion pakVersion; - bool sectorAligned; - }; - CreateTask(); void Init(argparse::ArgumentParser& parentParser) override; @@ -41,6 +29,15 @@ namespace eupak::tasks { int Run() override; private: + struct Arguments { + fs::path inputDirectory; + fs::path outputFile; + + bool verbose; + europa::structs::PakVersion pakVersion; + bool sectorAligned; + }; + argparse::ArgumentParser parser; Arguments currentArgs; }; diff --git a/src/tools/eupak/tasks/InfoTask.hpp b/src/tools/eupak/tasks/InfoTask.hpp index 20fa0ed..b9711a9 100644 --- a/src/tools/eupak/tasks/InfoTask.hpp +++ b/src/tools/eupak/tasks/InfoTask.hpp @@ -16,11 +16,6 @@ namespace eupak::tasks { struct InfoTask : ITask { - struct Arguments { - fs::path inputPath; - bool verbose; - }; - InfoTask(); void Init(argparse::ArgumentParser& parentParser) override; @@ -32,6 +27,11 @@ namespace eupak::tasks { int Run() override; private: + struct Arguments { + fs::path inputPath; + bool verbose; + }; + argparse::ArgumentParser parser; Arguments currentArgs; };