fix deck matching by id, not name + total games played

Advisor/Advisor.cs

@@ -231,6 +231,8 @@ internal async void UpdateCardList()
                 // Some unreproducable bug threw an exception here. System.InvalidOperationException: Sequence contains no elements @ IEnumerable.Max() => should be fixed by DefaultIfEmpty() now!
                 var maxSim = dict.Values.DefaultIfEmpty(0).Max();
 
+                Log.Info($"decksFound: { dict.Count }, opponent: {CoreAPI.Game.Opponent.Class}, maxSim: { maxSim }");
+
                 // If any archetype deck matches more than MinimumSimilarity (as percentage) show the deck with the highest similarity (important: we need at least 1 deck in dict, otherwise we can't show any results.)
                 if (dict.Count > 0 && maxSim >= Settings.Default.MinimumSimilarity * 0.01)
                 {
@@ -255,8 +257,9 @@ internal async void UpdateCardList()
                         _advisorOverlay.LblArchetype.Text = $"{matchedDeck.Key.Name} ({Math.Round(matchedDeck.Value * 100, 2)}%)";
                     }
 
-                    _advisorOverlay.LblStats.Text = matchedDeck.Key.Note;
-                    var deck = DeckList.Instance.Decks.Where(d => d.TagList.ToLowerInvariant().Contains("archetype")).First(d => d.Name == matchedDeck.Key.Name);
+                    string[] infos = matchedDeck.Key.Note.Split('-');
+                    _advisorOverlay.LblStats.Text = $"{ infos[1] }/{ infos[2] }%";
+                    var deck = DeckList.Instance.Decks.Where(d => d.TagList.ToLowerInvariant().Contains("archetype")).First(d => d.Note.Split('-')[0] == matchedDeck.Key.Note.Split('-')[0]);
 
                     var predictedCards = ((Deck) deck.Clone()).Cards.ToList();
 
@@ -308,9 +311,12 @@ internal async void UpdateCardList()
                     }
 
                     // Update overlay cards.
+                    isNewArchetypeDeck = true;
                     _advisorOverlay.Update(predictedCards.ToSortedCardList(), isNewArchetypeDeck);
                     // Remember current archetype deck guid with highest similarity to opponent's played cards.
                     _currentArchetypeDeckGuid = matchedDeck.Key.DeckId;
+
+                    Log.Info($"Deck: { matchedDeck.Key.DeckId } , { infos[0] }, { matchedDeck.Key.Class }, { isNewArchetypeDeck }");
                 }
                 else
                 {
@@ -352,7 +358,7 @@ public static void Notify(string title, string message, int autoClose, string ic
 
         public static async Task ImportMetastatsDecks()
         {
-            //construct Progress<T>, passing ReportProgress as the Action<T> 
+            //construct Progress<T>, passing ReportProgress as the Action<T>
             var progressIndicator = new Progress<Tuple<int, int>>(ReportProgress);
             try
             {

Advisor/AdvisorPlugin.cs

@@ -80,7 +80,7 @@ public void OnUpdate()
         {
         }
 
-        public Version Version => new Version(1, 0, 14);
+        public Version Version => new Version(1, 2, 0);
 
         public async Task CheckForUpdate()
         {

Advisor/ExtensionMethods.cs

@@ -68,7 +68,8 @@ public static int CountUnion(this Deck thisDeck, IList<Card> cards)
         /// <returns>Number of played games with the given deck. If no info is found or parse is unsuccessful, return 0.</returns>
         public static int GetPlayedGames(this Deck thisDeck)
         {
-            var success = int.TryParse(Regex.Match(thisDeck.Note, @"Games: ([0-9]+)").Groups[1].Value, out var result);
+            string[] infos = thisDeck.Note.Split('-');
+            var success = int.TryParse(infos[1], out int result);
             return success ? result : 0;
         }
     }

Advisor/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.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]

Advisor/Services/HsReplay/HsReplaySnapshotImporter.cs

@@ -107,6 +107,7 @@ private Deck GetDeck(JToken deckJson, Dictionary<string, HsReplayArchetype> allA
             deck.Class = hsReplayClassToDeckTrackerClass[archetype.Class];
             deck.Cards = GetCardsFromHsReplayDeckList(hsReplayDeck.DeckList);
             deck.LastEdited = DateTime.Now;
+            deck.Note = hsReplayDeck.DeckId + "-" + hsReplayDeck.TotalGames + "-" + hsReplayDeck.WinRate;
 
             return deck;
         }
@@ -183,6 +184,12 @@ class HsReplayDeck
             [JsonProperty("deck_list")]
             public string DeckList { get; set; }
 
+            [JsonProperty("total_games")]
+            public string TotalGames { get; set; }
+
+            [JsonProperty("win_rate")]
+            public string WinRate { get; set; }
+
             public string Name { get; set; }
             public string ClassId { get; set; }
         }