Tighten CLI parsing edge cases and drop unused WebViewer::connect overload

Author: jvde-github

Source/Application/Config.cpp

@@ -389,7 +389,7 @@ void Config::setSharing(const std::vector<JSON::Member> &members)
 
 void Config::set(const std::string &str)
 {
-	std::string config, serial, input;
+	std::string config;
 	int version = 0;
 
 	JSON::Parser parser(JSON_DICT_SETTING);

Source/Application/Main.cpp

@@ -232,7 +232,7 @@ static void expandResponseFiles(int argc, char *argv[],
 	for (int i = 0; i < argc; i++)
 	{
 		const char *s = argv[i];
-		if (!s) continue;
+		if (!s || s[0] == '\0') continue;
 		if (s[0] != '@')
 		{
 			out.emplace_back(s);
@@ -315,7 +315,7 @@ static void parseSettings(Setting &s, char *argv[], int ptr, int argc)
 
 static bool isOption(const std::string &s)
 {
-	return s.length() >= 2 && s[0] == '-' && std::isalpha(s[1]);
+	return s.length() >= 2 && s[0] == '-' && std::isalpha((unsigned char)s[1]);
 }
 
 static void Assert(bool b, std::string &context, const std::string &msg = "")
@@ -830,7 +830,7 @@ static void parseCLI(int argc, char *argv[], RunState &state, Config &c, int &cb
 			state.receivers.back()->getDeviceManager().SerialPort().SetKey(AIS::KEY_SETTING_BAUDRATE, arg1).SetKey(AIS::KEY_SETTING_PORT, arg2);
 			break;
 		case 'l':
-			Assert(count == 0 || count == 2, param, MSG_NO_PARAMETER);
+			Assert(count == 0 || count == 2, param, "takes no parameters or [JSON on/off].");
 			if (count == 2)
 			{
 				Assert(arg1 == "JSON", param, "requires JSON on/off");
@@ -848,10 +848,10 @@ static void parseCLI(int argc, char *argv[], RunState &state, Config &c, int &cb
 				state.receivers.push_back(std::unique_ptr<Receiver>(new Receiver()));
 			}
 
-			if (param.length() == 4 && param[2] == ':')
+			if (param.length() >= 4 && param[2] == ':')
 			{
 				Assert(count == 0, param, MSG_NO_PARAMETER);
-				int n = param[3] - '0';
+				int n = (int)Util::Parse::Integer(param.substr(3));
 				state.receivers.back()->getDeviceManager().selectDeviceByIndex(n);
 			}
 			else
@@ -900,13 +900,18 @@ static void parseCLI(int argc, char *argv[], RunState &state, Config &c, int &cb
 			{
 				state.xshare_defined = true;
 
-				if (count == 1 && (arg1 == "OFF" || arg1 == "off"))
+				std::string xarg_upper = arg1;
+				Util::Convert::toUpper(xarg_upper);
+
+				if (count == 1 && xarg_upper == "OFF")
 				{
-					// Explicitly disable sharing if "OFF" is provided as second parameter
+					// Explicitly disable sharing if "off" is provided as second parameter
 					Info() << "Community feed sharing disabled.";
 					break;
 				}
 
+				bool xarg_is_on = (count == 1 && xarg_upper == "ON");
+
 				if (!comm_feed)
 				{
 					state.msg.push_back(std::unique_ptr<IO::OutputMessage>(new IO::TCPClientStreamer()));
@@ -915,7 +920,7 @@ static void parseCLI(int argc, char *argv[], RunState &state, Config &c, int &cb
 					comm_feed->SetKey(AIS::KEY_SETTING_MSGFORMAT, "COMMUNITY_HUB");
 				}
 
-				if (count >= 1 && comm_feed)
+				if (count >= 1 && !xarg_is_on && comm_feed)
 					comm_feed->SetKey(AIS::KEY_SETTING_UUID, arg1);
 			}
 			break;

Source/Application/WebViewer.cpp

@@ -780,28 +780,6 @@ void WebViewer::connect(const std::vector<std::unique_ptr<Receiver>> &receivers)
 	raw_counter.setFilter(filter);
 }
 
-void WebViewer::connect(AIS::Model &m, Connection<JSON::JSON> &json, Device::Device &device)
-{
-	if (m.Output().out.canConnect(groups_in))
-	{
-		if (states.empty())
-		{
-			states.push_back(std::unique_ptr<ReceiverTracker>(new ReceiverTracker()));
-			states[0]->label = "All";
-			states[0]->applyConfig(tracking, filter);
-		}
-
-		states[0]->connectJSON(json);
-		device >> raw_counter;
-
-		states[0]->sample_rate = device.getRateDescription();
-		states[0]->product = device.getProduct();
-		states[0]->vendor = device.getVendor().empty() ? "-" : device.getVendor();
-		states[0]->serial = device.getSerial().empty() ? "-" : device.getSerial();
-		states[0]->model_name = m.getName();
-	}
-}
-
 void WebViewer::Reset()
 {
 	for (auto &s : states)

Source/Application/WebViewer.h

@@ -327,7 +327,6 @@ class WebViewer : public IO::HTTPServer, public Setting
 
 	bool &active() { return run; }
 	void connect(const std::vector<std::unique_ptr<Receiver>> &receivers);
-	void connect(AIS::Model &model, Connection<JSON::JSON> &json, Device::Device &device);
 	void start();
 	void close();
 	void Reset();