jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix state rendering in client_test for checking and queued-for-checking torrents

Browse Source
This commit is contained in:
Arvid Norberg
2011-08-06 20:45:21 +00:00
parent 3e505f01fc
commit 4f7c9e2be2
1 changed files with 35 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
examples/client_test.cpp
View File

@@ -1806,57 +1806,44 @@ int main(int argc, char* argv[])
if (s.num_incomplete >= 0) downloaders = s.num_incomplete; if (s.num_incomplete >= 0) downloaders = s.num_incomplete;
else downloaders = s.list_peers - s.list_seeds; else downloaders = s.list_peers - s.list_seeds;
if (s.state != torrent_status::queued_for_checking && s.state != torrent_status::checking_files) snprintf(str, sizeof(str), "%s%-13s down: (%s%s%s) up: %s%s%s (%s%s%s) swarm: %4d:%4d"
{ " bw queue: (%d|%d) all-time (Rx: %s%s%s Tx: %s%s%s) seed rank: %x %c%s\n"
snprintf(str, sizeof(str), "%s%-13s down: (%s%s%s) up: %s%s%s (%s%s%s) swarm: %4d:%4d" , (!s.paused && !s.auto_managed)?"[F] ":""
" bw queue: (%d|%d) all-time (Rx: %s%s%s Tx: %s%s%s) seed rank: %x %c%s\n" , (s.paused && !s.auto_managed)?"paused":
, (!s.paused && !s.auto_managed)?"[F] ":"" (s.paused && s.auto_managed)?"queued":
, (s.paused && !s.auto_managed)?"paused": state_str[s.state]
(s.paused && s.auto_managed)?"queued": , esc("32"), add_suffix(s.total_download).c_str(), term
state_str[s.state] , esc("31"), add_suffix(s.upload_rate, "/s").c_str(), term
, esc("32"), add_suffix(s.total_download).c_str(), term , esc("31"), add_suffix(s.total_upload).c_str(), term
, esc("31"), add_suffix(s.upload_rate, "/s").c_str(), term , downloaders, seeds
, esc("31"), add_suffix(s.total_upload).c_str(), term , s.up_bandwidth_queue, s.down_bandwidth_queue
, downloaders, seeds , esc("32"), add_suffix(s.all_time_download).c_str(), term
, s.up_bandwidth_queue, s.down_bandwidth_queue , esc("31"), add_suffix(s.all_time_upload).c_str(), term
, esc("32"), add_suffix(s.all_time_download).c_str(), term , s.seed_rank, s.need_save_resume?'S':' ', esc("0"));
, esc("31"), add_suffix(s.all_time_upload).c_str(), term out += str;
, s.seed_rank, s.need_save_resume?'S':' ', esc("0")); ++lines_printed;
out += str;
++lines_printed;
if (torrent_index != active_torrent && s.state == torrent_status::seeding) continue; if (torrent_index != active_torrent && s.state == torrent_status::seeding) continue;
char const* progress_bar_color = "33"; // yellow char const* progress_bar_color = "33"; // yellow
if (s.state == torrent_status::downloading_metadata) if (s.state == torrent_status::downloading_metadata)
{
progress_bar_color = "35"; // magenta
}
else if (s.current_tracker.empty())
{
progress_bar_color = "31"; // red
}
else if (sess_stat.has_incoming_connections)
{
progress_bar_color = "32"; // green
}
snprintf(str, sizeof(str), " %-10s: %s%-11"PRId64"%s Bytes %6.2f%% %s\n"
, s.sequential_download?"sequential":"progress"
, esc("32"), s.total_done, esc("0")
, s.progress_ppm / 10000.f
, progress_bar(s.progress_ppm / 1000, terminal_width - 43, progress_bar_color).c_str());
out += str;
}
else
{ {
snprintf(str, sizeof(str), "%-13s %s\n" progress_bar_color = "35"; // magenta
, (!s.paused && !s.auto_managed)?"[F] ":""
, (s.paused && !s.auto_managed)?"paused":
(s.paused && s.auto_managed)?"queued":
state_str[s.state]
, progress_bar(s.progress_ppm / 1000, terminal_width - 43 - 20, "35").c_str());
out += str;
} }
else if (s.current_tracker.empty())
{
progress_bar_color = "31"; // red
}
else if (sess_stat.has_incoming_connections)
{
progress_bar_color = "32"; // green
}
snprintf(str, sizeof(str), " %-10s: %s%-11"PRId64"%s Bytes %6.2f%% %s\n"
, s.sequential_download?"sequential":"progress"
, esc("32"), s.total_done, esc("0")
, s.progress_ppm / 10000.f
, progress_bar(s.progress_ppm / 1000, terminal_width - 43, progress_bar_color).c_str());
out += str;
++lines_printed; ++lines_printed;
if (print_piece_bar && s.state != torrent_status::seeding) if (print_piece_bar && s.state != torrent_status::seeding)