diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c29f4c..063fe74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,7 @@ src/Filesystem/NullFilesystem.cpp src/Filesystem/MountableFilesystem.cpp src/Crypto/ClientTLSStream.cpp src/Crypto/MbedHelpers.cpp +src/Args.cpp src/TF_Init.cpp src/wrapper.cpp src/HiddenField.cpp diff --git a/include/TessesFramework/Args.hpp b/include/TessesFramework/Args.hpp new file mode 100644 index 0000000..03aead2 --- /dev/null +++ b/include/TessesFramework/Args.hpp @@ -0,0 +1,13 @@ +#pragma once +#include "Common.hpp" +namespace Tesses::Framework { + class Args { + public: + Args(std::vector args); + Args(int argc, char** argv); + std::string filename; + std::vector positional; + std::vector flags; + std::vector> options; + }; +} \ No newline at end of file diff --git a/include/TessesFramework/TessesFramework.hpp b/include/TessesFramework/TessesFramework.hpp index b013bfa..a5fa039 100644 --- a/include/TessesFramework/TessesFramework.hpp +++ b/include/TessesFramework/TessesFramework.hpp @@ -37,4 +37,5 @@ #include "Serialization/SQLite.hpp" #include "Platform/Environment.hpp" #include "Platform/Process.hpp" -#include "Serialization/BitConverter.hpp" \ No newline at end of file +#include "Serialization/BitConverter.hpp" +#include "Args.hpp" \ No newline at end of file diff --git a/src/Args.cpp b/src/Args.cpp new file mode 100644 index 0000000..d48f44e --- /dev/null +++ b/src/Args.cpp @@ -0,0 +1,60 @@ +#include "TessesFramework/TessesFramework.hpp" + +namespace Tesses::Framework { + Args::Args(std::vector args) + { + if(args.size() < 1) return; + filename = args[0]; + bool onlyPos=false; + + for(size_t i = 1; i < args.size(); i++) + { + std::string& arg = args[i]; + if(arg == "--") + { + onlyPos=true; + continue; + } + if(!onlyPos && arg.size() > 2 && arg[0] == '-' && arg[1] == '-') + { + auto p = Tesses::Framework::Http::HttpUtils::SplitString(arg.substr(2),"=",2); + if(p.size() == 1) + flags.push_back(p[0]); + else if(p.size() == 2) + options.push_back(std::pair(p[0],p[1])); + } + else { + positional.push_back(arg); + } + } + + } + Args::Args(int argc, char** argv) + { + if(argc < 1) return; + filename = argv[0]; + bool onlyPos=false; + + for(int i = 1; i < argc; i++) + { + std::string_view arg = argv[i]; + if(arg == "--") + { + onlyPos=true; + continue; + } + if(!onlyPos && arg.size() > 2 && arg[0] == '-' && arg[1] == '-') + { + auto p = Tesses::Framework::Http::HttpUtils::SplitString((std::string)arg.substr(2),"=",2); + if(p.size() == 1) + flags.push_back(p[0]); + else if(p.size() == 2) + options.push_back(std::pair(p[0],p[1])); + } + else { + positional.push_back((std::string)arg); + } + } + + } +} \ No newline at end of file