Add: Further improved unsubmited map matching using map hash derived …

…from osu memory
Piotrekol · Dec 20, 2018 · 0c33095 · 0c33095
1 parent 211d37d
commit 0c33095
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 4 deletions.
diff --git a/StreamCompanionTypes/DataTypes/MapSearchArgs.cs b/StreamCompanionTypes/DataTypes/MapSearchArgs.cs
@@ -11,6 +11,7 @@ public class MapSearchArgs : EventArgs
         public int MapId { get; set; } = 0;
         public OsuStatus Status { get; set; } = OsuStatus.Null;
         public string SourceName { get; }
+        public string MapHash { get; set; }
         //TODO: enforce explicitly setting event type via ctor
         public OsuEventType EventType { get; set; } = OsuEventType.MapChange;
 

diff --git a/StreamCompanionTypes/Interfaces/ISqliteControler.cs b/StreamCompanionTypes/Interfaces/ISqliteControler.cs
@@ -52,6 +52,13 @@ public interface ISqliteControler : IDisposable, IMapDataStorer, CollectionManag
         /// <returns>Beatmap object with data, or null on not found</returns>
         Beatmap GetBeatmap(int mapId);
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="mapId"></param>
+        /// <returns>Beatmap object with data, or null on not found</returns>
+        Beatmap GetBeatmap(string mapHash);
+
         /// <summary>
         /// 
         /// </summary>

diff --git a/osu!StreamCompanion/Code/Core/Maps/Processing/MapStringFormatter.cs b/osu!StreamCompanion/Code/Core/Maps/Processing/MapStringFormatter.cs
@@ -84,7 +84,7 @@ public void ConsumerTask()
                         //Here we prioritize Memory events over MSN/other.
                         if (TasksMemory.TryPop(out searchArgs))
                         {
-                            if (searchArgs.MapId == 0)
+                            if (searchArgs.MapId == 0 && string.IsNullOrEmpty(searchArgs.MapHash))
                             {
                                 memorySearchFailed = true;
                             }

diff --git a/osu!StreamCompanion/Code/Core/SqliteConnector.cs b/osu!StreamCompanion/Code/Core/SqliteConnector.cs
@@ -339,6 +339,30 @@ public Beatmap GetBeatmap(int mapId)
             }
             return beatmap;
         }
+        public Beatmap GetBeatmap(string mapHash)
+        {
+            mapHash = mapHash.ToLower();
+            List<string> tableNames = new List<string>{"withID", "Temp", "withoutID" };
+
+            Beatmap beatmap = null;
+
+            foreach (var tableName in tableNames)
+            {
+                string sql = $"SELECT * FROM `{tableName}` WHERE Md5 = '{mapHash}'";
+                var reader = Query(sql);
+
+                if (reader.Read())
+                {
+                    beatmap = new Beatmap();
+                    beatmap.Read(reader);
+                    reader.Dispose();
+                    break;
+                }
+                reader.Dispose();
+            }
+
+            return beatmap;
+        }
 
         private Beatmap GetBeatmapUsingReplacements(string table, bool useRaw, Dictionary<string, string> replacements)
         {

diff --git a/osu!StreamCompanion/Code/Core/SqliteControler.cs b/osu!StreamCompanion/Code/Core/SqliteControler.cs
@@ -125,6 +125,15 @@ public Beatmap GetBeatmap(int mapId)
                 return _sqlConnector.GetBeatmap(mapId);
             }
         }
+
+        public Beatmap GetBeatmap(string mapHash)
+        {
+            lock (_sqlConnector)
+            {
+                return _sqlConnector.GetBeatmap(mapHash);
+            }
+        }
+
         /// <summary>
         /// 
         /// </summary>

diff --git a/osu!StreamCompanion/Code/Modules/MapDataFinders/SqliteData/SqliteDataFinder.cs b/osu!StreamCompanion/Code/Modules/MapDataFinders/SqliteData/SqliteDataFinder.cs
@@ -42,22 +42,34 @@ public MapSearchResult FindBeatmap(MapSearchArgs searchArgs)
             Beatmap beatmap = null;
             if (searchArgs.MapId > 0)
                 beatmap = _sqliteControler.GetBeatmap(searchArgs.MapId);
-            if (beatmap == null || (beatmap.MapId <= 0))
+
+            if(!IsValidBeatmap(beatmap) && !string.IsNullOrEmpty(searchArgs.MapHash))
+                beatmap = _sqliteControler.GetBeatmap(searchArgs.MapHash);
+
+
+            if (!IsValidBeatmap(beatmap))
             {
                 if (!(string.IsNullOrEmpty(searchArgs.Artist) && string.IsNullOrEmpty(searchArgs.Title)) || !string.IsNullOrEmpty(searchArgs.Raw))
                 {
                     beatmap = _sqliteControler.GetBeatmap(searchArgs.Artist, searchArgs.Title, searchArgs.Diff, searchArgs.Raw);
                 }
             }
 
-            if (beatmap?.MapId > -1 && !(string.IsNullOrWhiteSpace(beatmap.ArtistRoman) || string.IsNullOrWhiteSpace(beatmap.TitleRoman)))
+            if (IsValidBeatmap(beatmap))
             {
                 result.BeatmapsFound.Add(beatmap);
             }
             result.MapSearchString = searchArgs.Raw;
             return result;
         }
 
+        private bool IsValidBeatmap(Beatmap beatmap)
+        {
+            return beatmap != null 
+                   && !string.IsNullOrEmpty(beatmap.Md5) 
+                   && !(string.IsNullOrWhiteSpace(beatmap.ArtistRoman) || string.IsNullOrWhiteSpace(beatmap.TitleRoman));
+        }
+
         public void GetMainWindowHandle(IMainWindowModel mainWindowHandle)
         {
             _mainWindowHandle = mainWindowHandle;

diff --git a/plugins/OsuMemoryEventSource/MemoryListener.cs b/plugins/OsuMemoryEventSource/MemoryListener.cs
@@ -51,12 +51,14 @@ public void Tick(IOsuMemoryReader reader, bool sendEvents)
                     _lastMapId = _currentMapId;
                     _lastStatus = _currentStatus;
                     _lastMapString = _currentMapString;
+                    var mapHash = reader.GetMapMd5();
 
                     NewOsuEvent?.Invoke(this, new MapSearchArgs("OsuMemory")
                     {
                         MapId = _currentMapId,
                         Status = status,
-                        Raw = _currentMapString
+                        Raw = _currentMapString,
+                        MapHash = mapHash
                     });
 
                 }