Skip to content

Clean up parses to make them more safe #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Clayell wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Clean up parses to make them more safe #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4298ed5
clean up parses
Clayell Sep 27, 2025
254d3cb
remove unused variable e
Clayell Sep 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/DynamicBatteryStorage/Handlers/GenericFieldDataHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ protected override double GetValueEditor()
double results = 0d;
if (editorField != null)
{
double.TryParse(editorField.GetValue(pm).ToString(), out results);
double.TryParse(editorField.GetValue(pm)?.ToString(), out results);
}
return results * editorValueScalar;
}
Expand All @@ -62,7 +62,7 @@ protected override double GetValueFlight()
double results = 0d;
if (flightField != null)
{
double.TryParse(flightField.GetValue(pm).ToString(), out results);
double.TryParse(flightField.GetValue(pm)?.ToString(), out results);
}
return results * flightValueScalar;
}
Expand Down
6 changes: 1 addition & 5 deletions Source/DynamicBatteryStorage/Handlers/KopernicusPowerHandlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ protected override double GetValueEditor()

protected override double GetValueFlight()
{
double results = 0d;
if (double.TryParse(pm.Fields.GetValue("currentOutput").ToString(), out results))
{
return results;
}
Utils.TryGetField(pm, "currentOutput", out double results);
return results;
}
}
Expand Down
2 changes: 1 addition & 1 deletion Source/DynamicBatteryStorage/Handlers/RealBatteryPowerHandlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ protected override double GetValueEditor()
}
protected override double GetValueFlight()
{
double.TryParse(pm.Fields.GetValue("lastECpower").ToString(), out double results);
Utils.TryGetField(pm, "lastECpower", out double results);
if (results > 0)
{
producer = false;
Expand Down
2 changes: 1 addition & 1 deletion Source/DynamicBatteryStorage/Handlers/ScanSatPowerHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ protected override double GetValueEditor()
}
protected override double GetValueFlight()
{
bool.TryParse(pm.Fields.GetValue("scanning").ToString(), out bool isScanning);
Utils.TryGetField(pm, "scanning", out bool isScanning);
if (isScanning)
{
return -resource.rate;
Expand Down
5 changes: 1 addition & 4 deletions Source/DynamicBatteryStorage/Handlers/WDSPPowerHandlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ protected override double GetValueEditor()
}
protected override double GetValueFlight()
{
if (double.TryParse(pm.Fields.GetValue("currentOutput").ToString(), out double results))
{
return results;
}
Utils.TryGetField(pm, "currentOutput", out double results);
return results;

}
Expand Down
43 changes: 12 additions & 31 deletions Source/DynamicBatteryStorage/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,44 +49,25 @@ public static void Error(string toLog)

public static bool TryGetField(PartModule pm, string fieldName, out bool result)
{
result = false;
var field = pm.Fields.GetValue(fieldName);
if (field != null)
{
if (bool.TryParse(field.ToString(), out result))
{
return true;
}
}
return false;
result = false;
string field = pm?.Fields?.GetValue(fieldName)?.ToString();
return bool.TryParse(field, out result);
}

public static bool TryGetField(PartModule pm, string fieldName, out double result)
{
result = 0d;
var field = pm.Fields.GetValue(fieldName);
if (field != null)
{
if (double.TryParse(field.ToString(), out result))
{
return true;
}
}
return false;
result = 0d;
string field = pm?.Fields?.GetValue(fieldName)?.ToString();
return double.TryParse(field, out result);
}

public static bool TryGetField(PartModule pm, string fieldName, out float result)
{
result = 0f;
var field = pm.Fields.GetValue(fieldName);
if (field != null)
{
if (float.TryParse(field.ToString(), out result))
{
return true;
}
}
return false;
result = 0f;
string field = pm?.Fields?.GetValue(fieldName)?.ToString();
return float.TryParse(field, out result);
}

public static bool TryParseEnum<T>(string str, bool caseSensitive, out T value) where T : struct
{
// Can't make this a type constraint...
Expand Down Expand Up @@ -120,7 +101,7 @@ public static T FindChildOfType<T>(string name, Transform parent)
{
result = parent.FindDeepChild(name).GetComponent<T>();
}
catch (NullReferenceException e)
catch (NullReferenceException)
{
Debug.LogError($"Couldn't find {name} in children of {parent.name}");
}
Expand Down