Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 12:28:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove tr_variantDictFindStr() (#2180)

Browse Source 
* refactor: remove tr_variantDictFindStr
This commit is contained in:
Charles Kerr
2021-11-15 23:20:06 -06:00
committed by GitHub
parent a21594b0ce
commit 73edd7b642
5 changed files with 26 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libtransmission/rpcimpl.cc
View File

@@ -1735,9 +1735,8 @@ static char const* torrentAdd(tr_session* session, tr_variant* args_in, tr_varia
return "no filename or metainfo specified";
}
char const* download_dir = nullptr;
if (tr_variantDictFindStr(args_in, TR_KEY_download_dir, &download_dir, nullptr) && tr_sys_path_is_relative(download_dir))
auto download_dir = std::string_view{};
if (tr_variantDictFindStrView(args_in, TR_KEY_download_dir, &download_dir) && tr_sys_path_is_relative(download_dir))
{
return "download directory path is not absolute";
}
@@ -1752,9 +1751,10 @@ static char const* torrentAdd(tr_session* session, tr_variant* args_in, tr_varia
auto cookies = std::string_view{};
(void)tr_variantDictFindStrView(args_in, TR_KEY_cookies, &cookies);
if (download_dir != nullptr)
if (!std::empty(download_dir))
{
tr_ctorSetDownloadDir(ctor, TR_FORCE, download_dir);
auto const sz_download_dir = std::string{ download_dir };
tr_ctorSetDownloadDir(ctor, TR_FORCE, sz_download_dir.c_str());
}
if (tr_variantDictFindBool(args_in, TR_KEY_paused, &boolVal))