Adding HTTPFetcher to fetch files from the WWW via HTTP, fixing getThreadID on Windows.

Author: Joachim Meyer

Core/Contents/CMakeLists.txt

@@ -80,6 +80,7 @@ SET(polycore_SRCS
     Source/PolyPeer.cpp
     Source/PolyClient.cpp
     Source/PolyServer.cpp
+	Source/PolyHTTPFetcher.cpp
     Source/PolyRay.cpp
     Source/PolySceneSprite.cpp
     Source/PolySceneEntityInstance.cpp
@@ -169,6 +170,7 @@ SET(polycore_HDRS
     Include/PolyClient.h
     Include/PolyServer.h
     Include/PolyServerWorld.h
+	Include/PolyHTTPFetcher.h
     Include/PolyRay.h
     Include/PolySceneSprite.h
     Include/PolySceneEntityInstance.h

Core/Contents/Include/PolyHTTPFetcher.h

@@ -0,0 +1,97 @@
+/*
+Copyright (C) 2015 by Joachim Meyer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#pragma once
+#include <string.h>
+
+#include "PolyGlobals.h"
+#include "PolyThreaded.h"
+
+#define HTTP_VERSION 			"HTTP/1.1"
+#define DEFAULT_USER_AGENT		"Polycode HTTP Fetcher/1.0"
+#define DEFAULT_PAGE_BUF_SIZE 	2048
+
+namespace Polycode {
+	
+	class HTTPFetcherEvent : public Event {
+	public:
+		HTTPFetcherEvent() { contentSize = 0; errorCode = 0; data = NULL; storedInFile = false; }
+		~HTTPFetcherEvent(){}
+
+		//If storedInFile: data is the file path, else: data contains all the fetched data
+		char* data;
+		//Error code: contains either the errno / WSAError code or the HTTP error code or the HTTPFetcher error code
+		int errorCode;
+
+		//Has the data been saved to a file or is it shipped with this event?
+		bool storedInFile;
+		//Size of the HTTP reply
+		unsigned long contentSize;
+
+		static const int EVENTBASE_SOCKETEVENT = 0x500;
+		static const int EVENT_HTTP_ERROR = EVENTBASE_SOCKETEVENT + 2;
+		static const int EVENT_HTTP_DATA_RECEIVED = EVENTBASE_SOCKETEVENT + 3;
+	};
+
+	/**
+	* A utility to download a file from the WWW through HTTP. It is threaded (and therefor non blocking).
+	* If you want to use the data you might add an EventListener for the HTTPFetcherEvent::EVENT_HTTP_DATA_RECEIVED event code.
+	*/
+	class HTTPFetcher : public Threaded {
+	public:
+		/*
+		* Connects to a host and fetches a file given in the param
+		* @param address Full path including the hostname (Domain or IP) and protocol (http://) aswell as the path to the file on the server
+		* @param saveToPath true if you want the file to be directly saved, false if you just want the data as char array
+		* @param savePath Path String where the file should be saved to
+		*/
+		HTTPFetcher(String address, bool saveToPath = false, String savePath = "");
+		~HTTPFetcher();
+
+		String getData();
+
+		/*
+		* Fetches a file given in the param
+		* @param pathToFile Path String to the new file to fetch from the same host. Without leading "/"
+		* @param saveToPath true if you want the file to be directly saved, false if you just want the data as char array
+		* @param savePath Path String where the file should be saved to
+		*/
+		void fetchFile(String pathToFile, bool saveToPath = false, String savePath = "");
+
+		//The received data is more or less than the HTTP header told us it should be
+		static const int HTTPFETCHER_ERROR_WRONG_SIZE = 0x10F00;
+
+		bool storeInFile;
+
+	private:
+        int s;
+		String address;
+		String bodyReturn;
+		String path;
+		String host;
+		String protocol;
+		String savePath;
+
+		bool createSocket();
+		void updateThread();
+	};
+}

Core/Contents/Include/Polycode.h

@@ -86,6 +86,7 @@
 #include "PolyServer.h"
 #include "PolyServerWorld.h"
 #include "PolySocket.h"
+#include "PolyHTTPFetcher.h"
 #include "PolyRay.h"
 #include "PolySceneSprite.h"
 #include "PolySceneEntityInstance.h"