hyprwm
/
hyprlock
mirror of https://github.com/hyprwm/hyprlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: Inproved error handling and arg parsing (#380) 

* Inproved error handling and arg parsing

* Removed duplicated lines

* Remove curly braces from short ifs, used c-style casts, used contains instead of find to parse exception, applied clang formating

* Fix Formatting
This commit is contained in:
Jasson Cordones 2024-06-25 14:09:52 -04:00 committed by GitHub
parent 210b456c15
commit d31e600f14
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 60 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/main.cpp
View File

@ -1,6 +1,7 @@
#include "config/ConfigManager.hpp"
#include "core/hyprlock.hpp"
#include <cstddef>
void help() {
std::cout << "Usage: hyprlock [options]\n\n"
@ -12,13 +13,26 @@ void help() {
" --immediate - Lock immediately, ignoring any configured grace period\n"
" -h, --help - Show this help message\n";
}
std::optional<std::string> parseArg(const std::vector<std::string>& args, const std::string& flag, std::size_t& i) {
if (i + 1 < args.size()) {
return args[++i];
} else {
std::cerr << "Error: Missing value for " << flag << " option.\n";
return std::nullopt;
}
}
int main(int argc, char** argv, char** envp) {
std::string configPath;
std::string wlDisplay;
bool immediate = false;
bool showHelp = false;
for (int i = 1; i < argc; ++i) {
std::string arg = argv[i];
std::vector<std::string> args(argv, argv + argc);
for (std::size_t i = 1; i < args.size(); ++i) {
const std::string arg = argv[i];
if (arg == "--verbose" || arg == "-v")
Debug::verbose = true;
@ -26,33 +40,57 @@ int main(int argc, char** argv, char** envp) {
else if (arg == "--quiet" || arg == "-q")
Debug::quiet = true;
else if ((arg == "--config" || arg == "-c") && i + 1 < argc)
configPath = argv[++i];
else if ((arg == "--config" || arg == "-c") && i + 1 < (std::size_t)argc) {
if (auto value = parseArg(args, arg, i); value)
configPath = *value;
else
return 1;
else if (arg == "--display" && i + 1 < argc) {
wlDisplay = argv[i + 1];
i++;
} else if (arg == "--immediate") {
} else if (arg == "--display" && i + 1 < (std::size_t)argc) {
if (auto value = parseArg(args, arg, i); value)
wlDisplay = *value;
else
return 1;
} else if (arg == "--immediate")
immediate = true;
} else if (arg == "--help" || arg == "-h") {
else if (arg == "--help" || arg == "-h") {
showHelp = true;
break;
} else {
std::cerr << "Unknown option: " << arg << "\n";
help();
return 1;
}
}
if (showHelp) {
help();
return 0;
}
}
try {
g_pConfigManager = std::make_unique<CConfigManager>(configPath);
g_pConfigManager->init();
} catch (const char* err) {
Debug::log(CRIT, "ConfigManager threw: {}", err);
std::string strerr = err;
if (strerr.contains("File does not exist"))
auto configManager = std::make_unique<CConfigManager>(configPath);
configManager->init();
g_pConfigManager = std::move(configManager);
} catch (const std::exception& ex) {
Debug::log(CRIT, "ConfigManager threw: {}", ex.what());
if (std::string(ex.what()).contains("File does not exist"))
Debug::log(NONE, " Make sure you have a config.");
return 1;
}
g_pHyprlock = std::make_unique<CHyprlock>(wlDisplay, immediate);
try {
auto hyprlock = std::make_unique<CHyprlock>(wlDisplay, immediate);
g_pHyprlock = std::move(hyprlock);
g_pHyprlock->run();
} catch (const std::exception& ex) {
Debug::log(CRIT, "Hyprlock threw: {}", ex.what());
return 1;
}
return 0;
}