From 071f4ef0122a8bfceeda9a10b41e85ad9a34a28d Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Wed, 23 Dec 2015 11:43:37 +0100 Subject: vastly simplify by getting rid of Module as a base class just a move slightly more towards functional --- akonadi2_cli/modules/core_syntax.cpp | 85 ++++++++++++++++++++++++++++++++++++ akonadi2_cli/modules/core_syntax.h | 30 +++++++++++++ akonadi2_cli/modules/exit/exit.cpp | 39 ----------------- akonadi2_cli/modules/exit/exit.h | 37 ---------------- akonadi2_cli/modules/help/help.cpp | 80 --------------------------------- akonadi2_cli/modules/help/help.h | 37 ---------------- 6 files changed, 115 insertions(+), 193 deletions(-) create mode 100644 akonadi2_cli/modules/core_syntax.cpp create mode 100644 akonadi2_cli/modules/core_syntax.h delete mode 100644 akonadi2_cli/modules/exit/exit.cpp delete mode 100644 akonadi2_cli/modules/exit/exit.h delete mode 100644 akonadi2_cli/modules/help/help.cpp delete mode 100644 akonadi2_cli/modules/help/help.h (limited to 'akonadi2_cli/modules') diff --git a/akonadi2_cli/modules/core_syntax.cpp b/akonadi2_cli/modules/core_syntax.cpp new file mode 100644 index 0000000..8324c31 --- /dev/null +++ b/akonadi2_cli/modules/core_syntax.cpp @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2014 Aaron Seigo + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "core_syntax.h" + +#include // tr() +#include +#include + +namespace CoreSyntax +{ + +Module::SyntaxList syntax() +{ + Module::SyntaxList syntax; + syntax << Module::Syntax("exit", QObject::tr("Exits the application. Ctrl-d also works!"), &CoreSyntax::exit); + syntax << Module::Syntax(QObject::tr("help"), QObject::tr("Print command information: help [command]"), &CoreSyntax::showHelp); + return syntax; +} + +bool exit(const QStringList &, State &) +{ + ::exit(0); + return true; +} + +bool showHelp(const QStringList &commands, State &) +{ + Module::Command command = Module::self()->match(commands); + QTextStream stream(stdout); + if (commands.isEmpty()) { + stream << QObject::tr("Welcome to the Akonadi2 command line tool!") << "\n"; + stream << QObject::tr("Top-level commands:") << "\n"; + QSet sorted; + for (auto syntax: Module::self()->syntax()) { + sorted.insert(syntax.keyword); + } + + for (auto keyword: sorted) { + stream << "\t" << keyword << "\n"; + } + } else if (const Module::Syntax *syntax = command.first) { + //TODO: get parent! + stream << QObject::tr("Command `%1`").arg(syntax->keyword); + + if (!syntax->help.isEmpty()) { + stream << ": " << syntax->help; + } + stream << "\n"; + + if (!syntax->children.isEmpty()) { + stream << "\tSub-commands:\n"; + QSet sorted; + for (auto childSyntax: syntax->children) { + sorted.insert(childSyntax.keyword); + } + + for (auto keyword: sorted) { + stream << "\t" << keyword << "\n"; + } + } + } else { + stream << "Unknown command: " << commands.join(" ") << "\n"; + } + return true; +} + +} // namespace CoreSyntax + diff --git a/akonadi2_cli/modules/core_syntax.h b/akonadi2_cli/modules/core_syntax.h new file mode 100644 index 0000000..beb8528 --- /dev/null +++ b/akonadi2_cli/modules/core_syntax.h @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2014 Aaron Seigo + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#pragma once + +#include "module.h" + +namespace CoreSyntax +{ + Module::SyntaxList syntax(); + bool exit(const QStringList &commands, State &state); + bool showHelp(const QStringList &commands, State &); +} + diff --git a/akonadi2_cli/modules/exit/exit.cpp b/akonadi2_cli/modules/exit/exit.cpp deleted file mode 100644 index 64828be..0000000 --- a/akonadi2_cli/modules/exit/exit.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2014 Aaron Seigo - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "exit.h" - -#include - -namespace CLI -{ - -Exit::Exit() -{ - setSyntax(Syntax("exit", &Exit::exit, QObject::tr("Exits the application. Ctrl-d also works!"))); -} - -bool Exit::exit(const QStringList &, State &) -{ - ::exit(0); - return true; -} - -} // namespace CLI - diff --git a/akonadi2_cli/modules/exit/exit.h b/akonadi2_cli/modules/exit/exit.h deleted file mode 100644 index 5ed4174..0000000 --- a/akonadi2_cli/modules/exit/exit.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2014 Aaron Seigo - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -#include "module.h" - -namespace CLI -{ - -class Exit : public Module -{ -public: - Exit(); - -private: - static bool exit(const QStringList &commands, State &state); -}; - -} // namespace CLI - diff --git a/akonadi2_cli/modules/help/help.cpp b/akonadi2_cli/modules/help/help.cpp deleted file mode 100644 index aaff6fb..0000000 --- a/akonadi2_cli/modules/help/help.cpp +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (C) 2014 Aaron Seigo - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "help.h" - -#include -#include -#include - -#include "module.h" - -namespace CLI -{ - -Help::Help() -{ - Syntax topLevel = Syntax(QObject::tr("help"), &Help::showHelp, QObject::tr("Print command information: help [command]")); - setSyntax(topLevel); -} - -bool Help::showHelp(const QStringList &commands, State &) -{ - Module::Command command = Module::match(commands); - QTextStream stream(stdout); - if (commands.isEmpty()) { - stream << QObject::tr("Welcome to the Akonadi2 command line tool!") << "\n"; - stream << QObject::tr("Top-level commands:") << "\n"; - QSet sorted; - for (auto module: Module::modules()) { - sorted.insert(module.syntax().keyword); - } - - for (auto keyword: sorted) { - stream << "\t" << keyword << "\n"; - } - } else if (const Syntax *syntax = command.first) { - //TODO: get parent! - stream << QObject::tr("Command `%1`").arg(syntax->keyword); - - if (!syntax->help.isEmpty()) { - stream << ": " << syntax->help; - } - stream << "\n"; - - if (!syntax->children.isEmpty()) { - stream << "\tSub-commands:\n"; - QSet sorted; - for (auto childSyntax: syntax->children) { - sorted.insert(childSyntax.keyword); - } - - for (auto keyword: sorted) { - stream << "\t" << keyword << "\n"; - } - } - } else { - stream << "Unknown command: " << commands.join(" ") << "\n"; - } - - return true; -} - -} // namespace CLI - diff --git a/akonadi2_cli/modules/help/help.h b/akonadi2_cli/modules/help/help.h deleted file mode 100644 index df1cfc2..0000000 --- a/akonadi2_cli/modules/help/help.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2014 Aaron Seigo - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -#include "module.h" - -namespace CLI -{ - -class Help : public Module -{ -public: - Help(); - -private: - static bool showHelp(const QStringList &commands, State &state); -}; - -} // namespace CLI - -- cgit v1.2.3