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

* Moved the rest of the helper functions from VariableMap to

Browse Source 
parse_commands.h.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@912 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2007-06-16 17:22:39 +00:00
parent 0de4bbea7a
commit f8f2f80960
17 changed files with 277 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cc
+5 -5
View File
@@ -58,6 +58,7 @@
#include "display/manager.h"
#include "input/bindings.h"
#include "rpc/parse_commands.h"
#include "utils/directory.h"
#include "utils/variable_map.h"
@@ -87,7 +88,7 @@ parse_options(Control* c, int argc, char** argv) {
optionParser.insert_option('p', sigc::bind<0>(sigc::mem_fun(c->variable(), &utils::VariableMap::call_command_set_string), "port_range"));
optionParser.insert_option('s', sigc::bind<0>(sigc::mem_fun(c->variable(), &utils::VariableMap::call_command_set_string), "session"));
optionParser.insert_option('O', sigc::mem_fun(c->variable(), &utils::VariableMap::process_std_single));
optionParser.insert_option('O', sigc::bind<0>(&utils::parse_command_single_std, c->variable()));
optionParser.insert_option_list('o', sigc::mem_fun(c->variable(), &utils::VariableMap::call_command_set_std_string));
return optionParser.process(argc, argv);
@@ -165,8 +166,7 @@ main(int argc, char** argv) {
// torrent::ConnectionManager* are valid etc.
initialize_commands();
control->variable()->process_multiple
(
utils::parse_command_multiple(control->variable(),
// Currently not doing any sorting on main.
"view_add = main\n"
@@ -227,12 +227,12 @@ main(int argc, char** argv) {
"view_sort_current = scheduler,state_changed\n"
// "schedule = scheduler,10,10,download_scheduler=\n"
);
);
if (OptionParser::has_flag('n', argc, argv))
control->core()->push_log("Ignoring ~/.rtorrent.rc.");
else
control->variable()->process_single("try_import = ~/.rtorrent.rc");
utils::parse_command_single(control->variable(), "try_import = ~/.rtorrent.rc");
int firstArg = parse_options(control, argc, argv);