Make softban log level (#3831)

Replace last softban message line with new one to prevent spam.
NecronomiconCoding · Aug 9, 2016 · c03c9b8 · c03c9b8
1 parent 358d8e7
commit c03c9b8
Show file tree

Hide file tree

Showing 10 changed files with 2,035 additions and 1,984 deletions.
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.vi.json b/PoGo.NecroBot.CLI/Config/Translations/translation.vi.json
diff --git a/PoGo.NecroBot.CLI/ConsoleEventListener.cs b/PoGo.NecroBot.CLI/ConsoleEventListener.cs
@@ -107,9 +107,21 @@ private static void HandleEvent(FortUsedEvent fortUsedEvent, ISession session)
 
         private static void HandleEvent(FortFailedEvent fortFailedEvent, ISession session)
         {
-            Logger.Write(
+            if (fortFailedEvent.Try != 1 && fortFailedEvent.Looted == false)
+            {
+                Logger.lineSelect(0, 1);
+            }
+
+            if (fortFailedEvent.Looted == true)
+            {
+                Logger.Write(
+                session.Translation.GetTranslation(TranslationString.SoftBanBypassed),
+                LogLevel.SoftBan);
+            } else {
+                Logger.Write(
                 session.Translation.GetTranslation(TranslationString.EventFortFailed, fortFailedEvent.Name, fortFailedEvent.Try, fortFailedEvent.Max),
-                LogLevel.Pokestop, ConsoleColor.DarkRed);
+                LogLevel.SoftBan);
+            }
         }
 
         private static void HandleEvent(FortTargetEvent fortTargetEvent, ISession session)
@@ -119,7 +131,7 @@ private static void HandleEvent(FortTargetEvent fortTargetEvent, ISession sessio
             Logger.Write(
                 session.Translation.GetTranslation(TranslationString.EventFortTargeted, fortTargetEvent.Name ),
                     // Math.Round(fortTargetEvent.Distance), intTimeForArrival ),
-                LogLevel.Info, ConsoleColor.DarkRed);
+                LogLevel.Info);
         }
 
         private static void HandleEvent(PokemonCaptureEvent pokemonCaptureEvent, ISession session)

diff --git a/PoGo.NecroBot.CLI/ConsoleLogger.cs b/PoGo.NecroBot.CLI/ConsoleLogger.cs
@@ -112,13 +112,22 @@ public void Write(string message, LogLevel level = LogLevel.Info, ConsoleColor c
                     break;
                 case LogLevel.New:
                     Console.ForegroundColor = ConsoleColor.Green;
-                    Console.WriteLine( $"[{DateTime.Now.ToString( "HH:mm:ss" )}] ({LoggingStrings.New}) {message}" );
+                    Console.WriteLine($"[{DateTime.Now.ToString( "HH:mm:ss" )}] ({LoggingStrings.New}) {message}" );
+                    break;
+                case LogLevel.SoftBan:
+                    Console.ForegroundColor = ConsoleColor.DarkRed;
+                    Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.SoftBan}) {message}");
                     break;
                 default:
                     Console.ForegroundColor = ConsoleColor.White;
                     Console.WriteLine($"[{DateTime.Now.ToString("HH:mm:ss")}] ({LoggingStrings.Error}) {message}");
                     break;
             }
         }
+
+        public void lineSelect(int lineChar = 0, int linesUp = 1)
+        {
+            Console.SetCursorPosition(lineChar, Console.CursorTop - linesUp);
+        }
     }
 }
diff --git a/PoGo.NecroBot.CLI/Models/LoggingStrings.cs b/PoGo.NecroBot.CLI/Models/LoggingStrings.cs
@@ -35,6 +35,8 @@ internal class LoggingStrings
 
         internal static string New;
 
+        internal static string SoftBan;
+
         internal static void SetStrings(ISession session)
         {
             Attention =
@@ -96,6 +98,10 @@ internal static void SetStrings(ISession session)
             New =
                 session?.Translation.GetTranslation(
                     TranslationString.LogEntryNew ) ?? "NEW";
+
+            SoftBan =
+                session?.Translation.GetTranslation(
+                   TranslationString.LogEntrySoftBan) ?? "SOFTBAN";
         }
     }
 }
diff --git a/PoGo.NecroBot.CLI/Program.cs b/PoGo.NecroBot.CLI/Program.cs
@@ -45,7 +45,7 @@ private static void Main(string[] args)
             if (args.Length > 0)
                 subPath = args[0];
 
-            Logger.SetLogger(new ConsoleLogger(LogLevel.New), subPath);
+            Logger.SetLogger(new ConsoleLogger(LogLevel.SoftBan), subPath);
 
             if( CheckKillSwitch() )
                 return;

diff --git a/PoGo.NecroBot.Logic/Common/Translations.cs b/PoGo.NecroBot.Logic/Common/Translations.cs
@@ -82,6 +82,7 @@ public enum TranslationString
         LogEntryDebug,
         LogEntryUpdate,
         LogEntryNew,
+        LogEntrySoftBan,
         LoggingIn,
         PtcOffline,
         AccessTokenExpired,
@@ -166,6 +167,7 @@ public enum TranslationString
         EventUsedIncense,
         SnipeServerOffline,
         PromptError,
+        SoftBanBypassed,
         FirstStartLanguagePrompt,
         FirstStartLanguageCodePrompt,
         FirstStartLanguageConfirm,
@@ -286,6 +288,7 @@ public class Translation : ITranslation
             new KeyValuePair<TranslationString, string>(TranslationString.LogEntryDebug, "DEBUG"),
             new KeyValuePair<TranslationString, string>(TranslationString.LogEntryUpdate, "UPDATE"),
             new KeyValuePair<TranslationString, string>(TranslationString.LogEntryNew, "NEW"),
+            new KeyValuePair<TranslationString, string>(TranslationString.LogEntrySoftBan, "SOFTBAN"),
             new KeyValuePair<TranslationString, string>(TranslationString.LoggingIn, "Logging in using {0}"),
             new KeyValuePair<TranslationString, string>(TranslationString.PtcOffline,
                 "PTC Servers are probably down OR your credentials are wrong. Try google"),
@@ -445,6 +448,8 @@ public class Translation : ITranslation
             new KeyValuePair<TranslationString, string>(TranslationString.FirstStartSetupDefaultLatConfirm, "Lattitude accepted: {0}"),
             new KeyValuePair<TranslationString, string>(TranslationString.FirstStartSetupDefaultLongPrompt, "Please enter a Longitude (Right click to paste)"),
             new KeyValuePair<TranslationString, string>(TranslationString.FirstStartSetupDefaultLongConfirm, "Longitude accepted: {0}"),
+            new KeyValuePair<TranslationString, string>(TranslationString.SoftBanBypassed,
+                "Successfully bypassed!"),
             new KeyValuePair<TranslationString, string>(TranslationString.FirstStartSetupCompleted, "### COMPLETED CONFIG SETUP ###")
         };
 

diff --git a/PoGo.NecroBot.Logic/Event/FortFailedEvent.cs b/PoGo.NecroBot.Logic/Event/FortFailedEvent.cs
@@ -5,5 +5,6 @@ public class FortFailedEvent : IEvent
         public int Max;
         public string Name;
         public int Try;
+        public bool Looted;
     }
 }
diff --git a/PoGo.NecroBot.Logic/Logging/ILogger.cs b/PoGo.NecroBot.Logic/Logging/ILogger.cs
@@ -22,5 +22,6 @@ public interface ILogger
         /// <param name="level">Optional. Default <see cref="LogLevel.Info" />.</param>
         /// <param name="color">Optional. Default automatic color.</param>
         void Write(string message, LogLevel level = LogLevel.Info, ConsoleColor color = ConsoleColor.Black);
+        void lineSelect(int lineChar = 0, int linesUp = 1);
     }
 }
diff --git a/PoGo.NecroBot.Logic/Logging/Logger.cs b/PoGo.NecroBot.Logic/Logging/Logger.cs
@@ -87,6 +87,11 @@ public static void Write(string message, LogLevel level = LogLevel.Info, Console
             if (!_isGui)
                 Log(string.Concat($"[{DateTime.Now.ToString("HH:mm:ss")}] ", message), force);
         }
+
+        public static void lineSelect(int lineChar = 0, int linesUp = 1)
+        {
+            _logger.lineSelect(lineChar, linesUp);
+        }
     }
 
     public enum LogLevel
@@ -107,6 +112,7 @@ public enum LogLevel
         Update = 13,
         Info = 14,
         New = 15,
-        Debug = 16,
+        SoftBan = 16,
+        Debug = 17,
     }
 }
diff --git a/PoGo.NecroBot.Logic/Tasks/FarmPokestopsTask.cs b/PoGo.NecroBot.Logic/Tasks/FarmPokestopsTask.cs
@@ -116,8 +116,7 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                         {
                             if ((int) fortSearch.CooldownCompleteTimestampMs != 0)
                             {
-                                break;
-                                    // Check if successfully looted, if so program can continue as this was "false alarm".
+                                break; // Check if successfully looted, if so program can continue as this was "false alarm".
                             }
 
                             fortTry += 1;
@@ -126,14 +125,26 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                             {
                                 Name = fortInfo.Name,
                                 Try = fortTry,
-                                Max = retryNumber - zeroCheck
+                                Max = retryNumber - zeroCheck,
+                                Looted = false
                             });
 
                             DelayingUtils.Delay(session.LogicSettings.DelayBetweenPlayerActions, 0);
                         }
                     }
                     else
                     {
+                        if (fortTry != 0)
+                        {
+                            session.EventDispatcher.Send(new FortFailedEvent
+                            {
+                                Name = fortInfo.Name,
+                                Try = fortTry + 1,
+                                Max = retryNumber - zeroCheck,
+                                Looted = true
+                            });
+                        }
+
                         session.EventDispatcher.Send(new FortUsedEvent
                         {
                             Id = pokeStop.Id,