DRAGONTOS/RapidMenu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: made formatting a bit better

Browse source
This commit is contained in:
Kaley, Fischer 2024-01-12 07:13:04 +01:00
parent 8cfd09c366
commit 782d29aec4
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/dashboard.conf
View file

@ -1,7 +1,7 @@
[runner] [runner]
rname = "Dashboard:" rname = "Dashboard:"
rcommand = "rofi -dmenu -p"
rtheme = "-show-icons -theme ~/.config/rofi/themes/rounded-purple-dark.rasi" rtheme = "-show-icons -theme ~/.config/rofi/themes/rounded-purple-dark.rasi"
rcommand = "rofi -dmenu -p"
[Disk] [Disk]
names = "Disk" names = "Disk"

33
src/main.cpp
View file

@ -18,8 +18,8 @@ LISTING COMMANDS:
-b: Make a binary out of a config. -b: Make a binary out of a config.
)#"; )#";
const string invalidvalue = R"#(Invalid value in config: )#"; const string invalidvalue = R"#(Invalid value in config: )#";
const string egc = R"#(Invalid command in config: )#"; const string egc = R"#(Invalid command in config: )#";
struct Action { struct Action {
@ -28,27 +28,27 @@ struct Action {
string command; string command;
Action( Action(
const string& nms = "", const string& nms = "",
const string& desc = "", const string& desc = "",
const string& cmd = "") const string& cmd = "")
:
: names(nms), names(nms),
description(desc), description(desc),
command(cmd) {} command(cmd) {}
}; };
void from_toml(const table& t, Action& a) { void from_toml(const table& t, Action& a) {
try { try {
a.names = *t.get_as<string>("names"); a.names = *t.get_as<string>("names");
a.description = *t.get_as<string>("description"); a.description = *t.get_as<string>("description");
a.command = *t.get_as<string>("command"); a.command = *t.get_as<string>("command");
} catch (const parse_exception& e) { } catch (const parse_exception& e) {
throw invalid_argument(invalidvalue.c_str()); throw invalid_argument(invalidvalue.c_str());
} }
} }
int main(int argc, char* argv[]) { 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 > 1 && strcmp(argv[1], "-c") == 0) {
if (argc < 3 || argv[2][0] == '-') { if (argc < 3 || argv[2][0] == '-') {
@ -59,7 +59,7 @@ int main(int argc, char* argv[]) {
configFile = argv[2]; configFile = argv[2];
} else if (argc > 1 && strcmp(argv[1], "-d") == 0) { } else if (argc > 1 && strcmp(argv[1], "-d") == 0) {
std::cerr << USAGE.c_str() << std::endl; std::cerr << USAGE.c_str() << std::endl;
return 0; // Assuming you want to exit after printing the message return 0;
}else{ }else{
std::cerr << USAGE.c_str() << std::endl; std::cerr << USAGE.c_str() << std::endl;
return 0; return 0;
@ -96,9 +96,9 @@ int main(int argc, char* argv[]) {
} }
} }
string rname = config->get_table("runner")->get_as<string>("rname").value_or(""); string rname = config->get_table("runner")->get_as<string>("rname").value_or("dashboard:");
string rtheme = config->get_table("runner")->get_as<string>("rtheme").value_or(""); string rtheme = config->get_table("runner")->get_as<string>("rtheme").value_or("");
string rcommand = config->get_table("runner")->get_as<string>("rcommand").value_or(""); string rcommand = config->get_table("runner")->get_as<string>("rcommand").value_or("rofi -dmenu -p");
string rofiCommand = "printf '" + namesList + "' | " + rcommand + " '" + rname + " ' " + rtheme; string rofiCommand = "printf '" + namesList + "' | " + rcommand + " '" + rname + " ' " + rtheme;
FILE *rofiProcess = popen(rofiCommand.c_str(), "r"); FILE *rofiProcess = popen(rofiCommand.c_str(), "r");
@ -133,7 +133,6 @@ int main(int argc, char* argv[]) {
return 1; return 1;
} }
} }
cout << "Invalid choice. Please enter a valid option." << endl; cout << "Invalid choice. Please enter a valid option." << endl;
} catch (const parse_exception& e) { } catch (const parse_exception& e) {
@ -142,4 +141,4 @@ int main(int argc, char* argv[]) {
} }
return 0; return 0;
} }