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

fix: check for config

Browse source
This commit is contained in:
Kaley, Fischer 2024-01-11 17:40:32 +01:00
parent 6775114ea6
commit 0fb9bd6e9e
2 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -3,11 +3,11 @@ project(RapidMenu)
set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD 23)
# Add the path to the source files # Add the path to the source files for RapidMenu
file(GLOB_RECURSE SOURCE_FILES "src/*.cpp") file(GLOB_RECURSE RAPID_MENU_SOURCE_FILES "src/*.cpp")
# Add the executable target # Add the executable target for RapidMenu
add_executable(RapidMenu ${SOURCE_FILES}) add_executable(RapidMenu ${RAPID_MENU_SOURCE_FILES})
# Find and link against the tomlplusplus library # Find and link against the tomlplusplus library
find_package(tomlplusplus REQUIRED) find_package(tomlplusplus REQUIRED)

28
src/main.cpp
View file

@ -1,4 +1,5 @@
#include <iostream> #include <iostream>
#include <filesystem>
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <cstdio> #include <cstdio>
@ -26,20 +27,37 @@ void from_toml(const table& t, Action& a) {
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 std::invalid_argument("Error getting value from config:"); throw invalid_argument("Error getting value from config:");
} }
} }
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
if (argc < 3 || argv[2][0] == '-') { if (argc < 3 || argv[2][0] == '-') {
cerr << "Usage: -c <config_file>" << endl; cerr << "Usage: -c <config_file>" << endl;
return 1; return 1;
} }
const string configFile2 = argv[2]; const string configFile = argv[2];
const char* userHome = getenv("HOME");
if (userHome == nullptr) {
cerr << "Error: HOME environment variable not set." << endl;
return 1;
}
string rapidMenuPath = string(userHome) + "/.config/RapidMenu";
if (filesystem::exists(rapidMenuPath) && filesystem::is_directory(rapidMenuPath)) {
} else {
system("mkdir -p /home/$USER/.config/RapidMenu");
cerr << "Setting up config." << endl;
return 1;
}
try { try {
auto config = parse_file(configFile2); auto config = parse_file(configFile);
// Create the Rofi command // Create the Rofi command
setenv("LC_CTYPE", "", 1); // Unset LC_CTYPE setenv("LC_CTYPE", "", 1); // Unset LC_CTYPE
@ -51,7 +69,7 @@ int main(int argc, char* argv[]) {
Action a; Action a;
from_toml(*tableItem.second->as_table(), a); from_toml(*tableItem.second->as_table(), a);
namesList += a.names + "\n"; namesList += a.names + "\n";
} catch (const std::invalid_argument& e) { } catch (const invalid_argument& e) {
cerr << "Error getting value from config: " << e.what() << endl; cerr << "Error getting value from config: " << e.what() << endl;
return 1; return 1;
} }
@ -93,7 +111,7 @@ int main(int argc, char* argv[]) {
return 0; return 0;
} }
} catch (const std::invalid_argument& e) { } catch (const invalid_argument& e) {
cerr << "Error getting value from config: " << e.what() << endl; cerr << "Error getting value from config: " << e.what() << endl;
return 1; return 1;
} }