UpdateGUI/CLI: support for multiple host:port combinations

4 files changed, 59 insertions, 16 deletions

diff --git a/src/UpdateFactory.cpp b/src/UpdateFactory.cpp
index 0a102cf..f05f294 100644
--- a/src/UpdateFactory.cpp
+++ b/src/UpdateFactory.cpp
@@ -338,9 +338,48 @@ int loadUpdateFactoriesFromCSV(const char *csv_file, const char *update_file, st
 			update_list.push_back(uf);
 		}
 	} catch (io::error::with_file_line& err) {
-		err_line.push_back(err.file_line);
+		err_line.push_back(err.file_line); /* not used atm */
 	} catch (io::error::with_file_name& err) {
 	}
 
 	return UPDATE_OK;
 }
+
+static void parseHostPort(std::string& hostPort, UpdateFactory *uf)
+{
+	int port = 80;
+	size_t colon = hostPort.find_first_of(":");
+	std::string host;
+
+	if (colon != std::string::npos) {
+		try {
+			port = std::stoi(hostPort.substr(colon + 1));
+		} catch (std::invalid_argument& err) {
+			port = 80;
+		}
+	}
+	host = hostPort.substr(0, colon);
+	uf->setDest(host, port);
+}
+
+void loadUpdateFactoriesFromStr(std::string& hostPorts, const char *update_file, const char *password, std::vector<UpdateFactory*>& update_list)
+{
+	size_t start = 0;
+	size_t end = hostPorts.find_first_of(",");
+
+	if (end == std::string::npos)
+		end = hostPorts.length();
+	while (start < end) {
+		UpdateFactory *uf = new UpdateFactory();
+		std::string hostPort = hostPorts.substr(start, end - start);
+		parseHostPort(hostPort, uf);
+		uf->setUpdateFile(update_file);
+		uf->setPass(password);
+		update_list.push_back(uf);
+
+		start = ++end;
+		end = hostPorts.find_first_of(",", start);
+		if (end == std::string::npos)
+			end = hostPorts.length();
+	}
+}
diff --git a/src/UpdateFactory.hpp b/src/UpdateFactory.hpp
index e8f0a07..adec5ea 100644
--- a/src/UpdateFactory.hpp
+++ b/src/UpdateFactory.hpp
@@ -74,4 +74,6 @@ private:
 
 int loadUpdateFactoriesFromCSV(const char *csv_file, const char *update_file, std::vector<UpdateFactory*>& update_list);
 
+void loadUpdateFactoriesFromStr(std::string& hostPorts, const char *update_file, const char *password, std::vector<UpdateFactory*>& update_list);
+
 #endif
diff --git a/src/UpdateGUI.cpp b/src/UpdateGUI.cpp
index c6c8fc9..4d3e613 100644
--- a/src/UpdateGUI.cpp
+++ b/src/UpdateGUI.cpp
@@ -228,6 +228,7 @@ void UpdateGUIFrame::OnImportCSV(wxCommandEvent& event)
 	for (auto *u : uf) {
 		int jobid = rand();
 		jobs->AddJob(Job(Job::eID_THREAD_JOB, JobArgs(jobid, *u)));
+		delete u;
 	}
 	SetStatusText(wxString::Format(wxT("CSV Import %s"), openFileDialog.GetPath()));
 	openFileDialog.Destroy();
@@ -236,16 +237,20 @@ void UpdateGUIFrame::OnImportCSV(wxCommandEvent& event)
 void UpdateGUIFrame::OnUpdate(wxCommandEvent& event)
 {
 	int jobid = rand();
-	std::ostringstream log;
+	std::vector<UpdateFactory*> uf;
 	std::string str;
 
-	log << "Update started ... (Job: #" << jobid << ")";
-	tLog(RTL_DEFAULT, log.str().c_str());
-	jobs->AddJob(Job(Job::eID_THREAD_JOB,
-	    JobArgs(jobid, ipEntry->GetValue(), 80,
-	            imgEntry->GetValue(), pwEntry->GetValue())
-	));
-	SetStatusText(wxString::Format(wxT("Job #%i started."), jobid));
+	str = ipEntry->GetValue();
+	loadUpdateFactoriesFromStr(str, imgEntry->GetValue(), pwEntry->GetValue(), uf);
+	for (auto *u : uf) {
+		std::ostringstream log;
+		log << "Update started ... (Job: #" << jobid << ")";
+		tLog(RTL_DEFAULT, log.str().c_str());
+
+		jobs->AddJob(Job(Job::eID_THREAD_JOB, JobArgs(jobid, *u)));
+		delete u;
+	}
+	SetStatusText(wxT("Jobs started."));
 }
 
 void UpdateGUIFrame::OnThread(wxCommandEvent& event)
diff --git a/src/UpdateTool.cpp b/src/UpdateTool.cpp
index 720f429..8206131 100644
--- a/src/UpdateTool.cpp
+++ b/src/UpdateTool.cpp
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 {
 	int rv;
 	std::vector<UpdateFactory*> uf;
-	std::string errstr;
+	std::string errstr, hostPorts;
 
 	if (argc == 0)
 		return 1;
@@ -43,13 +43,10 @@ int main(int argc, char *argv[])
 		}
 	} else
 	if (argc == 4) {
-		uf.push_back(new UpdateFactory());
-		uf[0]->setDest(argv[1], 80);
-		uf[0]->setPass(argv[2]);
-		uf[0]->setUpdateFile(argv[3]);
+		hostPorts = std::string(argv[1]);
+		loadUpdateFactoriesFromStr(hostPorts, argv[3], argv[2], uf);
 	} else {
-		std::cerr << "Missing CLI arguments, using defaults .." << std::endl
-		          << "usage: " << argv[0]
+		std::cerr << "usage: " << argv[0]
 		          << " [update-csv-file]|[[hostname] [password]] [update-file]"
 		          << std::endl << std::endl;
 		return 1;