link SettingsAction directly with RouteType to clean Router::routeSet…

…tings(), remove some old code
chalet-org · Jun 13, 2022 · 1999d28 · 1999d28
1 parent 8576fe7
commit 1999d28
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 65 deletions.
diff --git a/src/Core/Application.cpp b/src/Core/Application.cpp
@@ -60,9 +60,6 @@ bool Application::handleRoute()
 /*****************************************************************************/
 void Application::initializeTerminal()
 {
-	// Output::resetStdout();
-	// Output::resetStderr();
-
 #if defined(CHALET_WIN32)
 	WindowsTerminal::initialize();
 #endif
@@ -75,7 +72,6 @@ void Application::initializeTerminal()
 		Diagnostic::printErrors();
 		this->cleanup();
 	});
-	testSignalHandling();
 #endif // _DEBUG
 }
 
@@ -107,20 +103,4 @@ void Application::cleanup()
 #endif
 }
 
-/*****************************************************************************/
-void Application::testSignalHandling()
-{
-	// int* test = nullptr;
-	// chalet_assert(test != nullptr, ""); // SIGABRT / abort
-	// int test2 = *test;					// SIGSEGV / segmentation fault
-
-	// int a = 0;
-	// int test2 = 25 / a; // SIGFPE / arithmetic error
-
-	// LOG(test2);
-
-	// ::raise(SIGILL);
-	// ::raise(SIGTERM);
-	// ::raise(SIGABRT); // generic abort
-}
 }
diff --git a/src/Core/Application.hpp b/src/Core/Application.hpp
@@ -31,8 +31,6 @@ class Application
 	int onExit(const Status inStatus);
 	void cleanup();
 
-	void testSignalHandling();
-
 	Unique<CommandLineInputs> m_inputs;
 };
 }

diff --git a/src/Router/Router.cpp b/src/Router/Router.cpp
@@ -217,27 +217,8 @@ bool Router::routeSettings()
 {
 	const auto& route = m_inputs.route();
 
-	SettingsAction action = SettingsAction::Get;
-	switch (route.type())
-	{
-		case RouteType::SettingsSet:
-			action = SettingsAction::Set;
-			break;
-		case RouteType::SettingsGet:
-			action = SettingsAction::Get;
-			break;
-		case RouteType::SettingsUnset:
-			action = SettingsAction::Unset;
-			break;
-		case RouteType::SettingsGetKeys:
-			action = SettingsAction::QueryKeys;
-			break;
-		default:
-			return false;
-	}
-
 	SettingsManager settingsMgr(m_inputs);
-	if (!settingsMgr.run(action))
+	if (!settingsMgr.run(static_cast<SettingsAction>(route.type())))
 		return true;
 
 	return true;

diff --git a/src/Settings/SettingsAction.hpp b/src/Settings/SettingsAction.hpp
@@ -6,14 +6,16 @@
 #ifndef CHALET_SETTINGS_ACTION_HPP
 #define CHALET_SETTINGS_ACTION_HPP
 
+#include "Router/RouteType.hpp"
+
 namespace chalet
 {
-enum class SettingsAction : ushort
+enum class SettingsAction : std::underlying_type_t<RouteType>
 {
-	Get,
-	Set,
-	Unset,
-	QueryKeys,
+	Get = static_cast<std::underlying_type_t<RouteType>>(RouteType::SettingsGet),
+	Set = static_cast<std::underlying_type_t<RouteType>>(RouteType::SettingsSet),
+	Unset = static_cast<std::underlying_type_t<RouteType>>(RouteType::SettingsUnset),
+	QueryKeys = static_cast<std::underlying_type_t<RouteType>>(RouteType::SettingsGetKeys),
 };
 }
 

diff --git a/src/Terminal/Output.cpp b/src/Terminal/Output.cpp
@@ -295,22 +295,6 @@ void Output::displayStyledSymbol(const Color inColor, const std::string_view inS
 	}
 }
 
-/*****************************************************************************/
-void Output::resetStdout()
-{
-	auto reset = getAnsiStyle(Color::Reset);
-	std::cout.write(reset.data(), reset.size());
-	std::cout.flush();
-}
-
-/*****************************************************************************/
-void Output::resetStderr()
-{
-	auto reset = getAnsiStyle(Color::Reset);
-	std::cerr.write(reset.data(), reset.size());
-	std::cerr.flush();
-}
-
 /*****************************************************************************/
 void Output::lineBreak(const bool inForce)
 {

diff --git a/src/Terminal/Output.hpp b/src/Terminal/Output.hpp
@@ -43,8 +43,6 @@ std::string getAnsiStyleForMakefile(const Color inColor);
 std::string getAnsiStyleForceFormatting(const Color inColor, const Formatting inFormatting);
 
 void displayStyledSymbol(const Color inColor, const std::string_view inSymbol, const std::string& inMessage);
-void resetStdout();
-void resetStderr();
 void lineBreak(const bool inForce = false);
 void lineBreakStderr();
 void previousLine(const bool inForce = false);