From 782d29aec4061b0c9cd0b4d6b4afe4efc82edc46 Mon Sep 17 00:00:00 2001 From: Kaley Fischer Date: Fri, 12 Jan 2024 07:13:04 +0100 Subject: [PATCH] fix: made formatting a bit better --- assets/dashboard.conf | 2 +- src/main.cpp | 33 ++++++++++++++++----------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/assets/dashboard.conf b/assets/dashboard.conf index ebb9160..414d0d6 100644 --- a/assets/dashboard.conf +++ b/assets/dashboard.conf @@ -1,7 +1,7 @@ [runner] rname = "Dashboard:" -rcommand = "rofi -dmenu -p" rtheme = "-show-icons -theme ~/.config/rofi/themes/rounded-purple-dark.rasi" +rcommand = "rofi -dmenu -p" [Disk] names = "Disk" diff --git a/src/main.cpp b/src/main.cpp index 1f029ba..e79b666 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,8 +18,8 @@ LISTING COMMANDS: -b: Make a binary out of a config. )#"; -const string invalidvalue = R"#(Invalid value in config: )#"; -const string egc = R"#(Invalid command in config: )#"; +const string invalidvalue = R"#(Invalid value in config: )#"; +const string egc = R"#(Invalid command in config: )#"; struct Action { @@ -28,27 +28,27 @@ struct Action { string command; Action( - const string& nms = "", - const string& desc = "", - const string& cmd = "") - - : names(nms), + const string& nms = "", + const string& desc = "", + const string& cmd = "") + : + names(nms), description(desc), command(cmd) {} }; void from_toml(const table& t, Action& a) { try { - a.names = *t.get_as("names"); - a.description = *t.get_as("description"); - a.command = *t.get_as("command"); + a.names = *t.get_as("names"); + a.description = *t.get_as("description"); + a.command = *t.get_as("command"); } catch (const parse_exception& e) { throw invalid_argument(invalidvalue.c_str()); } } int main(int argc, char* argv[]) { - const char* configFile = nullptr; // Initialize to nullptr + const char* configFile = nullptr; if (argc > 1 && strcmp(argv[1], "-c") == 0) { if (argc < 3 || argv[2][0] == '-') { @@ -59,7 +59,7 @@ int main(int argc, char* argv[]) { configFile = argv[2]; } else if (argc > 1 && strcmp(argv[1], "-d") == 0) { std::cerr << USAGE.c_str() << std::endl; - return 0; // Assuming you want to exit after printing the message + return 0; }else{ std::cerr << USAGE.c_str() << std::endl; return 0; @@ -96,9 +96,9 @@ int main(int argc, char* argv[]) { } } - string rname = config->get_table("runner")->get_as("rname").value_or(""); - string rtheme = config->get_table("runner")->get_as("rtheme").value_or(""); - string rcommand = config->get_table("runner")->get_as("rcommand").value_or(""); + string rname = config->get_table("runner")->get_as("rname").value_or("dashboard:"); + string rtheme = config->get_table("runner")->get_as("rtheme").value_or(""); + string rcommand = config->get_table("runner")->get_as("rcommand").value_or("rofi -dmenu -p"); string rofiCommand = "printf '" + namesList + "' | " + rcommand + " '" + rname + " ' " + rtheme; FILE *rofiProcess = popen(rofiCommand.c_str(), "r"); @@ -133,7 +133,6 @@ int main(int argc, char* argv[]) { return 1; } } - cout << "Invalid choice. Please enter a valid option." << endl; } catch (const parse_exception& e) { @@ -142,4 +141,4 @@ int main(int argc, char* argv[]) { } return 0; -} +} \ No newline at end of file