[Refactor] preform_get_request関数の処理をクラス化

diff --git a/src/net/http-client.cpp b/src/net/http-client.cpp
index 73cbcf3..f614423 100644 (file)
--- a/src/net/http-client.cpp
+++ b/src/net/http-client.cpp
@@ -23,33 +23,48 @@ namespace {
         session.setopt(CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
     }
 
-    std::optional<int> perform_get_request(const std::string &url, const libcurl::EasySession::ReceiveHandler &receiver, const std::optional<std::string> &user_agent,
-        const http::Client::GetRequestProgressHandler &progress_handler)
-    {
-        libcurl::EasySession session;
-        if (!session.is_valid()) {
-            return std::nullopt;
+    class GetRequest {
+    public:
+        GetRequest(const std::string &url, const std::optional<std::string> &user_agent = {})
+            : url(url)
+            , user_agent(user_agent)
+        {
         }
 
-        session.common_setup(url, HTTP_CONNECTION_TIMEOUT);
-        setup_http_option(session, user_agent);
-
-        session.receiver_setup(receiver);
-        if (progress_handler) {
-            auto handler = [progress_handler](size_t dltotal, size_t dlnow, size_t, size_t) {
-                return progress_handler({ dltotal, dlnow });
-            };
-            session.progress_setup(handler);
+        std::optional<int> perform()
+        {
+            libcurl::EasySession session;
+            if (!session.is_valid()) {
+                return std::nullopt;
+            }
+
+            session.common_setup(this->url, HTTP_CONNECTION_TIMEOUT);
+            setup_http_option(session, this->user_agent);
+
+            session.receiver_setup(this->receiver);
+            if (this->progress_handler) {
+                auto handler = [handler = this->progress_handler](size_t dltotal, size_t dlnow, size_t, size_t) {
+                    return handler({ dltotal, dlnow });
+                };
+                session.progress_setup(handler);
+            }
+
+            if (!session.perform()) {
+                return std::nullopt;
+            }
+
+            long status;
+            session.getinfo(CURLINFO_RESPONSE_CODE, &status);
+            return static_cast<int>(status);
         }
 
-        if (!session.perform()) {
-            return std::nullopt;
-        }
+        libcurl::EasySession::ReceiveHandler receiver;
+        http::Client::GetRequestProgressHandler progress_handler;
 
-        long status;
-        session.getinfo(CURLINFO_RESPONSE_CODE, &status);
-        return static_cast<int>(status);
-    }
+    private:
+        std::string url;
+        std::optional<std::string> user_agent;
+    };
 }
 
 /*!
@@ -61,12 +76,15 @@ namespace {
 std::optional<Response> Client::get(const std::string &url, GetRequestProgressHandler progress_handler)
 {
     Response response{};
-    auto receiver = [&response](char *buf, size_t n) {
+
+    GetRequest request(url, this->user_agent);
+    request.receiver = [&response](char *buf, size_t n) {
         response.body.append(buf, n);
         return n;
     };
+    request.progress_handler = progress_handler;
 
-    const auto status_opt = perform_get_request(url, receiver, this->user_agent, progress_handler);
+    const auto status_opt = request.perform();
     if (!status_opt) {
         return std::nullopt;
     }
@@ -88,12 +106,15 @@ std::optional<Response> Client::get(const std::string &url, GetRequestProgressHa
 std::optional<Response> Client::get(const std::string &url, const std::filesystem::path &path, GetRequestProgressHandler progress_handler)
 {
     std::ofstream ofs(path, std::ios::binary);
-    auto receiver = [&ofs](char *buf, size_t n) {
+
+    GetRequest request(url, this->user_agent);
+    request.receiver = [&ofs](char *buf, size_t n) {
         ofs.write(buf, n);
         return ofs ? n : 0;
     };
+    request.progress_handler = progress_handler;
 
-    const auto status_opt = perform_get_request(url, receiver, this->user_agent, progress_handler);
+    const auto status_opt = request.perform();
     if (!status_opt) {
         return std::nullopt;
     }