Some fixes, retrieved from MiniScript

Author: andreasdr

src/tdme/network/httpclient/HTTPDownloadClient.cpp

@@ -91,7 +91,7 @@ string HTTPDownloadClient::urlEncode(const string &value) {
 	return escaped.str();
 }
 
-string HTTPDownloadClient::createHTTPRequestHeaders(const string& hostName, const string& relativeUrl) {
+const string HTTPDownloadClient::createHTTPRequestHeaders(const string& hostName, const string& relativeUrl) {
 	string query;
 	for (const auto& [parameterName, parameterValue]: getParameters) {
 		if (query.empty() == true) query+= "?"; else query+="&";
@@ -110,8 +110,7 @@ string HTTPDownloadClient::createHTTPRequestHeaders(const string& hostName, cons
 	for (const auto& [headerName, headerValue]: headers) {
 		request+= headerName + ": " + headerValue + "\r\n";
 	}
-	request+=
-		string("\r\n");
+	request+= string("\r\n");
 	return request;
 }
 
@@ -174,7 +173,7 @@ void HTTPDownloadClient::reset() {
 	haveContentSize = false;
 	headerSize = 0LL;
 	contentSize = 0LL;
-	finished = true;
+	finished = false;
 	progress = 0.0f;
 }
 
@@ -270,7 +269,7 @@ void HTTPDownloadClient::start() {
 					}
 
 					// transfer to real file
-					if (downloadClient->statusCode == 200 && isStopRequested() == false) {
+					if (downloadClient->statusCode == HTTP_STATUS_OK && isStopRequested() == false) {
 						// input file stream
 						ifstream ifs(std::filesystem::u8path(downloadClient->file + ".download"), ofstream::binary);
 						if (ifs.is_open() == false) {
@@ -313,6 +312,7 @@ void HTTPDownloadClient::start() {
 
 					//
 					socket->shutdown();
+					socket = nullptr;
 
 					//
 					downloadClient->progress = 1.0f;

src/tdme/network/httpclient/HTTPDownloadClient.h

@@ -47,7 +47,7 @@ class tdme::network::httpclient::HTTPDownloadClient {
 	bool haveContentSize { false };
 	uint64_t headerSize { 0LL };
 	uint64_t contentSize { 0LL };
-	volatile bool finished { true };
+	volatile bool finished { false };
 	volatile float progress { 0.0f };
 
 	/**
@@ -62,7 +62,7 @@ class tdme::network::httpclient::HTTPDownloadClient {
 	 * @param hostName host name
 	 * @param relativeUrl url relative to server root
 	 */
-	string createHTTPRequestHeaders(const string& hostName, const string& relativeUrl);
+	const string createHTTPRequestHeaders(const string& hostName, const string& relativeUrl);
 
 	/**
 	 * Parse HTTP response headers
@@ -264,7 +264,7 @@ class tdme::network::httpclient::HTTPDownloadClient {
 	 * @return HTTP response headers
 	 */
 	inline const unordered_map<string, string>& getResponseHeaders() {
-		return headers;
+		return responseHeaders;
 	}
 
 	/**

src/tdme/utilities/Console.cpp

@@ -70,6 +70,7 @@ void Console::println(const string_view& str)
 	//
 	if (logger != nullptr) logger->println(str);
 	cout << str << endl;
+	cout.flush();
 	//
 	mutex.unlock();
 }
@@ -85,6 +86,7 @@ void Console::print(const string_view& str)
 	//
 	if (logger != nullptr) logger->print(str);
 	cout << str;
+	cout.flush();
 	//
 	mutex.unlock();
 }
@@ -99,6 +101,7 @@ void Console::println()
 	//
 	if (logger != nullptr) logger->println();
 	cout << endl;
+	cout.flush();
 	//
 	mutex.unlock();
 }