Merge pull request #269 from Founntain/realm-import-crash

Fixed Crash during import because of false encoded Folder-Paths
Founntain · Apr 9, 2024 · f8c9419 · f8c9419
2 parents b85d51f + 1d6165c
commit f8c9419
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/OsuPlayer.IO/DbReader/RealmReader.cs b/OsuPlayer.IO/DbReader/RealmReader.cs
@@ -1,8 +1,11 @@
-using OsuPlayer.Data.DataModels;
+using Newtonsoft.Json;
+using OsuPlayer.Data.DataModels;
 using OsuPlayer.Data.DataModels.Interfaces;
 using OsuPlayer.Data.LazerModels.Beatmaps;
 using OsuPlayer.Data.LazerModels.Collections;
 using OsuPlayer.Data.LazerModels.Files;
+using OsuPlayer.Interfaces.Service;
+using OsuPlayer.Services;
 using Realms;
 using Realms.Dynamic;
 using Splat;

diff --git a/OsuPlayer.IO/Importer/SongImporter.cs b/OsuPlayer.IO/Importer/SongImporter.cs
@@ -84,6 +84,13 @@ await using (var config = new Config())
 
         using var reader = dbReaderFactory.CreateDatabaseReader(path);
 
+        if (reader == null)
+        {
+            loggingService.Log($"Couldn't create database reader for given path {path}", LogType.Error);
+
+            return null;
+        }
+
         loggingService.Log("Starting beatmap import...");
 
         readMaps = await reader.ReadBeatmaps();

diff --git a/OsuPlayer.Services/DbReaderFactory.cs b/OsuPlayer.Services/DbReaderFactory.cs
@@ -1,7 +1,9 @@
 using OsuPlayer.Data.DataModels;
 using OsuPlayer.Data.DataModels.Interfaces;
 using OsuPlayer.Data.Enums;
+using OsuPlayer.Interfaces.Service;
 using OsuPlayer.IO.DbReader;
+using Splat;
 
 namespace OsuPlayer.Services;
 
@@ -13,6 +15,8 @@ public class DbReaderFactory : OsuPlayerService, IDbReaderFactory
 
     public IDatabaseReader? CreateDatabaseReader(string path)
     {
+        var loggingService = Locator.Current.GetService<ILoggingService>();
+
         switch (Type)
         {
             case DbCreationType.OsuDb:
@@ -22,8 +26,12 @@ public class DbReaderFactory : OsuPlayerService, IDbReaderFactory
 
                 var file = File.OpenRead(dbLoc);
 
+                LogToConsole($"Using osu!.db import for path {path}");
+
                 return new OsuDbReader(file, path, this);
             case DbCreationType.Realm:
+                LogToConsole($"Using client.realm importer for path {path}");
+
                 return new RealmReader(path, this);
             default:
                 throw new ArgumentOutOfRangeException();

diff --git a/OsuPlayer/Views/SettingsView.axaml.cs b/OsuPlayer/Views/SettingsView.axaml.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using System.Web;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
@@ -74,6 +75,9 @@ public async void ImportSongsClick(object? sender, RoutedEventArgs routedEventAr
 
         var osuFolder = Path.GetDirectoryName(dbFilePath);
 
+        // Decode the path, so stuff like %20 are encoded properly
+        osuFolder = HttpUtility.UrlDecode(osuFolder);
+
         await using (var config = new Config())
         {
             (await config.ReadAsync()).OsuPath = osuFolder!;