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

Ignored/Allowed in SMS

This commit is contained in:
HojouFotytu 2021-03-25 22:34:53 +09:00
parent 925be228e1
commit ace96a632b
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/Main/PTMagic.cs
View File

@ -1518,7 +1518,7 @@ namespace Core.Main
// Check ignore markets // Check ignore markets
List<string> ignoredMarkets = SystemHelper.ConvertTokenStringToList(marketSetting.IgnoredMarkets, ","); List<string> ignoredMarkets = SystemHelper.ConvertTokenStringToList(marketSetting.IgnoredMarkets, ",");
if (ignoredMarkets.Contains(marketPair)) if (ignoredMarkets.Any(marketPair.Contains))
{ {
this.Log.DoLogDebug("'" + marketPair + "' - Is ignored in '" + marketSetting.SettingName + "'."); this.Log.DoLogDebug("'" + marketPair + "' - Is ignored in '" + marketSetting.SettingName + "'.");
continue; continue;
@ -1526,7 +1526,7 @@ namespace Core.Main
// Check allowed markets // Check allowed markets
List<string> allowedMarkets = SystemHelper.ConvertTokenStringToList(marketSetting.AllowedMarkets, ","); List<string> allowedMarkets = SystemHelper.ConvertTokenStringToList(marketSetting.AllowedMarkets, ",");
if (allowedMarkets.Count > 0 && !allowedMarkets.Contains(marketPair)) if (allowedMarkets.Count > 0 && !allowedMarkets.Any(marketPair.Contains))
{ {
this.Log.DoLogDebug("'" + marketPair + "' - Is not allowed in '" + marketSetting.SettingName + "'."); this.Log.DoLogDebug("'" + marketPair + "' - Is not allowed in '" + marketSetting.SettingName + "'.");
continue; continue;

5
Core/MarketAnalyzer/BinanceFutures.cs
View File

@ -74,9 +74,7 @@ namespace Core.MarketAnalyzer
//New variables for filtering out bad markets //New variables for filtering out bad markets
float marketLastPrice = currencyTicker["lastPrice"].ToObject<float>(); float marketLastPrice = currencyTicker["lastPrice"].ToObject<float>();
float marketVolume = currencyTicker["volume"].ToObject<float>(); float marketVolume = currencyTicker["volume"].ToObject<float>();
if (marketName.EndsWith(mainMarket, StringComparison.InvariantCultureIgnoreCase)) if (marketLastPrice > 0 && marketVolume > 0)
{
if (marketLastPrice > 0 && marketVolume > 0)
{ {
// Set last values in case any error occurs // Set last values in case any error occurs
@ -100,7 +98,6 @@ namespace Core.MarketAnalyzer
//Let the user know that the problem market was ignored. //Let the user know that the problem market was ignored.
log.DoLogInfo("BinanceFutures - Ignoring bad market data for " + marketName); log.DoLogInfo("BinanceFutures - Ignoring bad market data for " + marketName);
} }
}
} }
BinanceFutures.CheckFirstSeenDates(markets, ref marketInfos, systemConfiguration, log); BinanceFutures.CheckFirstSeenDates(markets, ref marketInfos, systemConfiguration, log);