From 462a9446bd7742ee55da2bd2a51cd319e3d217d8 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Wed, 30 Jul 2025 17:37:07 -0500 Subject: [PATCH 1/3] fix --- repertory/repertory/src/ui/handlers.cpp | 29 +++++++++++-------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/repertory/repertory/src/ui/handlers.cpp b/repertory/repertory/src/ui/handlers.cpp index 47fe87d0..df79de16 100644 --- a/repertory/repertory/src/ui/handlers.cpp +++ b/repertory/repertory/src/ui/handlers.cpp @@ -120,22 +120,6 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server) } #endif // defined(_WIN32) - if (not config_->get_launch_only()) { -#if defined(_WIN32) - system( - fmt::format( - R"(start "Repertory Management Portal" "http://127.0.0.1:{}/ui")", - config_->get_api_port()) - .c_str()); -#elif defined(__linux__) - system(fmt::format(R"(xdg-open "http://127.0.0.1:{}/ui")", - config_->get_api_port()) - .c_str()); -#else // error - build fails here -#endif - } - std::uint16_t port{}; if (not utils::get_next_available_port(config_->get_api_port(), port)) { fmt::println("failed to detect if port is available|{}", @@ -280,6 +264,19 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server) #endif // !defined(_WIN32) std::signal(SIGTERM, quit_handler); +#if defined(_WIN32) + system(fmt::format( + R"(start "Repertory Management Portal" "http://127.0.0.1:{}/ui")", + config_->get_api_port()) + .c_str()); +#elif defined(__linux__) + system(fmt::format(R"(xdg-open "http://127.0.0.1:{}/ui")", + config_->get_api_port()) + .c_str()); +#else // error + build fails here +#endif + event_system::instance().start(); nonce_thread_ = From f8451c5514e7e5c1789b17b6db2e83fdd913a95a Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Wed, 30 Jul 2025 17:43:19 -0500 Subject: [PATCH 2/3] refactor --- repertory/repertory/src/ui/handlers.cpp | 58 +++++++++++-------------- 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/repertory/repertory/src/ui/handlers.cpp b/repertory/repertory/src/ui/handlers.cpp index df79de16..8da7e00d 100644 --- a/repertory/repertory/src/ui/handlers.cpp +++ b/repertory/repertory/src/ui/handlers.cpp @@ -114,25 +114,6 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server) server_(server) { REPERTORY_USES_FUNCTION_NAME(); -#if defined(_WIN32) - if (config_->get_hidden()) { - ::ShowWindow(::GetConsoleWindow(), SW_HIDE); - } -#endif // defined(_WIN32) - - std::uint16_t port{}; - if (not utils::get_next_available_port(config_->get_api_port(), port)) { - fmt::println("failed to detect if port is available|{}", - config_->get_api_port()); - return; - } - - if (port != config_->get_api_port()) { - fmt::println("failed to listen on port|{}|next available|{}", - config_->get_api_port(), port); - return; - } - server_->set_socket_options([](auto &&sock) { #if defined(_WIN32) int enable{1}; @@ -247,6 +228,32 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server) handle_put_settings(req, res); }); +#if defined(_WIN32) + system(fmt::format( + R"(start "Repertory Management Portal" "http://127.0.0.1:{}/ui")", + config_->get_api_port()) + .c_str()); +#elif defined(__linux__) + system(fmt::format(R"(xdg-open "http://127.0.0.1:{}/ui")", + config_->get_api_port()) + .c_str()); +#else // error + build fails here +#endif + + std::uint16_t port{}; + if (not utils::get_next_available_port(config_->get_api_port(), port)) { + fmt::println("failed to detect if port is available|{}", + config_->get_api_port()); + return; + } + + if (port != config_->get_api_port()) { + fmt::println("failed to listen on port|{}|next available|{}", + config_->get_api_port(), port); + return; + } + static std::atomic this_server{server_}; static const auto quit_handler = [](int /* sig */) { auto *ptr = this_server.load(); @@ -264,19 +271,6 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server) #endif // !defined(_WIN32) std::signal(SIGTERM, quit_handler); -#if defined(_WIN32) - system(fmt::format( - R"(start "Repertory Management Portal" "http://127.0.0.1:{}/ui")", - config_->get_api_port()) - .c_str()); -#elif defined(__linux__) - system(fmt::format(R"(xdg-open "http://127.0.0.1:{}/ui")", - config_->get_api_port()) - .c_str()); -#else // error - build fails here -#endif - event_system::instance().start(); nonce_thread_ = From 2cba8936c4566e36a9946f98b76f1afce5333e2c Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Wed, 30 Jul 2025 18:00:53 -0500 Subject: [PATCH 3/3] updated version --- config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.sh b/config.sh index 1d60f196..5fe91976 100755 --- a/config.sh +++ b/config.sh @@ -11,8 +11,8 @@ PROJECT_DESC="Mount utility for Sia and S3" PROJECT_MAJOR_VERSION=2 PROJECT_MINOR_VERSION=0 PROJECT_REVISION_VERSION=7 -PROJECT_RELEASE_NUM=0 -PROJECT_RELEASE_ITER=rc +PROJECT_RELEASE_NUM=1 +PROJECT_RELEASE_ITER=release PROJECT_APP_LIST=(${PROJECT_NAME})