From 259cb77799de7e17d12f5332e99f9b5ea3c2d1c2 Mon Sep 17 00:00:00 2001 From: rakshasa Date: Sun, 27 Jan 2008 14:01:10 +0000 Subject: [PATCH] * Made PCB inherit from Peer. * Added man page entry for ^E. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1032 e378c898-3ddf-0310-93e7-cc216c733640 --- doc/rtorrent.1.xml | 9 +++++++++ src/command_peer.cc | 8 ++++---- src/display/window_peer_list.cc | 14 +++++++------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/doc/rtorrent.1.xml b/doc/rtorrent.1.xml index 095368be..5d05250a 100644 --- a/doc/rtorrent.1.xml +++ b/doc/rtorrent.1.xml @@ -150,6 +150,15 @@ Close a torrent and its files. + + ^E + +Set the 'create/resize queued' flags on all files in a torrent. This +is necessary if the underlying files in a torrent have been deleted or +truncates, and thus rtorrent much recreate them. + + + ^R diff --git a/src/command_peer.cc b/src/command_peer.cc index deff3e89..ca9adc6e 100644 --- a/src/command_peer.cc +++ b/src/command_peer.cc @@ -68,25 +68,25 @@ retrieve_p_id_html(torrent::Peer* peer) { torrent::Object retrieve_p_address(torrent::Peer* peer) { - return rak::socket_address::cast_from(peer->info()->socket_address())->address_str(); + return rak::socket_address::cast_from(peer->peer_info()->socket_address())->address_str(); } torrent::Object retrieve_p_port(torrent::Peer* peer) { - return rak::socket_address::cast_from(peer->info()->socket_address())->port(); + return rak::socket_address::cast_from(peer->peer_info()->socket_address())->port(); } torrent::Object retrieve_p_client_version(torrent::Peer* peer) { char buf[128]; - display::print_client_version(buf, buf + 128, peer->info()->client_info()); + display::print_client_version(buf, buf + 128, peer->peer_info()->client_info()); return std::string(buf); } torrent::Object retrieve_p_options_str(torrent::Peer* peer) { - return rak::transform_hex(peer->info()->options(), peer->info()->options() + 8); + return rak::transform_hex(peer->peer_info()->options(), peer->peer_info()->options() + 8); } torrent::Object diff --git a/src/display/window_peer_list.cc b/src/display/window_peer_list.cc index a4fb01aa..628b74bc 100644 --- a/src/display/window_peer_list.cc +++ b/src/display/window_peer_list.cc @@ -110,20 +110,20 @@ WindowPeerList::redraw() { char remoteChoked; - if (!p->is_remote_choked_limited()) + if (!p->is_down_choked_limited()) remoteChoked = 'U'; - else if (p->is_remote_queued()) + else if (p->is_down_queued()) remoteChoked = 'Q'; else remoteChoked = 'C'; m_canvas->print(x, y, "%c/%c%c/%c%c", p->is_encrypted() ? (p->is_incoming() ? 'R' : 'L') : (p->is_incoming() ? 'r' : 'l'), - p->is_remote_choked() ? std::tolower(remoteChoked) : remoteChoked, + p->is_down_choked() ? std::tolower(remoteChoked) : remoteChoked, - p->is_remote_interested() ? 'i' : 'n', - p->is_local_choked() ? 'c' : 'u', - p->is_local_interested() ? 'i' : 'n'); + p->is_down_interested() ? 'i' : 'n', + p->is_up_choked() ? 'c' : 'u', + p->is_up_interested() ? 'i' : 'n'); x += 9; m_canvas->print(x, y, "%i/%i", p->outgoing_queue_size(), p->incoming_queue_size()); @@ -150,7 +150,7 @@ WindowPeerList::redraw() { x += 7; char buf[128]; - print_client_version(buf, buf + 128, p->info()->client_info()); + print_client_version(buf, buf + 128, p->peer_info()->client_info()); m_canvas->print(x, y, "%s", buf);