feat: Move aspect ratio input parsing into cli

2 files changed, 19 insertions, 5 deletions

diff --git a/src/LEDVideoWall.cpp b/src/LEDVideoWall.cpp
index ad3dc3c..fc447bc 100644
--- a/src/LEDVideoWall.cpp
+++ b/src/LEDVideoWall.cpp
@@ -62,11 +62,12 @@ LEDVideoWall* LEDVideoWall::fromCommandLine() {
 
 		case LEDVideoWallType::Aspect: {
 			mm i_width = 0, i_height = 0;
-			printf("Enter aspect ratio (in the format 'width:height'): ");
-			while (scanf("%d:%d", &i_width, &i_height) != 2) {
-				printf("Invalid input, try again!\n");
-				printf("Enter aspect ratio (in the format 'width:height'): ");
-			}
+			cli::scanTwoValues(
+				"%d:%d",
+				i_width,
+				i_height,
+				"Enter aspect ratio (in the format 'width:height'): ",
+				"Invalid input, try again!");
 
 			return LEDVideoWall::Aspect(ipanel_width, ipanel_height, i_width, i_height);
 		};
diff --git a/src/cli.hpp b/src/cli.hpp
index 21f2ae5..b7d4c30 100644
--- a/src/cli.hpp
+++ b/src/cli.hpp
@@ -3,6 +3,7 @@
 
 #include <iostream>
 #include <limits>
+#include <stdio.h>
 
 namespace cli {
 	template <typename T>
@@ -29,6 +30,18 @@ namespace cli {
 			readUserInput(outValue, enter_message, error_message);
 		}
 	}
+
+	template <typename T, typename U>
+	void scanTwoValues(const char* format, T& outFirst, U& outSecond, const char* enter_message, const char* error_message) {
+		std::cout << enter_message;
+		while (scanf(format, &outFirst, &outSecond) != 2) {
+			std::cerr << error_message << std::endl;
+			std::cout << enter_message;
+
+			std::cin.clear();
+			std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
+		}
+	}
 }
 
 #endif /* GS_CLI */