Move logic implementation

Src/ChannelLinter/ChannelLinter.cpp

@@ -1,7 +1,11 @@
-#include "StdAfx.h"
+#include "stdafx.h"
+#include "ChannelLinter.h"
+
 #include "Core/Profiler.h"
 
 namespace MWR::C3::Linter
+{
+	namespace
 	{
 		/// @throws std::runtime_error if channel with given name was not registered
 		auto const& GetChannelInfo(std::string_view channelName)
@@ -37,33 +41,23 @@ namespace MWR::C3::Linter
 		}
 	}
 
-/// Entry point of the application.
+	void ChannelLinter::Process()
-/// @param argc number of program arguments.
-/// @param argv vector of program arguments.
-int main(DWORD argc, char* argv[])
-try
 	{
-	using namespace MWR;
-
-	std::cout << "Custom Command and Control - Channel linter. BUILD: " << C3_BUILD_VERSION << std::endl;
-	C3::Linter::AppConfig context(argc, argv);
-	auto const& config = context.GetConfig();
-
 		// select channel
-	auto const& chInfo = C3::Linter::GetChannelInfo(config.m_ChannelName);
+		auto const& chInfo = C3::Linter::GetChannelInfo(m_Config.m_ChannelName);
 
 		// read create and prompt for arguments
 		auto capability = C3::Linter::GetChannelCapability(chInfo);
 
 		std::cout << "Create channel 1" << std::endl;
 		C3::Linter::Form form(capability.at("/create/arguments"_json_pointer));
-	auto createParams = form.FillForm(config.m_ChannelArguments);
+		auto createParams = form.FillForm(m_Config.m_ChannelArguments);
 		auto channel = C3::Linter::MakeDevice(createParams, chInfo);
 
-	if (config.m_TestChannelIO)
+		if (m_Config.m_TestChannelIO)
 		{
 			std::cout << "Create channel 2" << std::endl;
-		auto const& ch2Args = config.m_ComplementaryChannelArguments ? *config.m_ComplementaryChannelArguments : form.GetComplementaryArgs(config.m_ChannelArguments);
+			auto const& ch2Args = m_Config.m_ComplementaryChannelArguments ? *m_Config.m_ComplementaryChannelArguments : form.GetComplementaryArgs(m_Config.m_ChannelArguments);
 			json createParams2 = form.FillForm(ch2Args);
 			auto ch2 = C3::Linter::MakeDevice(createParams2, chInfo);
 
@@ -75,9 +69,9 @@ try
 				throw std::exception("data sent and received mismatch");
 		}
 
-	if (config.m_Command)
+		if (m_Config.m_Command)
 		{
-		auto& commandParams = *config.m_Command;
+			auto& commandParams = *m_Config.m_Command;
 			auto commandIdL = std::stoi(commandParams.at(0));
 			auto commandId = static_cast<uint16_t>(commandIdL);
 
@@ -92,8 +86,4 @@ try
 			channel->RunCommand(x);
 		}
 	}
-catch (std::exception & e)
-{
-	std::cerr << e.what() << std::endl;
-	return 1;
 }

Src/ChannelLinter/ChannelLinter.h

@@ -0,0 +1,15 @@
+#pragma once
+
+namespace MWR::C3::Linter
+{
+	class ChannelLinter
+	{
+	public:
+		ChannelLinter(AppConfig::Config const& config) : m_Config(config) {}
+		void Process();
+
+	private:
+		AppConfig::Config const& m_Config;
+	};
+}
+

Src/ChannelLinter/ChannelLinter.vcxproj

@@ -296,6 +296,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="ChannelLinter.h" />
     <ClInclude Include="Form.h" />
     <ClInclude Include="FormElement.hpp" />
     <ClInclude Include="AppConfig.h" />
@@ -305,6 +306,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ChannelLinter.cpp" />
+    <ClCompile Include="ChannelLinterMain.cpp" />
     <ClCompile Include="Form.cpp" />
     <ClCompile Include="AppConfig.cpp" />
     <ClCompile Include="InputVector.cpp" />

Src/ChannelLinter/ChannelLinter.vcxproj.filters

@@ -4,12 +4,13 @@
     <Manifest Include="..\Common\MWR\WinTools\OsVersion.manifest" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="ChannelLinter.cpp" />
     <ClCompile Include="Form.cpp" />
     <ClCompile Include="InputVector.cpp" />
     <ClCompile Include="StdAfx.cpp" />
     <ClCompile Include="MockDeviceBridge.cpp" />
     <ClCompile Include="AppConfig.cpp" />
+    <ClCompile Include="ChannelLinterMain.cpp" />
+    <ClCompile Include="ChannelLinter.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Form.h" />
@@ -18,5 +19,6 @@
     <ClInclude Include="StdAfx.h" />
     <ClInclude Include="MockDeviceBridge.h" />
     <ClInclude Include="AppConfig.h" />
+    <ClInclude Include="ChannelLinter.h" />
   </ItemGroup>
 </Project>

Src/ChannelLinter/ChannelLinterMain.cpp

@@ -0,0 +1,21 @@
+#include "StdAfx.h"
+
+
+/// Entry point of the application.
+/// @param argc number of program arguments.
+/// @param argv vector of program arguments.
+int main(DWORD argc, char* argv[])
+try
+{
+	using namespace MWR;
+
+	std::cout << "Custom Command and Control - Channel linter. BUILD: " << C3_BUILD_VERSION << std::endl;
+	C3::Linter::AppConfig context(argc, argv);
+	auto const& config = context.GetConfig();
+	C3::Linter::ChannelLinter(config).Process();
+}
+catch (std::exception & e)
+{
+	std::cerr << e.what() << std::endl;
+	return 1;
+}

Src/ChannelLinter/StdAfx.h

@@ -23,3 +23,4 @@ using json = nlohmann::json;
 #include "FormElement.hpp"
 #include "Form.h"
 #include "MockDeviceBridge.h"
+#include "ChannelLinter.h"