diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/curl_wrapper.hpp | 92 | ||||
| -rw-r--r-- | include/instance.hpp | 48 | ||||
| -rw-r--r-- | include/request.hpp | 16 |
3 files changed, 110 insertions, 46 deletions
diff --git a/include/curl_wrapper.hpp b/include/curl_wrapper.hpp new file mode 100644 index 0000000..328c3b9 --- /dev/null +++ b/include/curl_wrapper.hpp @@ -0,0 +1,92 @@ +/* This file is part of mastodonpp. + * Copyright © 2020 tastytea <tastytea@tastytea.de> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3. + * + * 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef MASTODONPP_CURL_WRAPPER_HPP +#define MASTODONPP_CURL_WRAPPER_HPP + +#include "curl/curl.h" + +#include <string> + +namespace mastodonpp +{ + +using std::string; + +//! Internal use only. +extern bool curl_initialized; + +/*! + * @brief Handles the details of network connections. + * + * @since 0.1.0 + * + * @headerfile curl_wrapper.hpp mastodonpp/curl_wrapper.hpp + */ +class CURLWrapper +{ +public: + /*! + * @brief Constructs a CURLWrapper object. + * + * The first construction of an CurlWrapper object will call + * `curl_global_init`, which is not thread-safe. For more information + * consult [curl_global_init(3)] + * (https://curl.haxx.se/libcurl/c/curl_global_init.html). + * + * @since 0.1.0 + */ + CURLWrapper(); + + //! Copy constructor + CURLWrapper(const CURLWrapper &other) = default; + + //! Move constructor + CURLWrapper(CURLWrapper &&other) noexcept = default; + + //! Destructor + virtual ~CURLWrapper() noexcept; + + //! Copy assignment operator + CURLWrapper& operator=(const CURLWrapper &other) = default; + + //! Move assignment operator + CURLWrapper& operator=(CURLWrapper &&other) noexcept = default; + +private: + CURL *_connection; + char _curl_buffer_error[CURL_ERROR_SIZE]; + string _curl_buffer; + + /*! + * @brief libcurl write callback function. + * + * @since 0.1.0 + */ + static int writer(char *data, size_t size, size_t nmemb, + string *writerData); + + /*! + * @brief Setup libcurl connection. + * + * @since 0.1.0 + */ + void setup_curl(); +}; + +} // namespace mastodonpp + +#endif // MASTODONPP_CURL_WRAPPER_HPP diff --git a/include/instance.hpp b/include/instance.hpp index 4feab15..5c62b7a 100644 --- a/include/instance.hpp +++ b/include/instance.hpp @@ -17,7 +17,7 @@ #ifndef MASTODONPP_INSTANCE_HPP #define MASTODONPP_INSTANCE_HPP -#include <curl/curl.h> +#include "curl_wrapper.hpp" #include <string> @@ -26,27 +26,19 @@ namespace mastodonpp using std::string; -//! Internal use only. -extern bool curl_initialized; - /*! - * @brief Holds the access data of and the connection to an instance. + * @brief Holds the access data of an instance. * * @since 0.1.0 * * @headerfile instance.hpp mastodonpp/instance.hpp */ -class Instance +class Instance : public CURLWrapper { public: /*! * @brief Construct a new Instance object. * - * The first construction of an Instance object will call - * `curl_global_init`, which is not thread-safe. For more information - * consult [curl_global_init(3)] - * (https://curl.haxx.se/libcurl/c/curl_global_init.html). - * * @param instance The hostname of the instance. * @param access_token Your access token. * @@ -54,43 +46,9 @@ public: */ explicit Instance(string instance, string access_token); - //! Copy constructor - Instance(const Instance &other) = default; - - //! Move constructor - Instance(Instance &&other) = default; - - //! Destructor - virtual ~Instance(); - - //! Copy assignment operator - Instance& operator=(const Instance &other) = delete; - - //! Move assignment operator - Instance& operator=(Instance &&other) = delete; - private: const string _instance; string _access_token; - CURL *_connection; - char _curl_buffer_error[CURL_ERROR_SIZE]; - string _curl_buffer; - - - /*! - * @brief libcurl write callback function. - * - * @since 0.1.0 - */ - static int writer(char *data, size_t size, size_t nmemb, - string *writerData); - - /*! - * @brief Setup libcurl connection. - * - * @since 0.1.0 - */ - void setup_curl(); }; } // namespace mastodonpp diff --git a/include/request.hpp b/include/request.hpp index dca8327..e35b85c 100644 --- a/include/request.hpp +++ b/include/request.hpp @@ -18,6 +18,7 @@ #define MASTODONPP_REQUEST_HPP #include "api.hpp" +#include "curl_wrapper.hpp" #include "instance.hpp" #include "return_types.hpp" @@ -35,7 +36,7 @@ using std::string; * * @headerfile request.hpp mastodonpp/request.hpp */ -class Request +class Request : public CURLWrapper { public: /*! @@ -50,11 +51,24 @@ public: /*! * @brief Make a HTTP GET call. * + * @param endpoint Endpoint as API::endpoint_type, for example: + * `mastodonpp::API::v1::instance`. + * * @since 0.1.0 */ [[nodiscard]] answer_type get(API::endpoint_type endpoint) const; + /*! + * @brief Make a HTTP GET call. + * + * @param endpoint Endpoint as string, for example: "/api/v1/instance". + * + * @since 0.1.0 + */ + [[nodiscard]] + answer_type get(string endpoint) const; + private: Instance &_instance; }; |