jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CLI: Allow --mode flag to be case insensitive

Browse source 
Also fix handling when no argument passed
This commit is contained in:
Térence Clastres 2020-06-21 00:17:20 +02:00 • committed by Adam Honse
parent 7a3de1edbb
commit f3bdee9bd2
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cli.cpp
View file

@ -11,6 +11,8 @@
#ifdef _WIN32
#include <Windows.h>
/* swy: quirk for MSVC; which doesn't support this case-insensitive function */
#define strcasecmp strcmpi
#endif
#ifdef __APPLE__
@ -101,7 +103,9 @@ unsigned int ParseMode(DeviceOptions& options)
{
// no need to check if --mode wasn't passed
if (options.mode.size() == 0)
{
return false;
}
/*---------------------------------------------------------*\
| Search through all of the device modes and see if there is|
@ -109,7 +113,7 @@ unsigned int ParseMode(DeviceOptions& options)
\*---------------------------------------------------------*/
for(std::size_t mode_idx = 0; mode_idx < rgb_controllers[options.device]->modes.size(); mode_idx++)
{
if (rgb_controllers[options.device]->modes[mode_idx].name == options.mode)
if (strcasecmp(rgb_controllers[options.device]->modes[mode_idx].name.c_str(), options.mode.c_str()) == 0)
{
return mode_idx;
}
@ -378,6 +382,11 @@ bool OptionColor(int *currentDev, int *current_zone, std::string argument, Optio
bool OptionMode(int *currentDev, std::string argument, Options *options)
{
if (argument.size() == 0)
{
std::cout << "Error: --mode passed with no argument" << std::endl;
return false;
}
DeviceOptions* currentDevOpts = GetDeviceOptionsForDevID(options, *currentDev);
currentDevOpts->mode = argument;
currentDevOpts->hasOption = true;