trading
/
PTMagic
mirror of https://github.com/PTMagicians/PTMagic.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Fixed issues where wrong lines were processed + minor UI fix for lists

This commit is contained in:
djbadders 2019-03-04 22:37:05 +00:00
parent 2b0b4f7b1f
commit a7a256547d
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Helper/SystemHelper.cs
View File

@ -373,7 +373,7 @@ namespace Core.Helper
{
for (int i = 0; i < tokenList.Count; i++)
{
result += tokenList[i].Trim() + separator;
result += tokenList[i].Trim() + (i < (tokenList.Count - 1) ? separator : "");
}
if (cropDoubleSeparators) result = result.Replace(separator + separator, "");

17
Core/ProfitTrailer/SettingsHandler.cs
View File

@ -29,7 +29,7 @@ namespace Core.ProfitTrailer
private static string CalculatePropertyValue(string settingProperty, string oldValueString, string newValueString, out string configPropertyKey)
{
int valueMode = Constants.ValueModeDefault;
configPropertyKey = settingProperty;
configPropertyKey = settingProperty.Trim();
string result = null;
// Determine the mode for changing the value
@ -339,28 +339,27 @@ namespace Core.ProfitTrailer
string propertyKey;
var lineParts = line.Trim().Split("=");
string linePropertyName = lineParts[0].Trim();
string newValueString = SystemHelper.PropertyToString(properties[settingProperty]);
string oldValueString = line.Substring(line.IndexOf("=") + 1).Trim();
string oldValueString = lineParts[1].Trim();
newValueString = CalculatePropertyValue(settingProperty, oldValueString, newValueString, out propertyKey);
if (line.Contains(propertyKey, StringComparison.InvariantCultureIgnoreCase))
if (linePropertyName.Equals(propertyKey, StringComparison.InvariantCultureIgnoreCase))
{
madeSubstitutions = true;
line = propertyKey + " = " + newValueString;
string previousLine = result.Last();
if (previousLine.IndexOf("PTMagic Changed Line", StringComparison.InvariantCultureIgnoreCase) > -1)
if (previousLine.IndexOf("PTMagic changed line", StringComparison.InvariantCultureIgnoreCase) > -1)
{
previousLine = "# PTMagic changed line for setting '" + settingName + "' on " + DateTime.Now.ToShortDateString() + " " + DateTime.Now.ToShortTimeString();
result.RemoveAt(result.Count - 1);
result.Add(previousLine);
}
else
{
string editLine = "# PTMagic changed line for setting '" + settingName + "' on " + DateTime.Now.ToShortDateString() + " " + DateTime.Now.ToShortTimeString();
result.Add(editLine);
result.Add(String.Format("# PTMagic changed {5} for setting '{0}' from value '{1}' to '{2}' on {3} {4}", settingName, oldValueString, newValueString, DateTime.Now.ToShortDateString(), DateTime.Now.ToShortTimeString(), linePropertyName));
}
result.Add(line);
}