Skip to content

Commit

Permalink
Merge pull request #3850 from GrimmGringo/master
Browse files Browse the repository at this point in the history 
Fixed console logger color to obey custom colors
  • Loading branch information
GrimmGringo committed Aug 9, 2016
2 parents 67f20e0 + 86265ee commit 89618ca
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 24 deletions.
8 changes: 4 additions & 4 deletions PoGo.NecroBot.CLI/ConsoleEventListener.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ private static void HandleEvent(FortFailedEvent fortFailedEvent, ISession sessio

private static void HandleEvent(FortTargetEvent fortTargetEvent, ISession session)
{
// int intTimeForArrival = (int) ( fortTargetEvent.Distance / ( session.LogicSettings.WalkingSpeedInKilometerPerHour * 0.277778 ) );
int intTimeForArrival = (int) ( fortTargetEvent.Distance / ( session.LogicSettings.WalkingSpeedInKilometerPerHour * 0.2 ) );

Logger.Write(
session.Translation.GetTranslation(TranslationString.EventFortTargeted, fortTargetEvent.Name ),
// Math.Round(fortTargetEvent.Distance), intTimeForArrival ),
LogLevel.Info);
session.Translation.GetTranslation(TranslationString.EventFortTargeted, fortTargetEvent.Name,
Math.Round(fortTargetEvent.Distance), intTimeForArrival ),
LogLevel.Info, ConsoleColor.Gray);
}

private static void HandleEvent(PokemonCaptureEvent pokemonCaptureEvent, ISession session)
Expand Down
39 changes: 19 additions & 20 deletions PoGo.NecroBot.CLI/ConsoleLogger.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,75 +51,74 @@ public void Write(string message, LogLevel level = LogLevel.Info, ConsoleColor c
switch (level)
{
case LogLevel.Error:
Console.ForegroundColor = ConsoleColor.Red;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.Red : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Error}) {message}");
break;
case LogLevel.Warning:
Console.ForegroundColor = ConsoleColor.DarkYellow;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.DarkYellow : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Attention}) {message}");
break;
case LogLevel.Info:
Console.ForegroundColor = ConsoleColor.DarkCyan;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.DarkCyan : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Info}) {message}");
break;
case LogLevel.Pokestop:
Console.ForegroundColor = ConsoleColor.Cyan;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.Cyan : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Pokestop}) {message}");
break;
case LogLevel.Farming:
Console.ForegroundColor = ConsoleColor.Magenta;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.Magenta : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Farming}) {message}");
break;
case LogLevel.Sniper:
Console.ForegroundColor = ConsoleColor.White;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.White : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Sniper}) {message}");
break;
case LogLevel.Recycling:
Console.ForegroundColor = ConsoleColor.DarkMagenta;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.DarkMagenta : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Recycling}) {message}");
break;
case LogLevel.Caught:
Console.ForegroundColor = ConsoleColor.Green;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.Green : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Pkmn}) {message}");
break;
case LogLevel.Flee:
Console.ForegroundColor = ConsoleColor.DarkYellow;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.DarkYellow : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Pkmn}) {message}");
break;
case LogLevel.Transfer:
Console.ForegroundColor = ConsoleColor.DarkGreen;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.DarkGreen : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Transferred}) {message}");
break;
case LogLevel.Evolve:
Console.ForegroundColor = ConsoleColor.Yellow;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.Yellow : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Evolved}) {message}");
break;
case LogLevel.Berry:
Console.ForegroundColor = ConsoleColor.DarkYellow;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.DarkYellow : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Berry}) {message}");
break;
case LogLevel.Egg:
Console.ForegroundColor = ConsoleColor.DarkYellow;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.DarkYellow : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Egg}) {message}");
break;
case LogLevel.Debug:
Console.ForegroundColor = ConsoleColor.Gray;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.Gray : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Debug}) {message}");
break;
case LogLevel.Update:
Console.ForegroundColor = ConsoleColor.White;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.White : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Update}) {message}");
break;
case LogLevel.New:
Console.ForegroundColor = ConsoleColor.Green;
Console.WriteLine($"[{DateTime.Now.ToString( "HH:mm:ss" )}] ({LoggingStrings.New}) {message}" );
break;
Console.ForegroundColor = ConsoleColor.Black ? ConsoleColor.Green : color;
Console.WriteLine( $"[{DateTime.Now.ToString( "HH:mm:ss" )}] ({LoggingStrings.New}) {message}" );
case LogLevel.SoftBan:
Console.ForegroundColor = ConsoleColor.DarkRed;
Console.ForegroundColor = ConsoleColor.Black ? ConsoleColor.DarkRed : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.SoftBan}) {message}");
break;
default:
Console.ForegroundColor = ConsoleColor.White;
Console.ForegroundColor = color == ConsoleColor.Black ? ConsoleColor.White : color;
Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Error}) {message}");
break;
}
Expand Down

0 comments on commit 89618ca

Please sign in to comment.