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

fix client_test filter resume files, to only load valid ones

This commit is contained in:
arvidn 2018-03-07 14:23:29 +01:00 committed by Arvid Norberg
parent 685679bbbb
commit cd1b2108f1
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/client_test.cpp
View File

@ -979,6 +979,18 @@ void print_piece(lt::partial_piece_info const* pp
out += "]"; out += "]";
} }
bool is_resume_file(std::string const& s)
{
static std::string const hex_digit = "0123456789abcdef";
if (s.size() != 40 + 7) return false;
if (s.substr(40) != ".resume") return false;
for (char const c : s.substr(0, 40))
{
if (hex_digit.find(c) == std::string::npos) return false;
}
return true;
}
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
#ifndef _WIN32 #ifndef _WIN32
@ -1253,7 +1265,7 @@ example alert_masks:
std::thread resume_data_loader([&ses] std::thread resume_data_loader([&ses]
{ {
// load resume files // load resume files
lt::error_code ec; lt::error_code ec;
std::string const resume_dir = path_append(save_path, ".resume"); std::string const resume_dir = path_append(save_path, ".resume");
std::vector<std::string> ents = list_dir(resume_dir std::vector<std::string> ents = list_dir(resume_dir
, [](lt::string_view p) { return p.size() > 7 && p.substr(p.size() - 7) == ".resume"; }, ec); , [](lt::string_view p) { return p.size() > 7 && p.substr(p.size() - 7) == ".resume"; }, ec);
@ -1266,6 +1278,8 @@ example alert_masks:
{ {
for (auto const& e : ents) for (auto const& e : ents)
{ {
// only load resume files of the form <info-hash>.resume
if (!is_resume_file(e)) continue;
std::string const file = path_append(resume_dir, e); std::string const file = path_append(resume_dir, e);
std::vector<char> resume_data; std::vector<char> resume_data;
@ -1722,7 +1736,7 @@ COLUMN OPTIONS
if (print_matrix) if (print_matrix)
{ {
int height = 0; int height = 0;
print(piece_matrix(s.pieces, std::min(terminal_width, 160), &height).c_str()); print(piece_matrix(s.pieces, terminal_width, &height).c_str());
pos += height; pos += height;
} }