Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-02-15 07:26:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove tr_session* argument from tr_rpc_response_func (#8160)

Browse Source
This commit is contained in:
Charles Kerr
2026-01-20 19:44:06 -06:00
committed by GitHub
parent cbc5388440
commit 62be679769
6 changed files with 34 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/Session.cc
View File

@@ -1241,7 +1241,7 @@ bool core_read_rpc_response_idle(tr_variant& response)
return false; return false;
} }
void core_read_rpc_response(tr_session* /*session*/, tr_variant&& response) void core_read_rpc_response(tr_variant&& response)
{ {
auto owned_response = std::make_shared<tr_variant>(std::move(response)); auto owned_response = std::make_shared<tr_variant>(std::move(response));
Glib::signal_idle().connect([owned_response]() mutable { return core_read_rpc_response_idle(*owned_response); }); Glib::signal_idle().connect([owned_response]() mutable { return core_read_rpc_response_idle(*owned_response); });
@@ -1272,7 +1272,7 @@ void Session::Impl::send_rpc_request(
} }
// add id if we want a response // add id if we want a response
auto callback = std::function<void(tr_session*, tr_variant&&)>{}; auto callback = std::function<void(tr_variant&&)>{};
if (on_response) if (on_response)
{ {
auto const id = nextId++; auto const id = nextId++;

2
libtransmission/rpc-server.cc
View File

@@ -367,7 +367,7 @@ void handle_rpc_from_json(struct evhttp_request* req, tr_rpc_server* server, std
server->session, server->session,
json, json,
// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved) // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
[req, server](tr_session* /*session*/, tr_variant&& content) [req, server](tr_variant&& content)
{ {
if (!content.has_value()) if (!content.has_value())
{ {

28
libtransmission/rpcimpl.cc
View File

@@ -221,11 +221,11 @@ void tr_rpc_idle_done(struct tr_rpc_idle_data* data, JsonRpc::Error::Code code,
{ {
libtransmission::api_compat::convert(response, libtransmission::api_compat::Style::Tr4); libtransmission::api_compat::convert(response, libtransmission::api_compat::Style::Tr4);
} }
data->callback(data->session, std::move(response)); data->callback(std::move(response));
} }
else // notification else // notification
{ {
data->callback(data->session, {}); data->callback({});
} }
delete data; delete data;
@@ -2801,7 +2801,7 @@ auto const async_handlers = small::max_size_map<tr_quark, std::pair<AsyncHandler
{ TR_KEY_torrent_rename_path, { torrentRenamePath, true } }, { TR_KEY_torrent_rename_path, { torrentRenamePath, true } },
} }; } };
void noop_response_callback(tr_session* /*session*/, tr_variant&& /*response*/) void noop_response_callback(tr_variant&& /*response*/)
{ {
} }
@@ -2817,12 +2817,10 @@ void tr_rpc_request_exec_impl(tr_session* session, tr_variant& request, tr_rpc_r
auto const* map = request.get_if<tr_variant::Map>(); auto const* map = request.get_if<tr_variant::Map>();
if (map == nullptr) if (map == nullptr)
{ {
callback( callback(build_response(
session, Error::INVALID_REQUEST,
build_response( nullptr,
Error::INVALID_REQUEST, Error::build_data(is_batch ? "request must be an Object"sv : "request must be an Array or Object"sv, {})));
nullptr,
Error::build_data(is_batch ? "request must be an Object"sv : "request must be an Array or Object"sv, {})));
return; return;
} }
@@ -2833,9 +2831,7 @@ void tr_rpc_request_exec_impl(tr_session* session, tr_variant& request, tr_rpc_r
} }
else if (jsonrpc || is_batch) else if (jsonrpc || is_batch)
{ {
callback( callback(build_response(Error::INVALID_REQUEST, nullptr, Error::build_data("JSON-RPC version is not 2.0"sv, {})));
session,
build_response(Error::INVALID_REQUEST, nullptr, Error::build_data("JSON-RPC version is not 2.0"sv, {})));
return; return;
} }
else else
@@ -2851,7 +2847,7 @@ void tr_rpc_request_exec_impl(tr_session* session, tr_variant& request, tr_rpc_r
TR_KEY_result, TR_KEY_result,
tr_variant::unmanaged_string( tr_variant::unmanaged_string(
"bug in api-compat, please report a bug at https://github.com/transmission/transmission/issues"sv)); "bug in api-compat, please report a bug at https://github.com/transmission/transmission/issues"sv));
callback(session, std::move(response)); callback(std::move(response));
return; return;
} }
} }
@@ -2928,7 +2924,7 @@ void tr_rpc_request_exec_batch(tr_session* session, tr_variant::Vector& requests
tr_rpc_request_exec_impl( tr_rpc_request_exec_impl(
session, session,
requests[i], requests[i],
[responses, n_requests, n_responses, i, cb](tr_session* s, tr_variant&& response) [responses, n_requests, n_responses, i, cb](tr_variant&& response)
{ {
(*responses)[i] = std::move(response); (*responses)[i] = std::move(response);
@@ -2941,7 +2937,7 @@ void tr_rpc_request_exec_batch(tr_session* session, tr_variant::Vector& requests
[](auto const& r) { return !r.has_value(); }); [](auto const& r) { return !r.has_value(); });
responses->erase(it_end, std::end(*responses)); responses->erase(it_end, std::end(*responses));
(*cb)(s, !std::empty(*responses) ? std::move(*responses) : tr_variant{}); (*cb)(!std::empty(*responses) ? std::move(*responses) : tr_variant{});
} }
}, },
true); true);
@@ -2974,5 +2970,5 @@ void tr_rpc_request_exec(tr_session* session, std::string_view request, tr_rpc_r
return; return;
} }
callback(session, build_response(Error::PARSE_ERROR, nullptr, Error::build_data(serde.error_.message(), {}))); callback(build_response(Error::PARSE_ERROR, nullptr, Error::build_data(serde.error_.message(), {})));
} }

2
libtransmission/rpcimpl.h
View File

@@ -48,7 +48,7 @@ enum Code : int16_t
} // namespace Error } // namespace Error
} // namespace JsonRpc } // namespace JsonRpc
using tr_rpc_response_func = std::function<void(tr_session* session, tr_variant&& response)>; using tr_rpc_response_func = std::function<void(tr_variant&& response)>;
void tr_rpc_request_exec(tr_session* session, tr_variant& request, tr_rpc_response_func&& callback = {}); void tr_rpc_request_exec(tr_session* session, tr_variant& request, tr_rpc_response_func&& callback = {});

2
qt/RpcClient.cc
View File

@@ -156,7 +156,7 @@ void RpcClient::sendLocalRequest(tr_variant& req, QFutureInterface<RpcResponse>
tr_rpc_request_exec( tr_rpc_request_exec(
session_, session_,
req, req,
[this](tr_session* /*session*/, tr_variant&& response) [this](tr_variant&& response)
{ {
api_compat::convert_incoming_data(response); api_compat::convert_incoming_data(response);

85
tests/libtransmission/rpc-test.cc
View File

@@ -43,10 +43,7 @@ namespace
} }
auto response = tr_variant{}; auto response = tr_variant{};
tr_rpc_request_exec( tr_rpc_request_exec(session, *request, [&response](tr_variant&& resp) { response = std::move(resp); });
session,
*request,
[&response](tr_session* /*session*/, tr_variant&& resp) { response = std::move(resp); });
return serde.to_string(response); return serde.to_string(response);
} }
@@ -57,10 +54,7 @@ TEST_F(RpcTest, EmptyRequest)
static auto constexpr Request = ""sv; static auto constexpr Request = ""sv;
auto response = tr_variant{}; auto response = tr_variant{};
tr_rpc_request_exec( tr_rpc_request_exec(session_, Request, [&response](tr_variant&& resp) { response = std::move(resp); });
session_,
Request,
[&response](tr_session* /*session*/, tr_variant&& resp) { response = std::move(resp); });
auto const* const response_map = response.get_if<tr_variant::Map>(); auto const* const response_map = response.get_if<tr_variant::Map>();
ASSERT_NE(response_map, nullptr); ASSERT_NE(response_map, nullptr);
@@ -90,10 +84,7 @@ TEST_F(RpcTest, NotArrayOrObject)
for (auto& req : requests) for (auto& req : requests)
{ {
auto response = tr_variant{}; auto response = tr_variant{};
tr_rpc_request_exec( tr_rpc_request_exec(session_, req, [&response](tr_variant&& resp) { response = std::move(resp); });
session_,
req,
[&response](tr_session* /*session*/, tr_variant&& resp) { response = std::move(resp); });
auto const* const response_map = response.get_if<tr_variant::Map>(); auto const* const response_map = response.get_if<tr_variant::Map>();
ASSERT_NE(response_map, nullptr); ASSERT_NE(response_map, nullptr);
@@ -126,10 +117,7 @@ TEST_F(RpcTest, JsonRpcWrongVersion)
auto request = tr_variant{ std::move(request_map) }; auto request = tr_variant{ std::move(request_map) };
auto response = tr_variant{}; auto response = tr_variant{};
tr_rpc_request_exec( tr_rpc_request_exec(session_, request, [&response](tr_variant&& resp) { response = std::move(resp); });
session_,
request,
[&response](tr_session* /*session*/, tr_variant&& resp) { response = std::move(resp); });
auto const* const response_map = response.get_if<tr_variant::Map>(); auto const* const response_map = response.get_if<tr_variant::Map>();
ASSERT_NE(response_map, nullptr); ASSERT_NE(response_map, nullptr);
@@ -169,10 +157,7 @@ TEST_F(RpcTest, idSync)
auto request = tr_variant{ std::move(request_map) }; auto request = tr_variant{ std::move(request_map) };
auto response = tr_variant{}; auto response = tr_variant{};
tr_rpc_request_exec( tr_rpc_request_exec(session_, request, [&response](tr_variant&& resp) { response = std::move(resp); });
session_,
request,
[&response](tr_session* /*session*/, tr_variant&& resp) { response = std::move(resp); });
auto const* const response_map = response.get_if<tr_variant::Map>(); auto const* const response_map = response.get_if<tr_variant::Map>();
ASSERT_NE(response_map, nullptr); ASSERT_NE(response_map, nullptr);
@@ -217,10 +202,7 @@ TEST_F(RpcTest, idWrongType)
auto request = tr_variant{ std::move(request_map) }; auto request = tr_variant{ std::move(request_map) };
auto response = tr_variant{}; auto response = tr_variant{};
tr_rpc_request_exec( tr_rpc_request_exec(session_, request, [&response](tr_variant&& resp) { response = std::move(resp); });
session_,
request,
[&response](tr_session* /*session*/, tr_variant&& resp) { response = std::move(resp); });
auto const* const response_map = response.get_if<tr_variant::Map>(); auto const* const response_map = response.get_if<tr_variant::Map>();
ASSERT_NE(response_map, nullptr); ASSERT_NE(response_map, nullptr);
@@ -252,10 +234,7 @@ TEST_F(RpcTest, tagSyncLegacy)
auto request = tr_variant{ std::move(request_map) }; auto request = tr_variant{ std::move(request_map) };
auto response = tr_variant{}; auto response = tr_variant{};
tr_rpc_request_exec( tr_rpc_request_exec(session_, request, [&response](tr_variant&& resp) { response = std::move(resp); });
session_,
request,
[&response](tr_session* /*session*/, tr_variant&& resp) { response = std::move(resp); });
auto const* const response_map = response.get_if<tr_variant::Map>(); auto const* const response_map = response.get_if<tr_variant::Map>();
ASSERT_NE(response_map, nullptr); ASSERT_NE(response_map, nullptr);
@@ -293,10 +272,7 @@ TEST_F(RpcTest, idAsync)
auto request = tr_variant{ std::move(request_map) }; auto request = tr_variant{ std::move(request_map) };
auto promise = std::promise<tr_variant>{}; auto promise = std::promise<tr_variant>{};
auto future = promise.get_future(); auto future = promise.get_future();
tr_rpc_request_exec( tr_rpc_request_exec(session_, request, [&promise](tr_variant&& resp) { promise.set_value(std::move(resp)); });
session_,
request,
[&promise](tr_session* /*session*/, tr_variant&& resp) { promise.set_value(std::move(resp)); });
auto const response = future.get(); auto const response = future.get();
auto const* const response_map = response.get_if<tr_variant::Map>(); auto const* const response_map = response.get_if<tr_variant::Map>();
@@ -346,10 +322,7 @@ TEST_F(RpcTest, tagAsyncLegacy)
auto request = tr_variant{ std::move(request_map) }; auto request = tr_variant{ std::move(request_map) };
auto promise = std::promise<tr_variant>{}; auto promise = std::promise<tr_variant>{};
auto future = promise.get_future(); auto future = promise.get_future();
tr_rpc_request_exec( tr_rpc_request_exec(session_, request, [&promise](tr_variant&& resp) { promise.set_value(std::move(resp)); });
session_,
request,
[&promise](tr_session* /*session*/, tr_variant&& resp) { promise.set_value(std::move(resp)); });
auto const response = future.get(); auto const response = future.get();
auto const* const response_map = response.get_if<tr_variant::Map>(); auto const* const response_map = response.get_if<tr_variant::Map>();
@@ -373,10 +346,7 @@ TEST_F(RpcTest, NotificationSync)
auto request = tr_variant{ std::move(request_map) }; auto request = tr_variant{ std::move(request_map) };
auto response = tr_variant{}; auto response = tr_variant{};
tr_rpc_request_exec( tr_rpc_request_exec(session_, request, [&response](tr_variant&& resp) { response = std::move(resp); });
session_,
request,
[&response](tr_session* /*session*/, tr_variant&& resp) { response = std::move(resp); });
EXPECT_FALSE(response.has_value()); EXPECT_FALSE(response.has_value());
} }
@@ -398,10 +368,7 @@ TEST_F(RpcTest, NotificationAsync)
auto request = tr_variant{ std::move(request_map) }; auto request = tr_variant{ std::move(request_map) };
auto promise = std::promise<tr_variant>{}; auto promise = std::promise<tr_variant>{};
auto future = promise.get_future(); auto future = promise.get_future();
tr_rpc_request_exec( tr_rpc_request_exec(session_, request, [&promise](tr_variant&& resp) { promise.set_value(std::move(resp)); });
session_,
request,
[&promise](tr_session* /*session*/, tr_variant&& resp) { promise.set_value(std::move(resp)); });
auto const response = future.get(); auto const response = future.get();
EXPECT_FALSE(response.has_value()); EXPECT_FALSE(response.has_value());
@@ -419,10 +386,7 @@ TEST_F(RpcTest, tagNoHandler)
auto request = tr_variant{ std::move(request_map) }; auto request = tr_variant{ std::move(request_map) };
auto response = tr_variant{}; auto response = tr_variant{};
tr_rpc_request_exec( tr_rpc_request_exec(session_, request, [&response](tr_variant&& resp) { response = std::move(resp); });
session_,
request,
[&response](tr_session* /*session*/, tr_variant&& resp) { response = std::move(resp); });
auto const* const response_map = response.get_if<tr_variant::Map>(); auto const* const response_map = response.get_if<tr_variant::Map>();
ASSERT_NE(response_map, nullptr); ASSERT_NE(response_map, nullptr);
@@ -452,10 +416,7 @@ TEST_F(RpcTest, tagNoHandlerLegacy)
auto request = tr_variant{ std::move(request_map) }; auto request = tr_variant{ std::move(request_map) };
auto response = tr_variant{}; auto response = tr_variant{};
tr_rpc_request_exec( tr_rpc_request_exec(session_, request, [&response](tr_variant&& resp) { response = std::move(resp); });
session_,
request,
[&response](tr_session* /*session*/, tr_variant&& resp) { response = std::move(resp); });
auto const* const response_map = response.get_if<tr_variant::Map>(); auto const* const response_map = response.get_if<tr_variant::Map>();
ASSERT_NE(response_map, nullptr); ASSERT_NE(response_map, nullptr);
@@ -513,10 +474,7 @@ TEST_F(RpcTest, batch)
auto request = tr_variant{ std::move(request_vec) }; auto request = tr_variant{ std::move(request_vec) };
auto response = tr_variant{}; auto response = tr_variant{};
tr_rpc_request_exec( tr_rpc_request_exec(session_, request, [&response](tr_variant&& resp) { response = std::move(resp); });
session_,
request,
[&response](tr_session* /*session*/, tr_variant&& resp) { response = std::move(resp); });
auto* const response_vec_ptr = response.get_if<tr_variant::Vector>(); auto* const response_vec_ptr = response.get_if<tr_variant::Vector>();
ASSERT_NE(response_vec_ptr, nullptr); ASSERT_NE(response_vec_ptr, nullptr);
@@ -632,10 +590,7 @@ TEST_F(RpcTest, sessionGet)
auto request = tr_variant{ std::move(request_map) }; auto request = tr_variant{ std::move(request_map) };
auto response = tr_variant{}; auto response = tr_variant{};
tr_rpc_request_exec( tr_rpc_request_exec(session_, request, [&response](tr_variant&& resp) { response = std::move(resp); });
session_,
request,
[&response](tr_session* /*session*/, tr_variant&& resp) { response = std::move(resp); });
auto* response_map = response.get_if<tr_variant::Map>(); auto* response_map = response.get_if<tr_variant::Map>();
ASSERT_NE(response_map, nullptr); ASSERT_NE(response_map, nullptr);
@@ -758,10 +713,7 @@ TEST_F(RpcTest, torrentGet)
auto request = tr_variant{ std::move(request_map) }; auto request = tr_variant{ std::move(request_map) };
auto response = tr_variant{}; auto response = tr_variant{};
tr_rpc_request_exec( tr_rpc_request_exec(session_, request, [&response](tr_variant&& resp) { response = std::move(resp); });
session_,
request,
[&response](tr_session* /*session*/, tr_variant&& resp) { response = std::move(resp); });
auto* response_map = response.get_if<tr_variant::Map>(); auto* response_map = response.get_if<tr_variant::Map>();
ASSERT_NE(response_map, nullptr); ASSERT_NE(response_map, nullptr);
@@ -799,10 +751,7 @@ TEST_F(RpcTest, torrentGetLegacy)
auto request = tr_variant{ std::move(request_map) }; auto request = tr_variant{ std::move(request_map) };
auto response = tr_variant{}; auto response = tr_variant{};
tr_rpc_request_exec( tr_rpc_request_exec(session_, request, [&response](tr_variant&& resp) { response = std::move(resp); });
session_,
request,
[&response](tr_session* /*session*/, tr_variant&& resp) { response = std::move(resp); });
auto* response_map = response.get_if<tr_variant::Map>(); auto* response_map = response.get_if<tr_variant::Map>();
ASSERT_NE(response_map, nullptr); ASSERT_NE(response_map, nullptr);