* Added the rarity of chunks to ChunkStatistics, only non-complete

peers. This will be even more lazy and only do this when needed.

* 'i' key in the download view will show rarity of pieces.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@655 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2006-03-22 21:13:34 +00:00
parent 14475fd4c1
commit f953c8935e
9 changed files with 320 additions and 1 deletions
+2
View File
@@ -6,6 +6,8 @@ libsub_ui_a_SOURCES = \
download_list.cc \
download_list.h \
element_base.h \
element_chunks_seen.cc \
element_chunks_seen.h \
element_download_list.cc \
element_download_list.h \
element_file_list.cc \
+4
View File
@@ -53,6 +53,7 @@
#include "element_peer_info.h"
#include "element_peer_list.h"
#include "element_tracker_list.h"
#include "element_chunks_seen.h"
namespace ui {
@@ -74,6 +75,7 @@ Download::Download(DPtr d, Control* c) :
m_uiArray[DISPLAY_PEER_INFO] = new ElementPeerInfo(d, &m_peers, &m_focus);
m_uiArray[DISPLAY_FILE_LIST] = new ElementFileList(d);
m_uiArray[DISPLAY_TRACKER_LIST] = new ElementTrackerList(d);
m_uiArray[DISPLAY_CHUNKS_SEEN] = new ElementChunksSeen(d);
bind_keys();
@@ -267,6 +269,7 @@ Download::bind_keys() {
(*m_bindings)['p'] = sigc::bind(sigc::mem_fun(*this, &Download::receive_change), DISPLAY_PEER_INFO);
(*m_bindings)['o'] = sigc::bind(sigc::mem_fun(*this, &Download::receive_change), DISPLAY_TRACKER_LIST);
(*m_bindings)['i'] = sigc::bind(sigc::mem_fun(*this, &Download::receive_change), DISPLAY_CHUNKS_SEEN);
(*m_bindings)[KEY_UP] = sigc::mem_fun(*this, &Download::receive_prev);
(*m_bindings)[KEY_DOWN] = sigc::mem_fun(*this, &Download::receive_next);
@@ -276,6 +279,7 @@ Download::bind_keys() {
m_uiArray[DISPLAY_PEER_INFO]->get_bindings()[KEY_LEFT] = sigc::bind(sigc::mem_fun(*this, &Download::receive_change), DISPLAY_PEER_LIST);
m_uiArray[DISPLAY_FILE_LIST]->get_bindings()[KEY_LEFT] = sigc::bind(sigc::mem_fun(*this, &Download::receive_change), DISPLAY_PEER_LIST);
m_uiArray[DISPLAY_TRACKER_LIST]->get_bindings()[KEY_LEFT] = sigc::bind(sigc::mem_fun(*this, &Download::receive_change), DISPLAY_PEER_LIST);
m_uiArray[DISPLAY_CHUNKS_SEEN]->get_bindings()[KEY_LEFT] = sigc::bind(sigc::mem_fun(*this, &Download::receive_change), DISPLAY_PEER_LIST);
// Doesn't belong here.
m_uiArray[DISPLAY_PEER_LIST]->get_bindings()['*'] = sigc::mem_fun(*this, &Download::receive_snub_peer);
+1
View File
@@ -74,6 +74,7 @@ public:
DISPLAY_PEER_INFO,
DISPLAY_FILE_LIST,
DISPLAY_TRACKER_LIST,
DISPLAY_CHUNKS_SEEN,
DISPLAY_MAX_SIZE
} Display;
+93
View File
@@ -0,0 +1,93 @@
// rTorrent - BitTorrent client
// Copyright (C) 2005-2006, Jari Sundell
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// In addition, as a special exception, the copyright holders give
// permission to link the code of portions of this program with the
// OpenSSL library under certain conditions as described in each
// individual source file, and distribute linked combinations
// including the two.
//
// You must obey the GNU General Public License in all respects for
// all of the code used other than OpenSSL. If you modify file(s)
// with this exception, you may extend this exception to your version
// of the file(s), but you are not obligated to do so. If you do not
// wish to do so, delete this exception statement from your version.
// If you delete this exception statement from all source files in the
// program, then also delete it here.
//
// Contact: Jari Sundell <jaris@ifi.uio.no>
//
// Skomakerveien 33
// 3185 Skoppum, NORWAY
#include "config.h"
#include <stdexcept>
#include "display/window_download_chunks_seen.h"
#include "input/manager.h"
#include "control.h"
#include "element_chunks_seen.h"
namespace ui {
ElementChunksSeen::ElementChunksSeen(core::Download* d) :
m_download(d),
m_window(NULL) {
// m_bindings[KEY_DOWN] = sigc::mem_fun(*this, &ElementChunksSeen::receive_next);
// m_bindings[KEY_UP] = sigc::mem_fun(*this, &ElementChunksSeen::receive_prev);
// m_bindings[' '] = sigc::mem_fun(*this, &ElementChunksSeen::receive_cycle_group);
// m_bindings['*'] = sigc::mem_fun(*this, &ElementChunksSeen::receive_disable);
}
void
ElementChunksSeen::activate(Control* c, MItr mItr) {
if (m_window != NULL)
throw std::logic_error("ui::ElementChunksSeen::activate(...) called on an object in the wrong state");
c->input()->push_front(&m_bindings);
*mItr = m_window = new WChunksSeen(m_download);
}
void
ElementChunksSeen::disable(Control* c) {
if (m_window == NULL)
throw std::logic_error("ui::ElementChunksSeen::disable(...) called on an object in the wrong state");
c->input()->erase(&m_bindings);
delete m_window;
m_window = NULL;
}
// void
// ElementChunksSeen::receive_disable() {
// if (m_window == NULL)
// throw std::logic_error("ui::ElementChunksSeen::receive_disable(...) called on a disabled object");
// if (m_download->get_download().tracker(m_focus).is_enabled())
// m_download->get_download().tracker(m_focus).disable();
// else
// m_download->get_download().tracker(m_focus).enable();
// m_window->mark_dirty();
// }
}
+70
View File
@@ -0,0 +1,70 @@
// rTorrent - BitTorrent client
// Copyright (C) 2005-2006, Jari Sundell
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// In addition, as a special exception, the copyright holders give
// permission to link the code of portions of this program with the
// OpenSSL library under certain conditions as described in each
// individual source file, and distribute linked combinations
// including the two.
//
// You must obey the GNU General Public License in all respects for
// all of the code used other than OpenSSL. If you modify file(s)
// with this exception, you may extend this exception to your version
// of the file(s), but you are not obligated to do so. If you do not
// wish to do so, delete this exception statement from your version.
// If you delete this exception statement from all source files in the
// program, then also delete it here.
//
// Contact: Jari Sundell <jaris@ifi.uio.no>
//
// Skomakerveien 33
// 3185 Skoppum, NORWAY
#ifndef RTORRENT_UI_ELEMENT_CHUNKS_SEEN_H
#define RTORRENT_UI_ELEMENT_CHUNKS_SEEN_H
#include "core/download.h"
#include "element_base.h"
class Control;
namespace display {
class WindowDownloadChunksSeen;
}
namespace ui {
class ElementChunksSeen : public ElementBase {
public:
typedef display::WindowDownloadChunksSeen WChunksSeen;
ElementChunksSeen(core::Download* d);
void activate(Control* c, MItr mItr);
void disable(Control* c);
private:
// void receive_disable();
core::Download* m_download;
WChunksSeen* m_window;
};
}
#endif