Skip to content

Commit

Permalink
Use notifications API for generic config errors and warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnnovak
johnnovak committed Jun 14, 2024
1 parent 05898a1 commit d8db95d
Showing 1 changed file with 56 additions and 39 deletions.
95 changes: 56 additions & 39 deletions src/misc/setup.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "control.h"
#include "cross.h"
#include "fs_utils.h"
#include "notifications.h"
#include "string_utils.h"
#include "support.h"
#include "version.h"
Expand Down Expand Up @@ -232,10 +233,11 @@ bool Property::IsValidValue(const Value& in)
}
}

LOG_WARNING("CONFIG: Invalid '%s' setting: '%s', using '%s'",
propname.c_str(),
in.ToString().c_str(),
default_value.ToString().c_str());
NOTIFY_WarningMsg("CONFIG",
"Invalid '%s' setting: '%s', using '%s'",
propname.c_str(),
in.ToString().c_str(),
default_value.ToString().c_str());

return false;
}
Expand All @@ -244,12 +246,13 @@ bool Property::IsValueDeprecated(const Value& val) const
{
const auto is_deprecated = contains(deprecated_and_alternate_values, val);
if (is_deprecated) {
LOG_WARNING("CONFIG: Setting '%s = %s' is deprecated, "
"falling back to the alternate: '%s = %s'",
propname.c_str(),
val.ToString().c_str(),
propname.c_str(),
GetAlternateForDeprecatedValue(val).ToString().c_str());
NOTIFY_WarningMsg("CONFIG",
"Setting '%s = %s' is deprecated, "
"falling back to the alternate: '%s = %s'",
propname.c_str(),
val.ToString().c_str(),
propname.c_str(),
GetAlternateForDeprecatedValue(val).ToString().c_str());
}
return is_deprecated;
}
Expand Down Expand Up @@ -337,7 +340,10 @@ std::string Property::GetHelp() const
}
}
if (result.empty()) {
LOG_WARNING("CONFIG: No help available for '%s'.", propname.c_str());
NOTIFY_WarningMsg("CONFIG",
"No help available for '%s'.",
propname.c_str());

return "No help available for '" + propname + "'\n";
}
return result;
Expand Down Expand Up @@ -379,7 +385,9 @@ std::string Property::GetHelpUtf8() const
}
}
if (result.empty()) {
LOG_WARNING("CONFIG: No help available for '%s'.", propname.c_str());
NOTIFY_WarningMsg("CONFIG",
"No help available for '%s'.",
propname.c_str());
}
return result;
}
Expand Down Expand Up @@ -423,13 +431,14 @@ bool Prop_int::ValidateValue(const Value& in)
va = mi;
}

LOG_WARNING("CONFIG: Invalid '%s' setting: '%s'. "
"Value outside of the valid range %s-%s, using '%d'",
propname.c_str(),
in.ToString().c_str(),
min_value.ToString().c_str(),
max_value.ToString().c_str(),
va);
NOTIFY_WarningMsg("CONFIG",
"Invalid '%s' setting: '%s'. "
"Value outside of the valid range %s-%s, using '%d'",
propname.c_str(),
in.ToString().c_str(),
min_value.ToString().c_str(),
max_value.ToString().c_str(),
va);

value = va;
return true;
Expand All @@ -453,13 +462,14 @@ bool Prop_int::IsValidValue(const Value& in)
return true;
}

LOG_WARNING("CONFIG: Invalid '%s' setting: '%s'. "
"Value outside of the valid %s-%s range, using '%s'",
propname.c_str(),
in.ToString().c_str(),
min_value.ToString().c_str(),
max_value.ToString().c_str(),
default_value.ToString().c_str());
NOTIFY_WarningMsg("CONFIG",
"Invalid '%s' setting: '%s'. "
"Value outside of the valid %s-%s range, using '%s'",
propname.c_str(),
in.ToString().c_str(),
min_value.ToString().c_str(),
max_value.ToString().c_str(),
default_value.ToString().c_str());

return false;
}
Expand Down Expand Up @@ -525,10 +535,11 @@ bool Prop_string::IsValidValue(const Value& in)
}
}

LOG_WARNING("CONFIG: Invalid '%s' setting: '%s', using '%s'",
propname.c_str(),
in.ToString().c_str(),
default_value.ToString().c_str());
NOTIFY_WarningMsg("CONFIG",
"Invalid '%s' setting: '%s', using '%s'",
propname.c_str(),
in.ToString().c_str(),
default_value.ToString().c_str());

return false;
}
Expand Down Expand Up @@ -567,10 +578,11 @@ bool Prop_bool::SetValue(const std::string& input)
if (!is_valid) {
SetValue(default_value.ToString());

LOG_WARNING("CONFIG: Invalid '%s' setting: '%s', using '%s'",
propname.c_str(),
input.c_str(),
default_value.ToString().c_str());
NOTIFY_WarningMsg("CONFIG",
"Invalid '%s' setting: '%s', using '%s'",
propname.c_str(),
input.c_str(),
default_value.ToString().c_str());
}
return is_valid;
}
Expand Down Expand Up @@ -1035,8 +1047,11 @@ bool Section_prop::HandleInputline(const std::string& line)
}

if (p->IsDeprecated()) {
LOG_WARNING("CONFIG: Deprecated option '%s'", name.c_str());
LOG_WARNING("CONFIG: %s", p->GetHelp().c_str());
NOTIFY_WarningMsg("CONFIG",
"Deprecated option '%s'",
name.c_str());

NOTIFY_WarningMsg("CONFIG", "%s", p->GetHelp().c_str());

if (!p->IsDeprecatedButAllowed()) {
return false;
Expand All @@ -1046,7 +1061,7 @@ bool Section_prop::HandleInputline(const std::string& line)
return p->SetValue(val);
}

LOG_WARNING("CONFIG: Invalid option '%s'", name.c_str());
NOTIFY_WarningMsg("CONFIG", "Invalid option '%s'", name.c_str());
return false;
}

Expand Down Expand Up @@ -1690,8 +1705,10 @@ Verbosity Config::GetStartupVerbosity() const
: Verbosity::High;
}

LOG_WARNING("SETUP: Invalid 'startup_verbosity' setting: '%s', using 'high'",
user_choice.c_str());
NOTIFY_WarningMsg("SETUP",
"Invalid 'startup_verbosity' setting: '%s', using 'high'",
user_choice.c_str());

return Verbosity::High;
}

Expand Down

0 comments on commit d8db95d

Please sign in to comment.