wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

restore some accidental removal in client_test from previous patch (#812)

This commit is contained in:
Arvid Norberg 2016-06-13 00:06:15 -04:00 committed by GitHub
parent 6e55c0564f
commit 53c9b7ad25
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
examples/client_test.cpp
View File

@ -1236,6 +1236,12 @@ int main(int argc, char* argv[])
for (int i = 1; i < argc; ++i) for (int i = 1; i < argc; ++i)
{ {
if (argv[i][0] != '-')
{
torrents.push_back(argv[i]);
continue;
}
if (std::strcmp(argv[i], "--list-settings") == 0) if (std::strcmp(argv[i], "--list-settings") == 0)
{ {
// print all libtorrent settings and exit // print all libtorrent settings and exit
@ -1411,26 +1417,22 @@ int main(int argc, char* argv[])
} }
#endif #endif
for (std::vector<add_torrent_params>::iterator i = magnet_links.begin() for (auto const& magnet : magnet_links)
, end(magnet_links.end()); i != end; ++i) ses.async_add_torrent(magnet);
{
ses.async_add_torrent(*i);
}
for (std::vector<std::string>::iterator i = torrents.begin() for (auto const& i : torrents)
, end(torrents.end()); i != end; ++i)
{ {
if (std::strstr(i->c_str(), "http://") == i->c_str() if (std::strstr(i.c_str(), "http://") == i.c_str()
|| std::strstr(i->c_str(), "https://") == i->c_str() || std::strstr(i.c_str(), "https://") == i.c_str()
|| std::strstr(i->c_str(), "magnet:") == i->c_str()) || std::strstr(i.c_str(), "magnet:") == i.c_str())
{ {
add_torrent_params p; add_torrent_params p;
if (std::strstr(i->c_str(), "magnet:") == i->c_str()) if (std::strstr(i.c_str(), "magnet:") == i.c_str())
{ {
add_torrent_params tmp; add_torrent_params tmp;
ec.clear(); ec.clear();
parse_magnet_uri(*i, tmp, ec); parse_magnet_uri(i, tmp, ec);
if (ec) continue; if (ec) continue;
@ -1452,15 +1454,15 @@ int main(int argc, char* argv[])
if (share_mode) p.flags |= add_torrent_params::flag_share_mode; if (share_mode) p.flags |= add_torrent_params::flag_share_mode;
p.save_path = save_path; p.save_path = save_path;
p.storage_mode = (storage_mode_t)allocation_mode; p.storage_mode = (storage_mode_t)allocation_mode;
p.url = *i; p.url = i;
std::printf("adding URL: %s\n", i->c_str()); std::printf("adding URL: %s\n", i.c_str());
ses.async_add_torrent(p); ses.async_add_torrent(p);
continue; continue;
} }
// if it's a torrent file, open it as usual // if it's a torrent file, open it as usual
add_torrent(ses, files, i->c_str()); add_torrent(ses, files, i.c_str());
} }
// main loop // main loop