Patch 1.3.1 - Fixed stats reading incorrectly when having UNICODE letters in the player's name

Martin Nielsen · Martin Nielsen · commit 31d289799344 · 2019-06-01T08:20:57.000+02:00
diff --git a/BetterOverwatch/Functions.cs b/BetterOverwatch/Functions.cs
@@ -4,13 +4,11 @@
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
-using System.Globalization;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
 using AForge.Imaging;
 using AForge.Imaging.Filters;
-using BetterOverwatch.Networking;
 using Image = System.Drawing.Image;
 
 namespace BetterOverwatch
@@ -582,7 +580,6 @@ public static string FetchTextFromImage(Bitmap image, Network network)
                     {
                         text += FetchLetterFromImage(BetterOverwatchNetworks.playersNN, bitmaps[i], network);
                     }
-                    //bitmaps[i].Save(@"C:\testData\" + Guid.NewGuid() + ".png");
                     bitmaps[i].Dispose();
                 }
             }
diff --git a/BetterOverwatch/GameMethods.cs b/BetterOverwatch/GameMethods.cs
@@ -40,7 +40,6 @@ public static void ReadPlayMenu(Bitmap frame)
                     Vars.gameData.state == State.Finished ||
                     Vars.gameData.state == State.WaitForUpload)
                 {
-                    if (!IsValidGame()) return;
                     Server.CheckGameUpload();
                     Vars.gameData = new GameData(Vars.gameData.currentRating);
                 }
@@ -69,20 +68,20 @@ public static void ReadStats(Bitmap frame)
         {
             if (Vars.statsTimer.Elapsed.TotalSeconds < 20) return;
 
-            string eliminationsText = Functions.BitmapToText(frame, 129, 894, 40, 21, false, 110, Network.Numbers);
+            string eliminationsText = Functions.BitmapToText(frame, 129, 895, 40, 23, false, 110, Network.Numbers);
             if (eliminationsText.Equals(string.Empty)) return;
-            string damageText = Functions.BitmapToText(frame, 129, 958, 80, 21, false, 110, Network.Numbers);
+            string damageText = Functions.BitmapToText(frame, 129, 959, 80, 23, false, 110, Network.Numbers);
             if (damageText.Equals(string.Empty)) return;
-            string objKillsText = Functions.BitmapToText(frame, 379, 898, 40, 21, false, 110, Network.Numbers);
-            if (objKillsText.Equals(string.Empty)) return;
-            string healingText = Functions.BitmapToText(frame, 379, 958, 80, 21, false, 110, Network.Numbers);
+            string objectiveKillsText = Functions.BitmapToText(frame, 379, 895, 40, 23, false, 110, Network.Numbers);
+            if (objectiveKillsText.Equals(string.Empty)) return;
+            string healingText = Functions.BitmapToText(frame, 379, 959, 80, 23, false, 110, Network.Numbers);
             if (healingText.Equals(string.Empty)) return;
-            string deathsText = Functions.BitmapToText(frame, 629, 958, 40, 21, false, 110, Network.Numbers);
+            string deathsText = Functions.BitmapToText(frame, 629, 959, 40, 23, false, 110, Network.Numbers);
             if (deathsText.Equals(string.Empty)) return;
 
             if (int.TryParse(eliminationsText, out int eliminations) &&
                 int.TryParse(damageText, out int damage) &&
-                int.TryParse(objKillsText, out int objectiveKills) &&
+                int.TryParse(objectiveKillsText, out int objectiveKills) &&
                 int.TryParse(healingText, out int healing) &&
                 int.TryParse(deathsText, out int deaths))
             {
@@ -98,6 +97,7 @@ public static void ReadStats(Bitmap frame)
                         break;
                     }
                 }
+                //frame.Save(@"C:\testData\" + eliminations + "_" + Guid.NewGuid() + ".png"); // test
                 Vars.gameData.stats.Add(new Stat((int)Vars.gameData.gameTimer.Elapsed.TotalSeconds, eliminations, damage, objectiveKills, healing, deaths, heroStats));
                 Vars.statsTimer.Restart();
             }
@@ -186,7 +186,6 @@ public static void ReadMainMenu(Bitmap frame)
             {
                 if (menuText.Equals("PLAY"))
                 {
-                    if (!IsValidGame()) return;
                     Functions.DebugMessage("Recognized main menu");
                     Vars.loopDelay = 250;
                     Vars.gameData.state = State.Finished;
@@ -269,7 +268,6 @@ public static void ReadFinalScore(Bitmap frame)
             {
                 if (Functions.CompareStrings(finalScoreText, "FIHNLSCORE") >= 40)
                 {
-                    if (!IsValidGame()) return;
                     Functions.DebugMessage("Recognized final score");
                     Vars.gameData.state = State.Finished;
                     Vars.gameData.timer.Stop();
@@ -339,7 +337,7 @@ public static void ReadPlayerNamesAndRank(Bitmap frame)
                 playerRankX += 422;
             }
         }
-        private static bool IsValidGame()
+        public static bool IsValidGame()
         {
             if (Vars.gameData.timer.Elapsed.TotalSeconds < 300)
             {
diff --git a/BetterOverwatch/Networking/Server.cs b/BetterOverwatch/Networking/Server.cs
@@ -62,7 +62,10 @@ public static void VerifyToken()
                     }
                 }
             }
-            catch { }
+            catch {
+                Program.authorizeForm = new AuthorizeForm();
+                Program.authorizeForm.Show();
+            }
         }
         public static bool FetchBlizzardAppOffset(string version)
         {
@@ -124,6 +127,7 @@ public static void CheckGameUpload()
         {
             string game = Vars.gameData.ToString();
             Vars.lastGameJSON = JsonConvert.SerializeObject(JsonConvert.DeserializeObject<CompetitiveGame>(game), Formatting.Indented);
+            if (!GameMethods.IsValidGame()) return;
             UploadGame(game);
         }
         public static void UploadGame(string gameData)
diff --git a/BetterOverwatch/Program.cs b/BetterOverwatch/Program.cs
@@ -28,7 +28,7 @@ internal class Program
         private static void Main()
         {
             Vars.initalize = new Initalize(
-                "1.3.0",
+                "1.3.1",
                 "betteroverwatch.com",
                 "https://api.github.com/repos/MartinNielsenDev/OverwatchTracker/releases/latest");
             Application.EnableVisualStyles();
@@ -149,7 +149,14 @@ public static void CaptureDesktop()
                     {
                         if (Functions.IsProcessOpen("Overwatch"))
                         {
-                            trayMenu.ChangeTray("Visit play menu to update your skill rating", Resources.Icon_Wait);
+                            if (Vars.gameData.currentRating > 0)
+                            {
+                                trayMenu.ChangeTray("Ready to record, enter a competitive game to begin", Resources.Icon_Active);
+                            }
+                            else
+                            {
+                                trayMenu.ChangeTray("Visit play menu to update your skill rating", Resources.Icon_Wait);
+                            }
                             Vars.overwatchRunning = true;
                         }
                         else
@@ -247,28 +254,20 @@ public static void CaptureDesktop()
                                 }
                                 if (Vars.gameData.state == State.Recording)
                                 {
-                                    if (Vars.gameData.tabPressed && Vars.gameData.tabTimer.ElapsedMilliseconds > 250/*Functions.GetAsyncKeyState(0x09) < 0*/)
+                                    if (Vars.gameData.tabPressed && Vars.gameData.tabTimer.ElapsedMilliseconds > 250)
                                     {
-                                        //if (Vars.getInfoTimeout.ElapsedMilliseconds >= 250)
-                                        //{
-                                            if (GameMethods.ReadHeroPlayed(frame.DesktopImage))
-                                            {
-                                                GameMethods.ReadStats(frame.DesktopImage);
-                                            }
-                                            //Vars.getInfoTimeout.Restart();
-                                        //}
-                                        //else
-                                        //{
-                                        //    Vars.getInfoTimeout.Restart();
-                                        //}
+                                        if (GameMethods.ReadHeroPlayed(frame.DesktopImage))
+                                        {
+                                            GameMethods.ReadStats(frame.DesktopImage);
+                                        }
                                     }
                                     GameMethods.ReadRoundCompleted(frame.DesktopImage);
                                     GameMethods.ReadMainMenu(frame.DesktopImage);
                                     GameMethods.ReadFinalScore(frame.DesktopImage);
                                 }
                                 if (Vars.gameData.state == State.RoundComplete)
                                 {
-                                    if (Vars.gameData.tabPressed && Vars.gameData.tabTimer.ElapsedMilliseconds > 250/*Functions.GetAsyncKeyState(0x09) < 0*/)
+                                    if (Vars.gameData.tabPressed && Vars.gameData.tabTimer.ElapsedMilliseconds > 250)
                                     {
                                         GameMethods.ReadHeroPlayed(frame.DesktopImage);
                                     }
diff --git a/BetterOverwatch/Properties/AssemblyInfo.cs b/BetterOverwatch/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyFileVersion("1.3.1.0")]
diff --git a/BetterOverwatch/TrayMenu.cs b/BetterOverwatch/TrayMenu.cs
@@ -20,7 +20,7 @@ public TrayMenu()
             try
             {
                 MenuItem debugTools = new MenuItem("Tools");
-                debugTools.MenuItems.Add("Start test", StartTest);
+                //debugTools.MenuItems.Add("Start test", StartTest);
                 debugTools.MenuItems.Add("Open logs", OpenLogs);
                 debugTools.MenuItems.Add("Export Last Game", FetchJson);
 
diff --git a/BetterOverwatch/Vars.cs b/BetterOverwatch/Vars.cs
@@ -36,7 +36,6 @@ internal enum State
         Finished = 5,
         WaitForUpload = 6
     }
-
     internal enum Network
     {
         Maps = 0,

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,11 @@`
`4`	`4`	`using System.Drawing;`
`5`	`5`	`using System.Drawing.Drawing2D;`
`6`	`6`	`using System.Drawing.Imaging;`
`7`		`-using System.Globalization;`
`8`	`7`	`using System.IO;`
`9`	`8`	`using System.Runtime.InteropServices;`
`10`	`9`	`using System.Text;`
`11`	`10`	`using AForge.Imaging;`
`12`	`11`	`using AForge.Imaging.Filters;`
`13`		`-using BetterOverwatch.Networking;`
`14`	`12`	`using Image = System.Drawing.Image;`
`15`	`13`
`16`	`14`	`namespace BetterOverwatch`
`@@ -582,7 +580,6 @@ public static string FetchTextFromImage(Bitmap image, Network network)`
`582`	`580`	`{`
`583`	`581`	`text += FetchLetterFromImage(BetterOverwatchNetworks.playersNN, bitmaps[i], network);`
`584`	`582`	`}`
`585`		`- //bitmaps[i].Save(@"C:\testData\" + Guid.NewGuid() + ".png");`
`586`	`583`	`bitmaps[i].Dispose();`
`587`	`584`	`}`
`588`	`585`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ public static void ReadPlayMenu(Bitmap frame)`
`40`	`40`	`Vars.gameData.state == State.Finished \|\|`
`41`	`41`	`Vars.gameData.state == State.WaitForUpload)`
`42`	`42`	`{`
`43`		`- if (!IsValidGame()) return;`
`44`	`43`	`Server.CheckGameUpload();`
`45`	`44`	`Vars.gameData = new GameData(Vars.gameData.currentRating);`
`46`	`45`	`}`
`@@ -69,20 +68,20 @@ public static void ReadStats(Bitmap frame)`
`69`	`68`	`{`
`70`	`69`	`if (Vars.statsTimer.Elapsed.TotalSeconds < 20) return;`
`71`	`70`
`72`		`- string eliminationsText = Functions.BitmapToText(frame, 129, 894, 40, 21, false, 110, Network.Numbers);`
	`71`	`+ string eliminationsText = Functions.BitmapToText(frame, 129, 895, 40, 23, false, 110, Network.Numbers);`
`73`	`72`	`if (eliminationsText.Equals(string.Empty)) return;`
`74`		`- string damageText = Functions.BitmapToText(frame, 129, 958, 80, 21, false, 110, Network.Numbers);`
	`73`	`+ string damageText = Functions.BitmapToText(frame, 129, 959, 80, 23, false, 110, Network.Numbers);`
`75`	`74`	`if (damageText.Equals(string.Empty)) return;`
`76`		`- string objKillsText = Functions.BitmapToText(frame, 379, 898, 40, 21, false, 110, Network.Numbers);`
`77`		`- if (objKillsText.Equals(string.Empty)) return;`
`78`		`- string healingText = Functions.BitmapToText(frame, 379, 958, 80, 21, false, 110, Network.Numbers);`
	`75`	`+ string objectiveKillsText = Functions.BitmapToText(frame, 379, 895, 40, 23, false, 110, Network.Numbers);`
	`76`	`+ if (objectiveKillsText.Equals(string.Empty)) return;`
	`77`	`+ string healingText = Functions.BitmapToText(frame, 379, 959, 80, 23, false, 110, Network.Numbers);`
`79`	`78`	`if (healingText.Equals(string.Empty)) return;`
`80`		`- string deathsText = Functions.BitmapToText(frame, 629, 958, 40, 21, false, 110, Network.Numbers);`
	`79`	`+ string deathsText = Functions.BitmapToText(frame, 629, 959, 40, 23, false, 110, Network.Numbers);`
`81`	`80`	`if (deathsText.Equals(string.Empty)) return;`
`82`	`81`
`83`	`82`	`if (int.TryParse(eliminationsText, out int eliminations) &&`
`84`	`83`	`int.TryParse(damageText, out int damage) &&`
`85`		`- int.TryParse(objKillsText, out int objectiveKills) &&`
	`84`	`+ int.TryParse(objectiveKillsText, out int objectiveKills) &&`
`86`	`85`	`int.TryParse(healingText, out int healing) &&`
`87`	`86`	`int.TryParse(deathsText, out int deaths))`
`88`	`87`	`{`
`@@ -98,6 +97,7 @@ public static void ReadStats(Bitmap frame)`
`98`	`97`	`break;`
`99`	`98`	`}`
`100`	`99`	`}`
	`100`	`+ //frame.Save(@"C:\testData\" + eliminations + "_" + Guid.NewGuid() + ".png"); // test`
`101`	`101`	`Vars.gameData.stats.Add(new Stat((int)Vars.gameData.gameTimer.Elapsed.TotalSeconds, eliminations, damage, objectiveKills, healing, deaths, heroStats));`
`102`	`102`	`Vars.statsTimer.Restart();`
`103`	`103`	`}`
`@@ -186,7 +186,6 @@ public static void ReadMainMenu(Bitmap frame)`
`186`	`186`	`{`
`187`	`187`	`if (menuText.Equals("PLAY"))`
`188`	`188`	`{`
`189`		`- if (!IsValidGame()) return;`
`190`	`189`	`Functions.DebugMessage("Recognized main menu");`
`191`	`190`	`Vars.loopDelay = 250;`
`192`	`191`	`Vars.gameData.state = State.Finished;`
`@@ -269,7 +268,6 @@ public static void ReadFinalScore(Bitmap frame)`
`269`	`268`	`{`
`270`	`269`	`if (Functions.CompareStrings(finalScoreText, "FIHNLSCORE") >= 40)`
`271`	`270`	`{`
`272`		`- if (!IsValidGame()) return;`
`273`	`271`	`Functions.DebugMessage("Recognized final score");`
`274`	`272`	`Vars.gameData.state = State.Finished;`
`275`	`273`	`Vars.gameData.timer.Stop();`
`@@ -339,7 +337,7 @@ public static void ReadPlayerNamesAndRank(Bitmap frame)`
`339`	`337`	`playerRankX += 422;`
`340`	`338`	`}`
`341`	`339`	`}`
`342`		`- private static bool IsValidGame()`
	`340`	`+ public static bool IsValidGame()`
`343`	`341`	`{`
`344`	`342`	`if (Vars.gameData.timer.Elapsed.TotalSeconds < 300)`
`345`	`343`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,10 @@ public static void VerifyToken()`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`}`
`65`		`- catch { }`
	`65`	`+ catch {`
	`66`	`+ Program.authorizeForm = new AuthorizeForm();`
	`67`	`+ Program.authorizeForm.Show();`
	`68`	`+ }`
`66`	`69`	`}`
`67`	`70`	`public static bool FetchBlizzardAppOffset(string version)`
`68`	`71`	`{`
`@@ -124,6 +127,7 @@ public static void CheckGameUpload()`
`124`	`127`	`{`
`125`	`128`	`string game = Vars.gameData.ToString();`
`126`	`129`	`Vars.lastGameJSON = JsonConvert.SerializeObject(JsonConvert.DeserializeObject<CompetitiveGame>(game), Formatting.Indented);`
	`130`	`+ if (!GameMethods.IsValidGame()) return;`
`127`	`131`	`UploadGame(game);`
`128`	`132`	`}`
`129`	`133`	`public static void UploadGame(string gameData)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ internal class Program`
`28`	`28`	`private static void Main()`
`29`	`29`	`{`
`30`	`30`	`Vars.initalize = new Initalize(`
`31`		`- "1.3.0",`
	`31`	`+ "1.3.1",`
`32`	`32`	`"betteroverwatch.com",`
`33`	`33`	`"https://api.github.com/repos/MartinNielsenDev/OverwatchTracker/releases/latest");`
`34`	`34`	`Application.EnableVisualStyles();`
`@@ -149,7 +149,14 @@ public static void CaptureDesktop()`
`149`	`149`	`{`
`150`	`150`	`if (Functions.IsProcessOpen("Overwatch"))`
`151`	`151`	`{`
`152`		`- trayMenu.ChangeTray("Visit play menu to update your skill rating", Resources.Icon_Wait);`
	`152`	`+ if (Vars.gameData.currentRating > 0)`
	`153`	`+ {`
	`154`	`+ trayMenu.ChangeTray("Ready to record, enter a competitive game to begin", Resources.Icon_Active);`
	`155`	`+ }`
	`156`	`+ else`
	`157`	`+ {`
	`158`	`+ trayMenu.ChangeTray("Visit play menu to update your skill rating", Resources.Icon_Wait);`
	`159`	`+ }`
`153`	`160`	`Vars.overwatchRunning = true;`
`154`	`161`	`}`
`155`	`162`	`else`
`@@ -247,28 +254,20 @@ public static void CaptureDesktop()`
`247`	`254`	`}`
`248`	`255`	`if (Vars.gameData.state == State.Recording)`
`249`	`256`	`{`
`250`		`- if (Vars.gameData.tabPressed && Vars.gameData.tabTimer.ElapsedMilliseconds > 250/Functions.GetAsyncKeyState(0x09) < 0/)`
	`257`	`+ if (Vars.gameData.tabPressed && Vars.gameData.tabTimer.ElapsedMilliseconds > 250)`
`251`	`258`	`{`
`252`		`- //if (Vars.getInfoTimeout.ElapsedMilliseconds >= 250)`
`253`		`- //{`
`254`		`- if (GameMethods.ReadHeroPlayed(frame.DesktopImage))`
`255`		`- {`
`256`		`- GameMethods.ReadStats(frame.DesktopImage);`
`257`		`- }`
`258`		`- //Vars.getInfoTimeout.Restart();`
`259`		`- //}`
`260`		`- //else`
`261`		`- //{`
`262`		`- // Vars.getInfoTimeout.Restart();`
`263`		`- //}`
	`259`	`+ if (GameMethods.ReadHeroPlayed(frame.DesktopImage))`
	`260`	`+ {`
	`261`	`+ GameMethods.ReadStats(frame.DesktopImage);`
	`262`	`+ }`
`264`	`263`	`}`
`265`	`264`	`GameMethods.ReadRoundCompleted(frame.DesktopImage);`
`266`	`265`	`GameMethods.ReadMainMenu(frame.DesktopImage);`
`267`	`266`	`GameMethods.ReadFinalScore(frame.DesktopImage);`
`268`	`267`	`}`
`269`	`268`	`if (Vars.gameData.state == State.RoundComplete)`
`270`	`269`	`{`
`271`		`- if (Vars.gameData.tabPressed && Vars.gameData.tabTimer.ElapsedMilliseconds > 250/Functions.GetAsyncKeyState(0x09) < 0/)`
	`270`	`+ if (Vars.gameData.tabPressed && Vars.gameData.tabTimer.ElapsedMilliseconds > 250)`
`272`	`271`	`{`
`273`	`272`	`GameMethods.ReadHeroPlayed(frame.DesktopImage);`
`274`	`273`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public TrayMenu()`
`20`	`20`	`try`
`21`	`21`	`{`
`22`	`22`	`MenuItem debugTools = new MenuItem("Tools");`
`23`		`- debugTools.MenuItems.Add("Start test", StartTest);`
	`23`	`+ //debugTools.MenuItems.Add("Start test", StartTest);`
`24`	`24`	`debugTools.MenuItems.Add("Open logs", OpenLogs);`
`25`	`25`	`debugTools.MenuItems.Add("Export Last Game", FetchJson);`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ internal enum State`
`36`	`36`	`Finished = 5,`
`37`	`37`	`WaitForUpload = 6`
`38`	`38`	`}`
`39`		`-`
`40`	`39`	`internal enum Network`
`41`	`40`	`{`
`42`	`41`	`Maps = 0,`