Merge pull request #5 from sussy-drip/master

Overhauling argument behavior

Author: jcageman

.gitignore

@@ -39,5 +39,7 @@
 .vs
 Debug
 Release
+vcpkg
+.vscode
 vcpkg_installed
 *.user

README.md

@@ -5,29 +5,58 @@ A diablo 2 1.13C installation is required, but this API should work for all vers
 
 ## Installation
 
-Download & install vcpkg https://github.com/microsoft/vcpkg (don't forget to add to path)
+First install [vcpkg](https://github.com/microsoft/vcpkg)
 
-Dependencies should now be installed and included for you when building from source.
+### Windows
+```
+git clone https://github.com/microsoft/vcpkg
+.\vcpkg\bootstrap-vcpkg.bat
+```
+
+### Unix
+```
+git clone https://github.com/microsoft/vcpkg
+.\vcpkg\bootstrap-vcpkg.sh
+```
+
+The binary will be located here `.\vcpkg\vcpkg`, make sure to include the absolute path to this in your system path environment variable and restart your shell. Once done setup a vcpkg integration by running:
+
+```
+vcpkg integrate install
+```
+
+If you are using Visual Studio to build this project, vcpkg dependencies will be automatically installed and included to this repository. If not, you will need to manually fetch and include the following packages:
 
-If required, manually install and include these dependences:
 ```
 vcpkg install boost-uuid
 vcpkg install restinio
 vcpkg install json-dto
 ```
 
+You should now be able to build d2mapapi.sln
+
 ## Usage
 
-d2mapapi.exe DIABLO2_PATH \[ADDRESS_OVERRIDE\]
+Syntax:
+```
+d2mapapi.exe {pathToDiablo2} [optionalArguments]
+```
+
+#### Optional Arguments
+    * -i or --ip
+        specify an IP address to use instead of localhost. ex: `-i 192.168.0.1` OR `--ip=192.168.0.1`";
+    * -p or --port
+        specify n port address to use instead of the default 8080. ex: `-p 8080` OR `--port=8080`";
+    * -h or --help
+        display usage information
 
-Examples:
+#### Examples
 ```
 d2mapapi.exe "C:\Diablo II1.13c"
-d2mapapi.exe "C:\Diablo II1.13c" "0.0.0.0"
+d2mapapi.exe "C:\Diablo II1.13c" --ip=0.0.0.0 --port=88
+d2mapapi.exe "C:\Diablo II1.13c" --port=80
 ```
 
-Starts the webserver
-
 ## Running in Docker
 
 This requires [Docker Desktop](https://www.docker.com/products/docker-desktop)
@@ -43,7 +72,7 @@ WORKDIR /app
 # d2mapapi should be in the same folder as your dockerfile
 COPY ./d2mapapi .
 EXPOSE 8080
-CMD ["wine", "d2mapapi.exe", "/app/game", "0.0.0.0"]
+CMD ["wine", "d2mapapi.exe", "/app/game", "--ip=0.0.0.0"]
 ```
 
 [Download the latest release](https://github.com/jcageman/d2mapapi/releases)

d2mapapi/Helpers.cpp

@@ -0,0 +1,23 @@
+#include <iostream>
+#include <string>
+#include <regex>
+
+std::string extractArg(std::string arg) {
+	std::regex rgx("--\\w+=(.+)");
+	std::smatch match;
+	if (std::regex_search(arg, match, rgx)) {
+		return match[1];
+	}
+	else {
+		std::cerr << "Failed to extract value in argument: " + arg;
+		return "";
+	}
+}
+
+void printHelp() {
+	std::cerr << "Usage: program.exe {diablo2dir} [optionalArguments]\n";
+	std::cerr << "\t-i or --ip\n\t\tspecify an IP address to use instead of localhost.\n\t\tex: -i 192.168.0.1 OR --ip=192.168.0.1\n";
+	std::cerr << "\t-p or --port\n\t\tspecify an port address to use instead of the default 8080.\n\t\tex: -p 8080 OR --port=8080\n";
+	std::cerr << "\t-h or --help\n\t\tprints this usage information\n";
+	std::cerr << "Example: program.exe \"C:\\Diablo II1.13c\"\nor\nExample: program.exe \"C:\\Diablo II1.13c\" -i 0.0.0.0 -p 8888";
+}

d2mapapi/Helpers.h

@@ -0,0 +1,5 @@
+#pragma once
+#include <string>
+
+void printHelp();
+std::string extractArg(std::string arg);

d2mapapi/d2mapapi.vcxproj

@@ -21,12 +21,14 @@
     <ClCompile Include="NewSessionDto.cpp" />
     <ClCompile Include="Session.cpp" />
     <ClCompile Include="SessionDto.cpp" />
+    <ClCompile Include="Helpers.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CollisionMap.h" />
     <ClInclude Include="D2Map.h" />
     <ClInclude Include="D2Ptrs.h" />
     <ClInclude Include="D2Structs.h" />
+    <ClInclude Include="Helpers.h" />
     <ClInclude Include="MapDto.h" />
     <ClInclude Include="MapRequestHandler.h" />
     <ClInclude Include="Offset.h" />

d2mapapi/main.cpp

@@ -4,23 +4,21 @@
 
 #include "D2Map.h"
 #include "ServerHandler.h"
-
-
+#include "Helpers.h"
 
 int main( int argc, const char* argv[] ) {
+    int i;
 
 	// Check command line arguments.
 	if (argc < 2)
 	{
-		std::cerr << "Usage: program.exe {diablo2dir} [addressOverride]\n";
-		std::cerr << "Example: program.exe \"C:\\Diablo II1.13c\"\nor\nExample: program.exe \"C:\\Diablo II1.13c\" 0.0.0.0";
+		printHelp();
 		return 1;
 	}
 
 	using namespace std::chrono;
 	try
 	{
-		
 		init( argv[1] );
 
 		using traits_t =
@@ -30,14 +28,57 @@ int main( int argc, const char* argv[] ) {
 			router_t >;
 
 		std::string address = "localhost";
+		std::uint16_t port = 8080;
+
+		// handle args in this loop:
+		for(i=2; i<argc; ++i)
+		{	
+			std::string tmpArg = argv[i];
+			std::string argVal;
+
+			if (tmpArg == "-h" || tmpArg == "--help")
+			{
+				printHelp();
+				return 0;
+			}
+
+			if (tmpArg == "-i") 
+				address = argv[i + 1];
+
+			if (tmpArg == "-p")
+			{
+				std::string tmpPort = argv[i + 1];
+				port = std::stoi(tmpPort);
+			}
+
+			if (tmpArg.find("--ip") != std::string::npos)
+			{
+				argVal = extractArg(tmpArg);
+				if (argVal == "") {
+					return 1;
+				}
+				else {
+					address = argVal;
+				}
+			}
+
 
-		if (argc == 3) {
-			address = argv[2];
+			if (tmpArg.find("--port") != std::string::npos)
+			{
+				argVal = extractArg(tmpArg);
+				if (argVal == "") {
+					return 1;
+				}
+				else {
+					port = std::stoi(extractArg(tmpArg));
+				}
+			}
 		}
 
 		restinio::run(
 			restinio::on_this_thread< traits_t >()
 			.address( address )
+			.port( port )
 			.request_handler( map::create_server_handler() )
 			.read_next_http_message_timelimit( 10s )
 			.write_http_response_timelimit( 1s )
@@ -50,4 +91,4 @@ int main( int argc, const char* argv[] ) {
 	}
 
 	return 0;
-}
+}