lib/curl/Request: remove redundant CurlEasy wrapper methods
This commit is contained in:
@@ -456,7 +456,7 @@ CurlInputStream::~CurlInputStream() noexcept
|
||||
}
|
||||
|
||||
static CurlEasy
|
||||
CreateEasy(const char *url)
|
||||
CreateEasy(const char *url, struct curl_slist *headers)
|
||||
{
|
||||
CurlEasy easy{url};
|
||||
|
||||
@@ -503,14 +503,17 @@ CreateEasy(const char *url)
|
||||
easy.SetOption(CURLOPT_TCP_KEEPIDLE, tcp_keepidle);
|
||||
easy.SetOption(CURLOPT_TCP_KEEPINTVL, tcp_keepintvl);
|
||||
|
||||
easy.SetRequestHeaders(headers);
|
||||
|
||||
return easy;
|
||||
}
|
||||
|
||||
void
|
||||
CurlInputStream::InitEasy()
|
||||
{
|
||||
request = new CurlRequest(**curl_init, CreateEasy(GetURI()), *this);
|
||||
request->SetRequestHeaders(request_headers.Get());
|
||||
request = new CurlRequest(**curl_init,
|
||||
CreateEasy(GetURI(), request_headers.Get()),
|
||||
*this);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -540,8 +543,8 @@ CurlInputStream::SeekInternal(offset_type new_offset)
|
||||
/* send the "Range" header */
|
||||
|
||||
if (offset > 0)
|
||||
request->SetOption(CURLOPT_RANGE,
|
||||
fmt::format_int{offset}.c_str());
|
||||
request->GetEasy().SetOption(CURLOPT_RANGE,
|
||||
fmt::format_int{offset}.c_str());
|
||||
|
||||
StartRequest();
|
||||
}
|
||||
|
||||
@@ -109,9 +109,9 @@ QobuzLoginRequest::QobuzLoginRequest(CurlGlobal &curl,
|
||||
:request(curl, *this),
|
||||
handler(_handler)
|
||||
{
|
||||
request.SetUrl(MakeLoginUrl(request.Get(), base_url, app_id,
|
||||
username, email, password,
|
||||
device_manufacturer_id).c_str());
|
||||
request.GetEasy().SetURL(MakeLoginUrl(request.Get(), base_url, app_id,
|
||||
username, email, password,
|
||||
device_manufacturer_id).c_str());
|
||||
}
|
||||
|
||||
QobuzLoginRequest::~QobuzLoginRequest() noexcept
|
||||
|
||||
@@ -69,7 +69,7 @@ QobuzTrackRequest::QobuzTrackRequest(QobuzClient &client,
|
||||
{
|
||||
request_headers.Append(("X-User-Auth-Token:"
|
||||
+ session.user_auth_token).c_str());
|
||||
request.SetOption(CURLOPT_HTTPHEADER, request_headers.Get());
|
||||
request.GetEasy().SetRequestHeaders(request_headers.Get());
|
||||
}
|
||||
|
||||
QobuzTrackRequest::~QobuzTrackRequest() noexcept
|
||||
|
||||
Reference in New Issue
Block a user