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

* Fixed more redirected commands.

Browse Source 
* Cleaned up the Command stack implementation.

* Added framework for object_storage class that will hold variables and user-defined command lists.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1162 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2010-04-11 14:19:27 +00:00
parent 856228da3d
commit 74bae32243
15 changed files with 276 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/command_dynamic.cc
+30 -17
View File
@@ -109,10 +109,22 @@ system_method_insert(const torrent::Object::list_type& args) {
rpc::commands.insert_type(create_new_key<0>(rawKey, ""), command, slot, flags, NULL, NULL);
} else if (options.find("simple") != std::string::npos) {
rpc::Command::any_slot slot = &rpc::CommandFunction::call;
rpc::Command* command = new rpc::CommandFunction(system_method_generate_command(++itrArgs, args.end()));
rpc::command_base* command = new rpc::command_base();
rpc::commands.insert_type(create_new_key<0>(rawKey, ""), command, slot, flags, NULL, NULL);
command->set_function<rpc::command_base_is_type
<rpc::command_base_call
<rpc::target_type> >::type>(std::tr1::bind(&rpc::command_function_call_str,
system_method_generate_command(++itrArgs, args.end()),
std::tr1::placeholders::_1,
std::tr1::placeholders::_2));
rpc::commands.insert_type(create_new_key<0>(rawKey, ""), command, &rpc::command_base_call<rpc::target_type>,
flags, NULL, NULL);
// rpc::Command::any_slot slot = &rpc::CommandFunction::call;
// rpc::Command* command = new rpc::CommandFunction(system_method_generate_command(++itrArgs, args.end()));
// rpc::commands.insert_type(create_new_key<0>(rawKey, ""), command, slot, flags, NULL, NULL);
} else if (options.find("value") != std::string::npos ||
options.find("bool") != std::string::npos ||
@@ -197,29 +209,30 @@ system_method_redirect(const torrent::Object::list_type& args) {
torrent::Object
system_method_get(const torrent::Object::string_type& args) {
rpc::CommandFunction* function;
rpc::CommandMap::iterator itr = rpc::commands.find(args.c_str());
// rpc::CommandFunction* function;
// rpc::CommandMap::iterator itr = rpc::commands.find(args.c_str());
if (itr == rpc::commands.end() ||
(function = dynamic_cast<rpc::CommandFunction*>(itr->second.m_variable)) == NULL)
throw torrent::input_error("Command not modifiable or wrong type.");
// if (itr == rpc::commands.end() ||
// (function = dynamic_cast<rpc::CommandFunction*>(itr->second.m_variable)) == NULL)
// throw torrent::input_error("Command not modifiable or wrong type.");
return torrent::Object(function->command());
// return torrent::Object(function->command());
return torrent::Object();
}
torrent::Object
system_method_set(const torrent::Object::list_type& args) {
if (args.empty())
throw torrent::input_error("Invalid argument count.");
// if (args.empty())
// throw torrent::input_error("Invalid argument count.");
rpc::CommandFunction* function;
rpc::CommandMap::iterator itr = rpc::commands.find(args.front().as_string().c_str());
// rpc::CommandFunction* function;
// rpc::CommandMap::iterator itr = rpc::commands.find(args.front().as_string().c_str());
if (itr == rpc::commands.end() || !rpc::commands.is_modifiable(itr) ||
(function = dynamic_cast<rpc::CommandFunction*>(itr->second.m_variable)) == NULL)
throw torrent::input_error("Command not modifiable or wrong type.");
// if (itr == rpc::commands.end() || !rpc::commands.is_modifiable(itr) ||
// (function = dynamic_cast<rpc::CommandFunction*>(itr->second.m_variable)) == NULL)
// throw torrent::input_error("Command not modifiable or wrong type.");
function->set_command(system_method_generate_command(++args.begin(), args.end()));
// function->set_command(system_method_generate_command(++args.begin(), args.end()));
return torrent::Object();
}