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

fix exporting files from partfile while seeding

This commit is contained in:
Arvid Norberg 2018-07-12 23:12:54 +02:00 committed by Arvid Norberg
parent 5d3ac8ff5c
commit 5bb5ba145f
3 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,3 +1,4 @@
* fix exporting files from partfile while seeding
* fix potential deadlock on Windows, caused by performing restricted
tasks from within DllMain
* fix issue when subsequent file priority updates cause torrent to stop

4
src/torrent.cpp
View File

@ -5704,8 +5704,6 @@ namespace {
{
INVARIANT_CHECK;
if (is_seed()) return;
std::vector<boost::uint8_t> const new_priority = fix_priorities(files
, valid_metadata() ? &m_torrent_file->files() : NULL);
@ -5726,8 +5724,6 @@ namespace {
{
INVARIANT_CHECK;
if (is_seed()) return;
// setting file priority on a torrent that doesn't have metadata yet is
// similar to having passed in file priorities through add_torrent_params.
// we store the priorities in m_file_priority until we get the metadata

50
test/test_priority.cpp
View File

@ -452,3 +452,53 @@ TORRENT_TEST(no_metadata_piece_prio)
ses.remove_torrent(h);
}
TORRENT_TEST(export_file_while_seed)
{
settings_pack pack = settings();
lt::session ses(pack);
error_code ec;
create_directory("tmp2_priority", ec);
std::ofstream file("tmp2_priority/temporary");
boost::shared_ptr<torrent_info> t = ::create_torrent(&file, "temporary", 16 * 1024, 13, false);
file.close();
add_torrent_params addp;
addp.flags &= ~add_torrent_params::flag_paused;
addp.flags &= ~add_torrent_params::flag_auto_managed;
addp.save_path = ".";
addp.ti = t;
torrent_handle h = ses.add_torrent(addp);
// write to the partfile
h.file_priority(0, 0);
std::vector<char> piece(16 * 1024);
for (int i = 0; i < int(piece.size()); ++i)
piece[i] = (i % 26) + 'A';
for (int i = 0; i < t->num_pieces(); ++i)
h.add_piece(i, &piece[0], piece.size());
TEST_CHECK(!exists("temporary"));
for (int i = 0; i < 10; ++i)
{
if (h.status().is_seeding) break;
test_sleep(100);
}
TEST_EQUAL(h.status().is_seeding, true);
// this should cause the file to be exported
h.file_priority(0, 1);
for (int i = 0; i < 10; ++i)
{
if (h.file_priority(0) == 1) break;
test_sleep(100);
}
TEST_CHECK(exists("temporary"));
}