WIP: initial draft for server cli refactoring

mumble-voip · Oct 21, 2023 · b085481 · b085481
1 parent ccb9e45
commit b085481
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/murmur/main.cpp b/src/murmur/main.cpp
@@ -16,7 +16,8 @@
 #include "ServerDB.h"
 #include "Version.h"
 
-#include <boost/optional.hpp>
+#include <boost/optional/optional_io.hpp>
+#include <boost/tuple/tuple_io.hpp>
 #include <boost/logic/tribool.hpp>
 #include <csignal>
 #include <iostream>
@@ -208,7 +209,7 @@ auto parseCLI(int argc, char **argv) {
  struct {
  bool quit = false;
  boost::optional< std::string > ini_file;
- boost::optional< std::tuple< std::string, int > > supw_srv;
+ boost::optional< boost::tuple< std::string, int > > supw_srv;
  boost::optional< int > disable_su_srv;
  bool verbose_logging = false;
 #ifdef QT_NO_DEBUG
@@ -233,7 +234,7 @@ auto parseCLI(int argc, char **argv) {
  ->option_text("<inifile>")
  ->expected(1, 2)
  ->check(CLI::ExistingFile);
- app.add_option_no_stream("-w,--supw", options.supw_srv, "Set password for 'SuperUser' account on server srv.")
+ app.add_option("-w,--supw", options.supw_srv, "Set password for 'SuperUser' account on server srv.")
  ->option_text("<pw> [srv]")
  ->expected(1, 2);
 #ifdef Q_OS_UNIX
@@ -386,8 +387,8 @@ int main(int argc, char **argv) {
 
  if (cli_options.supw_srv.has_value()) {
  auto tuple = cli_options.supw_srv.get();
- supw = QString::fromStdString(std::get< 0 >(tuple));
- sunum = std::get< 1 >(tuple);
+ supw = QString::fromStdString(tuple.get<0>());
+ sunum = tuple.get<1>();
 #ifdef Q_OS_LINUX
  } else if (cli_options.read_supw_srv.has_value()) {
  // Note that it is essential to set detach = false here. If this is ever to be changed, the code part