premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

merged magnet link changes from RC_0_16

This commit is contained in:
Arvid Norberg 2012-11-23 16:10:26 +00:00
parent 614ac10de1
commit 08454e518a
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/magnet_uri.cpp
View File

@ -55,20 +55,13 @@ namespace libtorrent
num_chars += snprintf(ret + num_chars, sizeof(ret) - num_chars, "&dn=%s"
, escape_string(name.c_str(), name.length()).c_str());
std::string tracker;
torrent_status st = handle.status();
if (!st.current_tracker.empty())
std::vector<announce_entry> const& tr = handle.trackers();
for (std::vector<announce_entry>::const_iterator i = tr.begin(), end(tr.end()); i != end; ++i)
{
tracker = st.current_tracker;
}
else
{
std::vector<announce_entry> const& tr = handle.trackers();
if (!tr.empty()) tracker = tr[0].url;
}
if (!tracker.empty())
num_chars += snprintf(ret + num_chars, sizeof(ret) - num_chars, "&tr=%s"
, escape_string(tracker.c_str(), tracker.size()).c_str());
, escape_string(i->url.c_str(), i->url.length()).c_str());
}
return ret;
}
@ -87,10 +80,10 @@ namespace libtorrent
, escape_string(name.c_str(), name.length()).c_str());
std::vector<announce_entry> const& tr = info.trackers();
if (!tr.empty())
for (std::vector<announce_entry>::const_iterator i = tr.begin(), end(tr.end()); i != end; ++i)
{
num_chars += snprintf(ret + num_chars, sizeof(ret) - num_chars, "&tr=%s"
, escape_string(tr[0].url.c_str(), tr[0].url.length()).c_str());
, escape_string(i->url.c_str(), i->url.length()).c_str());
}
return ret;