frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix standalone grabbers (#1384)

Browse Source 
* Fix too much copy/paste
* Fix typo
* Commandlineoptions: Additional error details for Int and Double ranges
* Standalone grabbers: Show fps range on error, fix default host address
This commit is contained in:
LordGrey
2021-11-29 17:51:03 +00:00
committed by GitHub
parent 926a58de9c
commit e3b494428a
16 changed files with 84 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libsrc/commandline/DoubleOption.cpp
View File

@@ -19,3 +19,15 @@ double *DoubleOption::getDoublePtr(Parser &parser, bool *ok)
return nullptr;
}
bool DoubleOption::validate(Parser & parser, QString & value)
{
if (ValidatorOption::validate(parser,value))
{
return true;
}
_error = QString("Value must be between %1 and %2.").arg(_minimum).arg(_maximum);
return false;
}

13
libsrc/commandline/IntOption.cpp
View File

@@ -6,6 +6,7 @@ using namespace commandline;
int IntOption::getInt(Parser &parser, bool *ok, int base)
{
_int = value(parser).toInt(ok, base);
return _int;
}
@@ -18,3 +19,15 @@ int *IntOption::getIntPtr(Parser &parser, bool *ok, int base)
}
return nullptr;
}
bool IntOption::validate(Parser & parser, QString & value)
{
if (ValidatorOption::validate(parser,value))
{
return true;
}
_error = QString("Value must be between %1 and %2.").arg(_minimum).arg(_maximum);
return false;
}

6
libsrc/commandline/Parser.cpp
View File

@@ -20,11 +20,11 @@ bool Parser::parse(const QStringList &arguments)
if (!option->validate(*this, value)) {
const QString error = option->getError();
if (!error.isEmpty()) {
_errorText = tr("%1 is not a valid option for %2\n%3").arg(value, option->name(), error);
_errorText = tr("\"%1\" is not a valid option for %2, %3").arg(value, option->name(), error);
}
else
{
_errorText = tr("%1 is not a valid option for %2").arg(value, option->name());
_errorText = tr("\"%1\" is not a valid option for %2").arg(value, option->name());
}
return false;
}
@@ -37,7 +37,7 @@ void Parser::process(const QStringList &arguments)
_parser.process(arguments);
if (!parse(arguments))
{
fprintf(stdout, "%s", qPrintable(tr("Error: %1").arg(_errorText)));
fprintf(stdout, "%s\n\n", qPrintable(tr("Error: %1").arg(_errorText)));
showHelp(EXIT_FAILURE);
}
}