fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-10 20:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Cleaned up torrent/download.h.

Browse Source 
* Removed raw_value as it is redundant.

* Fixed 'greater' command and added 'equal'. Patch by Josef Drexler.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1146 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2010-03-15 23:31:58 +00:00
parent c5e839287d
commit 589c8c147b
4 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/command_ui.cc
+18 -8
View File
@@ -212,7 +212,7 @@ apply_or(rpc::target_type target, const torrent::Object& rawArgs) {
}
torrent::Object
apply_less(rpc::target_type target, const torrent::Object& rawArgs) {
apply_cmp(rpc::target_type target, const torrent::Object& rawArgs) {
const torrent::Object::list_type& args = rawArgs.as_list();
// We only need to check if empty() since if size() == 1 it calls
@@ -239,16 +239,25 @@ apply_less(rpc::target_type target, const torrent::Object& rawArgs) {
throw torrent::input_error("Type mismatch.");
switch (result1.type()) {
case torrent::Object::TYPE_VALUE: return result1.as_value() < result2.as_value();
case torrent::Object::TYPE_STRING: return result1.as_string() < result2.as_string();
default: return (int64_t)false;
case torrent::Object::TYPE_VALUE: return result1.as_value() - result2.as_value();
case torrent::Object::TYPE_STRING: return result1.as_string().compare(result2.as_string());
default: return torrent::Object();
}
}
// Fixme.
torrent::Object
apply_greater(rpc::target_type target, const torrent::Object& rawArgs) {
return (int64_t)!apply_less(target, rawArgs).as_value();
torrent::Object apply_less(rpc::target_type target, const torrent::Object& rawArgs) {
torrent::Object result = apply_cmp(target, rawArgs);
return result.is_value() ? result.as_value() < 0 : (int64_t)false;
}
torrent::Object apply_greater(rpc::target_type target, const torrent::Object& rawArgs) {
torrent::Object result = apply_cmp(target, rawArgs);
return result.is_value() ? result.as_value() > 0 : (int64_t)false;
}
torrent::Object apply_equal(rpc::target_type target, const torrent::Object& rawArgs) {
torrent::Object result = apply_cmp(target, rawArgs);
return result.is_value() ? result.as_value() == 0 : (int64_t)false;
}
torrent::Object
@@ -505,6 +514,7 @@ initialize_command_ui() {
ADD_ANY_LIST("less", rak::ptr_fn(&apply_less));
ADD_ANY_LIST("greater", rak::ptr_fn(&apply_greater));
ADD_ANY_LIST("equal", rak::ptr_fn(&apply_equal));
// A temporary command for handling stuff until we get proper
// support for seperation of commands and literals.