|
|
@ -1929,6 +1929,10 @@ bool Session::addTorrent_impl(CreateTorrentParams params, const MagnetUri &magne |
|
|
|
, (patchedFastresumeData.constData() + patchedFastresumeData.size())}; |
|
|
|
, (patchedFastresumeData.constData() + patchedFastresumeData.size())}; |
|
|
|
p.flags |= lt::add_torrent_params::flag_use_resume_save_path; |
|
|
|
p.flags |= lt::add_torrent_params::flag_use_resume_save_path; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// load from .torrent file when fastresume doesn't contain the required `info` dict
|
|
|
|
|
|
|
|
if (!patchedFastresumeData.contains("4:infod")) |
|
|
|
|
|
|
|
p.ti = torrentInfo.nativeInfo(); |
|
|
|
|
|
|
|
|
|
|
|
// Still setup the default parameters and let libtorrent handle
|
|
|
|
// Still setup the default parameters and let libtorrent handle
|
|
|
|
// the parameter merging
|
|
|
|
// the parameter merging
|
|
|
|
hasCompleteFastresume = false; |
|
|
|
hasCompleteFastresume = false; |
|
|
@ -1936,6 +1940,10 @@ bool Session::addTorrent_impl(CreateTorrentParams params, const MagnetUri &magne |
|
|
|
lt::error_code ec; |
|
|
|
lt::error_code ec; |
|
|
|
p = lt::read_resume_data(fastresumeData, ec); |
|
|
|
p = lt::read_resume_data(fastresumeData, ec); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// load from .torrent file when fastresume doesn't contain the required `info` dict
|
|
|
|
|
|
|
|
if (!p.ti->is_valid()) |
|
|
|
|
|
|
|
p.ti = torrentInfo.nativeInfo(); |
|
|
|
|
|
|
|
|
|
|
|
// libtorrent will always apply `file_priorities` to torrents,
|
|
|
|
// libtorrent will always apply `file_priorities` to torrents,
|
|
|
|
// if the field is present then the fastresume is considered to
|
|
|
|
// if the field is present then the fastresume is considered to
|
|
|
|
// be correctly generated and should be complete.
|
|
|
|
// be correctly generated and should be complete.
|
|
|
@ -1972,10 +1980,10 @@ bool Session::addTorrent_impl(CreateTorrentParams params, const MagnetUri &magne |
|
|
|
static_cast<lt::download_priority_t::underlying_type>(priority)); |
|
|
|
static_cast<lt::download_priority_t::underlying_type>(priority)); |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
p.ti = torrentInfo.nativeInfo(); |
|
|
|
p.ti = torrentInfo.nativeInfo(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Common
|
|
|
|
// Common
|
|
|
|
#if (LIBTORRENT_VERSION_NUM < 10200) |
|
|
|
#if (LIBTORRENT_VERSION_NUM < 10200) |
|
|
|