fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-17 23:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Replaced View sort code with commands.

Browse Source 
git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1044 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2008-03-18 09:11:59 +00:00
parent d22e1ae30e
commit 7062935724
11 changed files with 117 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/view_manager.cc
+4 -94
View File
@@ -53,87 +53,15 @@
namespace core {
class ViewSortFalse : public ViewSort {
public:
virtual bool operator () (Download* d1, Download* d2) const {
return false;
}
};
class ViewSortName : public ViewSort {
public:
virtual bool operator () (Download* d1, Download* d2) const {
return d1->download()->name() < d2->download()->name();
}
};
class ViewSortVariable : public ViewSort {
public:
ViewSortVariable(const char* name, const char* value) : m_name(name), m_value(value) {}
virtual bool operator () (Download* d1, Download* d2) const {
return
rpc::call_command_string(m_name, rpc::make_target(d1)) == m_value &&
rpc::call_command_string(m_name, rpc::make_target(d2)) != m_value;
}
private:
const char* m_name;
const char* m_value;
};
class ViewSortVariableValue : public ViewSort {
public:
ViewSortVariableValue(const char* name, bool reverse = false) : m_name(name), m_reverse(reverse) {}
virtual bool operator () (Download* d1, Download* d2) const {
if (m_reverse)
return rpc::call_command_value(m_name, rpc::make_target(d2)) < rpc::call_command_value(m_name, rpc::make_target(d1));
else
return rpc::call_command_value(m_name, rpc::make_target(d1)) < rpc::call_command_value(m_name, rpc::make_target(d2));
}
private:
const char* m_name;
bool m_reverse;
};
class ViewSortReverse : public ViewSort {
public:
ViewSortReverse(ViewSort* s) : m_sort(s) {}
~ViewSortReverse() { delete m_sort; }
virtual bool operator () (Download* d1, Download* d2) const {
return (*m_sort)(d2, d1);
}
private:
ViewSort* m_sort;
};
// Really need to implement a factory and allow options in the sort
// statements.
ViewManager::ViewManager(DownloadList* dl) :
m_list(dl) {
// m_sort["first"] = new ViewSortNot(new ViewSort());
m_sort["last"] = new ViewSortFalse();
m_sort["name"] = new ViewSortName();
m_sort["name_reverse"] = new ViewSortReverse(new ViewSortName());
m_sort["stopped"] = new ViewSortVariableValue("d.get_state");
m_sort["started"] = new ViewSortVariableValue("d.get_state", true);
m_sort["complete"] = new ViewSortVariableValue("d.get_complete");
m_sort["incomplete"] = new ViewSortVariableValue("d.get_complete", true);
m_sort["state_changed"] = new ViewSortVariableValue("d.get_state_changed");
m_sort["state_changed_reverse"] = new ViewSortVariableValue("d.get_state_changed", true);
}
void
ViewManager::clear() {
std::for_each(begin(), end(), rak::call_delete<View>());
std::for_each(m_sort.begin(), m_sort.end(), rak::on(rak::mem_ref(&sort_map::value_type::second), rak::call_delete<ViewSort>()));
base_type::clear();
}
@@ -164,23 +92,6 @@ ViewManager::find_throw(const std::string& name) {
return itr;
}
inline ViewManager::sort_list
ViewManager::build_sort_list(const sort_args& args) {
View::sort_list sortList;
sortList.reserve(args.size());
for (sort_args::const_iterator itr = args.begin(), last = args.end(); itr != last; ++itr) {
sort_map::const_iterator sortItr = m_sort.find(itr->c_str());
if (sortItr == m_sort.end())
throw torrent::input_error("Invalid sorting identifier.");
sortList.push_back(sortItr->second);
}
return sortList;
}
void
ViewManager::sort(const std::string& name, uint32_t timeout) {
iterator viewItr = find_throw(name);
@@ -190,22 +101,21 @@ ViewManager::sort(const std::string& name, uint32_t timeout) {
// Should we rename sort, or add a seperate function?
(*viewItr)->filter();
(*viewItr)->sort();
}
void
ViewManager::set_sort_new(const std::string& name, const sort_args& sort) {
ViewManager::set_sort_new(const std::string& name, const std::string& cmd) {
iterator viewItr = find_throw(name);
(*viewItr)->set_sort_new(build_sort_list(sort));
(*viewItr)->set_sort_new(cmd);
}
void
ViewManager::set_sort_current(const std::string& name, const sort_args& sort) {
ViewManager::set_sort_current(const std::string& name, const std::string& cmd) {
iterator viewItr = find_throw(name);
(*viewItr)->set_sort_current(build_sort_list(sort));
(*viewItr)->set_sort_current(cmd);
}
void