///////////////////////////////////////////////////////////////////////////
// senf::console::Executor
-prefix_ bool senf::console::Executor::operator()(ParseCommandInfo const & command,
- std::ostream & output)
+prefix_ void senf::console::Executor::execute(std::ostream & output,
+ ParseCommandInfo const & command)
{
SENF_LOG(( "Executing: " << command ));
- ///\fixme Whenever checking cwd_.expired(), we also need to check, wether
- /// the node is still connected to the root.
- if (cwd_.expired())
+ if (cwd_.expired() || ! cwd().active())
cwd_ = root().thisptr();
try {
switch(command.builtin()) {
- case ParseCommandInfo::NoBuiltin :
+ case ParseCommandInfo::NoBuiltin : {
+ GenericNode & node ( traverseCommand(command.commandPath()) );
+ DirectoryNode * dir ( dynamic_cast<DirectoryNode*>(&node) );
+ if ( dir ) {
+ if (autocd_) {
+ oldCwd_ = cwd_;
+ cwd_ = dir->thisptr();
+ } else
+ throw InvalidCommandException();
+ } else {
+ dynamic_cast<CommandNode &>(node)(output, command);
+ }
break;
-
+ }
+
case ParseCommandInfo::BuiltinCD :
if ( command.arguments() ) {
if (command.arguments().begin()->size() == 1
&& command.arguments().begin()->begin()->value() == "-") {
- if (oldCwd_.expired()) {
+ if (oldCwd_.expired() || ! oldCwd_.lock()->active()) {
oldCwd_ = cwd_;
cwd_ = root().thisptr();
} else
}
else {
oldCwd_ = cwd_;
- cwd_ = traverseTo(command.arguments().begin()[0]).thisptr();
+ cwd_ = traverseDirectory(command.arguments().begin()[0]).thisptr();
}
}
break;
case ParseCommandInfo::BuiltinLS : {
- DirectoryNode const & dir (
- command.arguments().empty() ? cwd() : traverseTo(command.arguments().begin()[0]));
+ DirectoryNode const & dir ( command.arguments()
+ ? traverseDirectory(command.arguments().begin()[0])
+ : cwd() );
for (DirectoryNode::child_iterator i (dir.children().begin());
i != dir.children().end(); ++i) {
output << i->first;
case ParseCommandInfo::BuiltinPUSHD :
dirstack_.push_back(cwd_);
if ( command.arguments() )
- cwd_ = traverseTo(command.arguments().begin()[0]).thisptr();
+ cwd_ = traverseDirectory(command.arguments().begin()[0]).thisptr();
break;
case ParseCommandInfo::BuiltinPOPD :
case ParseCommandInfo::BuiltinEXIT :
throw ExitException();
+
+ case ParseCommandInfo::BuiltinHELP :
+ GenericNode const & node (command.arguments()
+ ? traverseNode(command.arguments().begin()[0])
+ : cwd());
+ output << prettyName(typeid(node)) << " at " << node.path() << "\n\n";
+ node.help(output);
+ output << std::flush;
+ break;
+
}
}
+ catch (InvalidPathException &) {
+ output << "invalid path" << std::endl;
+ }
catch (InvalidDirectoryException &) {
output << "invalid directory" << std::endl;
}
- return true;
+ catch (InvalidCommandException &) {
+ output << "invalid command" << std::endl;
+ }
+}
+
+prefix_ senf::console::GenericNode &
+senf::console::Executor::traverseNode(ParseCommandInfo::argument_value_type const & path)
+{
+ try {
+ return cwd().traverse(
+ boost::make_iterator_range(
+ boost::make_transform_iterator(path.begin(), TraverseTokens()),
+ boost::make_transform_iterator(path.end(), TraverseTokens())),
+ autocomplete_);
+ }
+ catch (std::bad_cast &) {
+ throw InvalidPathException();
+ }
+ catch (UnknownNodeNameException &) {
+ throw InvalidPathException();
+ }
+}
+
+prefix_ senf::console::GenericNode &
+senf::console::Executor::traverseCommand(ParseCommandInfo::CommandPathRange const & path)
+{
+ try {
+ return cwd().traverse(path, autocomplete_);
+ }
+ catch (std::bad_cast &) {
+ throw InvalidPathException();
+ }
+ catch (UnknownNodeNameException &) {
+ throw InvalidPathException();
+ }
}
prefix_ senf::console::DirectoryNode &
-senf::console::Executor::traverseTo(ParseCommandInfo::argument_value_type const & path)
+senf::console::Executor::traverseDirectory(ParseCommandInfo::argument_value_type const & path)
{
try {
- return dynamic_cast<DirectoryNode&>(
- cwd().traverse(
- boost::make_iterator_range(
- boost::make_transform_iterator(path.begin(), TraverseTokens()),
- boost::make_transform_iterator(path.end(), TraverseTokens()))));
+ return dynamic_cast<DirectoryNode&>( traverseNode(path) );
}
catch (std::bad_cast &) {
throw InvalidDirectoryException();
}
- catch (UnknownNodeNameException &) {
+ catch (InvalidPathException &) {
throw InvalidDirectoryException();
}
}
-
+
///////////////////////////////cc.e////////////////////////////////////////
#undef prefix_
//#include "Executor.mpp"