mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: filename too long warning when adding magnet links (#3259) 

Fixes #3117.
This commit is contained in:
Charles Kerr 2022-06-11 15:46:40 -05:00 committed by GitHub
parent cd592d0091
commit 57c49437eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libtransmission/rpcimpl.cc
View File

@ -1690,12 +1690,13 @@ static char const* torrentAdd(tr_session* session, tr_variant* args_in, tr_varia
}
else
{
// these two tr_ctorSet*() functions require zero-terminated strings
auto const filename_sz = std::string{ filename };
if (!tr_ctorSetMetainfoFromFile(ctor, filename_sz.c_str(), nullptr))
if (tr_sys_path_exists(tr_pathbuf{ filename }))
{
tr_ctorSetMetainfoFromMagnetLink(ctor, filename_sz.c_str(), nullptr);
tr_ctorSetMetainfoFromFile(ctor, filename);
}
else
{
tr_ctorSetMetainfoFromMagnetLink(ctor, filename);
}
}

4
libtransmission/torrent.h
View File

@ -774,8 +774,8 @@ tr_peer_id_t const& tr_torrentGetPeerId(tr_torrent* tor);
tr_torrent_metainfo tr_ctorStealMetainfo(tr_ctor* ctor);
bool tr_ctorSetMetainfoFromFile(tr_ctor* ctor, std::string_view filename, tr_error** error);
bool tr_ctorSetMetainfoFromMagnetLink(tr_ctor* ctor, std::string_view filename, tr_error** error);
bool tr_ctorSetMetainfoFromFile(tr_ctor* ctor, std::string_view filename, tr_error** error = nullptr);
bool tr_ctorSetMetainfoFromMagnetLink(tr_ctor* ctor, std::string_view filename, tr_error** error = nullptr);
void tr_ctorSetLabels(tr_ctor* ctor, tr_quark const* labels, size_t n_labels);
tr_torrent::labels_t const& tr_ctorGetLabels(tr_ctor const* ctor);