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

* Added 'f.multicall' and 't.multicall', and renamed 'call_download'

Browse Source 
to 'd.multicall'.

* Cleanup of 'rpc/parse_commands.h'.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@961 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2007-08-20 21:29:59 +00:00
parent bac7d0ba3b
commit 0390b7ec00
10 changed files with 103 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/parse_commands.cc
+10 -20
View File
@@ -82,22 +82,22 @@ parse_count_escaped(const char* first, const char* last) {
//
// Find a better name.
void
parse_command_execute(core::Download* download, torrent::Object* object) {
parse_command_execute(CommandMap::target_type target, torrent::Object* object) {
if (object->is_list()) {
for (torrent::Object::list_type::iterator itr = object->as_list().begin(), last = object->as_list().end(); itr != last; itr++)
parse_command_execute(download, &*itr);
parse_command_execute(target, &*itr);
} else if (*object->as_string().c_str() == '$') {
const std::string& str = object->as_string();
*object = parse_command_d_single(download, str.c_str() + 1, str.c_str() + str.size());
*object = parse_command(target, str.c_str() + 1, str.c_str() + str.size()).first;
}
}
// Set 'download' to NULL to call the generic functions, thus reusing
// the code below for both cases.
std::pair<torrent::Object, const char*>
parse_command(core::Download* download, const char* first, const char* last) {
parse_command_type
parse_command(CommandMap::target_type target, const char* first, const char* last) {
first = std::find_if(first, last, std::not1(command_map_is_space()));
if (first == last || *first == '#')
@@ -127,32 +127,22 @@ parse_command(core::Download* download, const char* first, const char* last) {
// Replace any strings starting with '$' with the result of the
// following command.
parse_command_execute(download, &args);
parse_command_execute(target, &args);
return std::make_pair(commands.call_command_d(key.c_str(), download, args), first);
return std::make_pair(commands.call_command(key.c_str(), args, target), first);
}
void
parse_command_single(const char* first) {
parse_command(NULL, first, first + std::strlen(first));
}
void
parse_command_multiple(core::Download* download, const char* first, const char* last) {
parse_command_multiple(CommandMap::target_type target, const char* first, const char* last) {
while (first != last) {
// Should we check the return value? Probably not necessary as
// parse_args throws on unquoted multi-word input.
std::pair<torrent::Object, const char*> result = parse_command(download, first, last);
parse_command_type result = parse_command(target, first, last);
first = result.second;
}
}
void
parse_command_d_multiple(core::Download* download, const char* first) {
parse_command_multiple(download, first, first + std::strlen(first));
}
bool
parse_command_file(const std::string& path) {
std::fstream file(rak::path_expand(path).c_str(), std::ios::in);
@@ -185,7 +175,7 @@ parse_command_file(const std::string& path) {
}
// Would be nice to make this zero-copy.
parse_command(NULL, buffer, buffer + getCount);
parse_command(make_target(), buffer, buffer + getCount);
getCount = 0;
}