From 8830b64632bc5030df4d6ec0786a754fbcabe0c4 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Wed, 19 Feb 2025 11:57:48 -0600 Subject: [PATCH] refactor --- monitarr/monitarr/include/usage_cmd.hpp | 10 ++++++++++ monitarr/monitarr/main.cpp | 14 ++------------ monitarr/monitarr/src/usage_cmd.cpp | 19 +++++++++++++++++++ 3 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 monitarr/monitarr/include/usage_cmd.hpp create mode 100644 monitarr/monitarr/src/usage_cmd.cpp diff --git a/monitarr/monitarr/include/usage_cmd.hpp b/monitarr/monitarr/include/usage_cmd.hpp new file mode 100644 index 0000000..d129798 --- /dev/null +++ b/monitarr/monitarr/include/usage_cmd.hpp @@ -0,0 +1,10 @@ +#ifndef LIBMONITARR_INCLUDE_USAGE_CMD_HPP_ +#define LIBMONITARR_INCLUDE_USAGE_CMD_HPP_ + +#include "utils/config.hpp" + +namespace monitarr { +[[nodiscard]] auto usage_cmd() -> int; +} // namespace monitarr + +#endif // LIBMONITARR_INCLUDE_USAGE_CMD_HPP_ diff --git a/monitarr/monitarr/main.cpp b/monitarr/monitarr/main.cpp index 0ebb6cf..88b8d96 100644 --- a/monitarr/monitarr/main.cpp +++ b/monitarr/monitarr/main.cpp @@ -4,7 +4,6 @@ #include "initialize.hpp" -#include "actions.hpp" #include "args.hpp" #include "block_cmd.hpp" #include "config_cmd.hpp" @@ -12,6 +11,7 @@ #include "run_cmd.hpp" #include "settings.hpp" #include "show_cmd.hpp" +#include "usage_cmd.hpp" #include "utils/common.hpp" #include "utils/file.hpp" #include "utils/unix.hpp" @@ -71,17 +71,7 @@ auto main(int argc, char **argv) -> int { } else if (has_arg("-c", argc, argv)) { ret = config_cmd(cfg); } else if (argc == 1 || has_arg("-h", argc, argv)) { - fmt::println("usage:"); - fmt::println(" monitarr -b -i -id "); - fmt::println(" blocklist and search record id at configuration index"); - fmt::println(" monitarr -c"); - fmt::println(" display configuration"); - fmt::println(" monitarr -l -i "); - fmt::println(" display server queue at configuration index"); - fmt::println(" monitarr -r"); - fmt::println(" run monitarr server"); - fmt::println(" monitarr -s -i -id "); - fmt::println(" show record id details at configuration index"); + ret = usage_cmd(); } else if (has_arg("-l", argc, argv)) { ret = list_cmd(argc, argv, cfg); } else if (has_arg("-r", argc, argv)) { diff --git a/monitarr/monitarr/src/usage_cmd.cpp b/monitarr/monitarr/src/usage_cmd.cpp new file mode 100644 index 0000000..b494553 --- /dev/null +++ b/monitarr/monitarr/src/usage_cmd.cpp @@ -0,0 +1,19 @@ +#include "usage_cmd.hpp" + +namespace monitarr { +auto usage_cmd() -> int { + fmt::println("usage:"); + fmt::println(" monitarr -b -i -id "); + fmt::println(" blocklist and search record id at configuration index"); + fmt::println(" monitarr -c"); + fmt::println(" display configuration"); + fmt::println(" monitarr -l -i "); + fmt::println(" display server queue at configuration index"); + fmt::println(" monitarr -r"); + fmt::println(" run monitarr server"); + fmt::println(" monitarr -s -i -id "); + fmt::println(" show record id details at configuration index"); + + return 0; +} +} // namespace monitarr