diff options
author | Robert Pösel <robyer@seznam.cz> | 2016-09-04 14:04:44 +0000 |
---|---|---|
committer | Robert Pösel <robyer@seznam.cz> | 2016-09-04 14:04:44 +0000 |
commit | 2f492f0c3af53dada6b909d1c31dc665c33dfde5 (patch) | |
tree | e946096504dbe5fb2bcf21cb4e95c9b8e1a647c0 | |
parent | af9bd0922b5e39b495de0cf1a89d5a9c4efb4dd8 (diff) |
Facebook: Prepare big requests refactoring
Add HttpRequest class from SkypeWeb and update project settings.
git-svn-id: http://svn.miranda-ng.org/main/trunk@17245 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r-- | protocols/FacebookRM/facebook.vcxproj | 1 | ||||
-rw-r--r-- | protocols/FacebookRM/facebook.vcxproj.filters | 8 | ||||
-rw-r--r-- | protocols/FacebookRM/src/http_request.h | 285 | ||||
-rw-r--r-- | protocols/FacebookRM/src/stdafx.h | 1 |
4 files changed, 295 insertions, 0 deletions
diff --git a/protocols/FacebookRM/facebook.vcxproj b/protocols/FacebookRM/facebook.vcxproj index eec293388e..6d62bbe82f 100644 --- a/protocols/FacebookRM/facebook.vcxproj +++ b/protocols/FacebookRM/facebook.vcxproj @@ -29,6 +29,7 @@ <ClCompile Include="..\..\utils\std_string_utils.cpp">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
+ <ClInclude Include="src\requests\*.h" />
</ItemGroup>
<ItemDefinitionGroup>
<ClCompile>
diff --git a/protocols/FacebookRM/facebook.vcxproj.filters b/protocols/FacebookRM/facebook.vcxproj.filters index de5ad9f66c..aaf0565537 100644 --- a/protocols/FacebookRM/facebook.vcxproj.filters +++ b/protocols/FacebookRM/facebook.vcxproj.filters @@ -1,4 +1,12 @@ <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+ <ItemGroup>
+ <Filter Include="Header Files\requests">
+ <UniqueIdentifier>{e8edad1d-bf28-49ad-88ef-874228832675}</UniqueIdentifier>
+ </Filter>
+ <ClInclude Include="src\requests\*.h">
+ <Filter>Header Files\requests</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project>
\ No newline at end of file diff --git a/protocols/FacebookRM/src/http_request.h b/protocols/FacebookRM/src/http_request.h new file mode 100644 index 0000000000..ec5c424b57 --- /dev/null +++ b/protocols/FacebookRM/src/http_request.h @@ -0,0 +1,285 @@ +/* +Copyright (c) 2015-16 Miranda NG project (http://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef _HTTP_REQUEST_H_ +#define _HTTP_REQUEST_H_ + +struct VALUE +{ + LPCSTR szName; + __forceinline VALUE(LPCSTR _name) : szName(_name) { } +}; + +struct INT_VALUE : public VALUE +{ + int iValue; + __forceinline INT_VALUE(LPCSTR _name, int _value) + : VALUE(_name), iValue(_value) { } +}; + +struct LONG_VALUE : public VALUE +{ + LONGLONG llValue; + __forceinline LONG_VALUE(LPCSTR _name, LONGLONG _value) + : VALUE(_name), llValue(_value) { } +}; + +struct CHAR_VALUE : public VALUE +{ + LPCSTR szValue; + __forceinline CHAR_VALUE(LPCSTR _name, LPCSTR _value) + : VALUE(_name), szValue(_value) { } +}; + +struct FORMAT_VALUE : public VALUE +{ + CMStringA szValue; + FORMAT_VALUE(LPCSTR _name, LPCSTR _valueFormat, ...) + : VALUE(_name) + { + va_list args; + va_start(args, _valueFormat); + szValue.FormatV(_valueFormat, args); + va_end(args); + } +}; + +class HttpRequest : public NETLIBHTTPREQUEST, public MZeroedObject +{ + HttpRequest& operator=(const HttpRequest&); // to prevent copying; + + va_list formatArgs; + CMStringA url; + +protected: + enum HttpRequestUrlFormat { FORMAT }; + + class HttpRequestUrl + { + friend HttpRequest; + + private: + HttpRequest &request; + + HttpRequestUrl(HttpRequest &request, const char *url) : request(request) + { + request.url = url; + request.szUrl = request.url.GetBuffer(); + } + + HttpRequestUrl(HttpRequest &request, const char *urlFormat, va_list args) : request(request) + { + request.url.AppendFormatV(urlFormat, args); + request.szUrl = request.url.GetBuffer(); + } + + HttpRequestUrl& operator=(const HttpRequestUrl&); // to prevent copying; + + public: + HttpRequestUrl &operator<<(const VALUE ¶m) + { + request.AddUrlParameter(param.szName); + return *this; + } + + HttpRequestUrl &operator<<(const INT_VALUE ¶m) + { + request.AddUrlParameter("%s=%i", param.szName, param.iValue); + return *this; + } + + HttpRequestUrl &operator<<(const LONG_VALUE ¶m) + { + request.AddUrlParameter("%s=%lld", param.szName, param.llValue); + return *this; + } + + HttpRequestUrl &operator<<(const CHAR_VALUE ¶m) + { + request.AddUrlParameter("%s=%s", param.szName, param.szValue); + return *this; + } + + char *ToString() + { + return request.url.GetBuffer(); + } + }; + + class HttpRequestHeaders + { + HttpRequestHeaders& operator=(const HttpRequestHeaders&); // to prevent copying; + + HttpRequest &request; + + void Add(LPCSTR szName) + { + Add(szName, ""); + } + + void Add(LPCSTR szName, LPCSTR szValue) + { + request.headers = (NETLIBHTTPHEADER*)mir_realloc( + request.headers, sizeof(NETLIBHTTPHEADER)* (request.headersCount + 1)); + request.headers[request.headersCount].szName = mir_strdup(szName); + request.headers[request.headersCount].szValue = mir_strdup(szValue); + request.headersCount++; + } + + public: + HttpRequestHeaders(HttpRequest &request) : request(request) { } + + HttpRequestHeaders& operator<<(const VALUE ¶m) + { + Add(param.szName); + return *this; + } + + HttpRequestHeaders& operator<<(const CHAR_VALUE ¶m) + { + Add(param.szName, param.szValue); + return *this; + } + + HttpRequestHeaders& operator<<(const FORMAT_VALUE ¶m) + { + Add(param.szName, param.szValue); + return *this; + } + }; + + class HttpRequestBody + { + private: + CMStringA content; + + void AppendSeparator() + { + if (!content.IsEmpty()) + { + content.AppendChar('&'); + } + } + + public: + HttpRequestBody() { } + + HttpRequestBody & operator<<(const VALUE ¶m) + { + AppendSeparator(); + content.Append(param.szName); + return *this; + } + + HttpRequestBody & operator<<(const INT_VALUE ¶m) + { + AppendSeparator(); + content.AppendFormat("%s=%i", param.szName, param.iValue); + return *this; + } + + HttpRequestBody & operator<<(const LONG_VALUE ¶m) + { + AppendSeparator(); + content.AppendFormat("%s=%lld", param.szName, param.llValue); + return *this; + } + + HttpRequestBody & operator<<(const CHAR_VALUE ¶m) + { + AppendSeparator(); + content.AppendFormat("%s=%s", param.szName, param.szValue); + return *this; + } + + HttpRequestBody & operator<<(const FORMAT_VALUE ¶m) + { + AppendSeparator(); + content.AppendFormat("%s=%s", param.szName, param.szValue); + return *this; + } + + char * ToString() + { + return content.GetBuffer(); + } + }; + + void AddUrlParameter(const char *fmt, ...) + { + va_list args; + va_start(args, fmt); + url += (url.Find('?') == -1) ? '?' : '&'; + url.AppendFormatV(fmt, args); + va_end(args); + szUrl = url.GetBuffer(); + } + +public: + HttpRequestUrl Url; + HttpRequestHeaders Headers; + HttpRequestBody Body; + + HttpRequest(int type, LPCSTR url) + : Url(*this, url), Headers(*this) + { + cbSize = sizeof(NETLIBHTTPREQUEST); + flags = NLHRF_HTTP11 | NLHRF_SSL | NLHRF_DUMPASTEXT; + requestType = type; + pData = NULL; + } + + HttpRequest(int type, HttpRequestUrlFormat, LPCSTR urlFormat, ...) + : Url(*this, urlFormat, (va_start(formatArgs, urlFormat), formatArgs)), Headers(*this) + { + cbSize = sizeof(NETLIBHTTPREQUEST); + flags = NLHRF_HTTP11 | NLHRF_SSL | NLHRF_DUMPASTEXT; + requestType = type; + va_end(formatArgs); + pData = NULL; + } + + virtual ~HttpRequest() + { + for (int i = 0; i < headersCount; i++) + { + mir_free(headers[i].szName); + mir_free(headers[i].szValue); + } + mir_free(headers); + } + + virtual NETLIBHTTPREQUEST* Send(HANDLE hConnection) + { + if (url.Find("://") == -1) + url.Insert(0, ((flags & NLHRF_SSL) ? "https://" : "http://")); + szUrl = url.GetBuffer(); + + if (!pData) { + pData = Body.ToString(); + dataLength = (int)mir_strlen(pData); + } + + char message[1024]; + mir_snprintf(message, "Send request to %s", szUrl); + CallService(MS_NETLIB_LOG, (WPARAM)hConnection, (LPARAM)&message); + + return (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hConnection, (LPARAM)(NETLIBHTTPREQUEST*)this); + } +}; + +#endif //_HTTP_REQUEST_H_
\ No newline at end of file diff --git a/protocols/FacebookRM/src/stdafx.h b/protocols/FacebookRM/src/stdafx.h index 11e70db53f..c492e974dc 100644 --- a/protocols/FacebookRM/src/stdafx.h +++ b/protocols/FacebookRM/src/stdafx.h @@ -70,6 +70,7 @@ class FacebookProto; #include "constants.h"
#include "entities.h"
#include "http.h"
+#include "http_request.h"
#include "list.hpp"
#include "client.h"
#include "proto.h"
|