pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(command_line): Cleanup

Browse source
This commit is contained in:
Michael Carlberg 2016-12-09 12:24:01 +01:00
parent 683ce7acc6
commit 5d5542169b
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/components/command_line.hpp
View file

@ -37,9 +37,9 @@ namespace command_line {
class parser { class parser {
public: public:
using make_type = unique_ptr<parser>; using make_type = unique_ptr<parser>;
static make_type make(string scriptname, const options& opts); static make_type make(string&& scriptname, const options&& opts);
explicit parser(const string& synopsis, const options& opts) : m_synopsis(synopsis), m_opts(opts) {} explicit parser(string&& synopsis, const options&& opts);
void usage() const; void usage() const;
@ -59,7 +59,7 @@ namespace command_line {
private: private:
string m_synopsis; string m_synopsis;
options m_opts; const options m_opts;
values m_optvalues; values m_optvalues;
bool m_skipnext = false; bool m_skipnext = false;
}; };

11
src/components/command_line.cpp
View file

@ -10,10 +10,17 @@ POLYBAR_NS
/** /**
* Create instance * Create instance
*/ */
cliparser::make_type cliparser::make(string scriptname, const clioptions& opts) { cliparser::make_type cliparser::make(string&& scriptname, const clioptions&& opts) {
return factory_util::unique<cliparser>("Usage: " + scriptname + " bar_name [OPTION...]", opts); return factory_util::unique<cliparser>(
"Usage: " + scriptname + " bar_name [OPTION...]", forward<decltype(opts)>(opts));
} }
/**
* Construct parser
*/
cliparser::parser(string&& synopsis, const options&& opts)
: m_synopsis(forward<decltype(synopsis)>(synopsis)), m_opts(forward<decltype(opts)>(opts)) {}
/** /**
* Print application usage message * Print application usage message
*/ */

10
src/main.cpp
View file

@ -13,9 +13,6 @@
using namespace polybar; using namespace polybar;
using std::cout;
using std::endl;
struct exit_success {}; struct exit_success {};
struct exit_failure {}; struct exit_failure {};
@ -70,8 +67,7 @@ int main(int argc, char** argv) {
string scriptname{argv[0]}; string scriptname{argv[0]};
vector<string> args{argv + 1, argv + argc}; vector<string> args{argv + 1, argv + argc};
cliparser::make_type cli{cliparser::make(move(scriptname), opts)}; cliparser::make_type cli{cliparser::make(move(scriptname), move(opts))};
cli->process_input(args); cli->process_input(args);
if (cli->has("quiet")) { if (cli->has("quiet")) {
@ -112,7 +108,7 @@ int main(int argc, char** argv) {
// Dump requested data // Dump requested data
//================================================== //==================================================
if (cli->has("dump")) { if (cli->has("dump")) {
cout << conf.get<string>(conf.bar_section(), cli->get("dump")) << endl; std::cout << conf.get<string>(conf.bar_section(), cli->get("dump")) << std::endl;
throw exit_success{}; throw exit_success{};
} }
@ -133,7 +129,7 @@ int main(int argc, char** argv) {
ctrl = controller::make(move(path_confwatch), enable_ipc, cli->has("stdout")); ctrl = controller::make(move(path_confwatch), enable_ipc, cli->has("stdout"));
if (cli->has("print-wmname")) { if (cli->has("print-wmname")) {
cout << ctrl->opts().wmname << endl; std::cout << ctrl->opts().wmname << std::endl;
throw exit_success{}; throw exit_success{};
} }