适配器错误处理

Miaoyww · Jul 24, 2024 · aa39649 · aa39649
1 parent 7985b8b
commit aa39649
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 16 deletions.
diff --git a/NonsPlayer.Core/Services/AdapterService.cs b/NonsPlayer.Core/Services/AdapterService.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System.Diagnostics;
+using System.Reflection;
 using NonsPlayer.Core.Contracts.Adapters;
 using NonsPlayer.Core.Contracts.Services;
 using NonsPlayer.Core.Models;
@@ -12,7 +13,8 @@ public class AdapterService
     private Dictionary<string, IAdapter> _disabledAdapters = new();
     private List<string> _disabledAdaptersStrings = new();
     public static AdapterService Instance { get; } = new();
-
+    public delegate void AdapterEventHandler(string name);
+    public event AdapterEventHandler? AdapterLoadFailed;
 
     public void Init()
     {
@@ -28,14 +30,24 @@ public void LoadAdapters(string directory)
 
         foreach (var file in dllFiles)
         {
-            var (name, assembly) = LoadSingleAdapter(file);
-            if (_disabledAdaptersStrings.Contains(assembly.GetMetadata().Platform))
+
+            try
             {
-                _disabledAdapters.Add(name, assembly);
-                continue;
-            }
+                var (name, assembly) = LoadSingleAdapter(file);
+                if (name == null) continue;
+                if (assembly == null) continue;
+
+                if (_disabledAdaptersStrings.Contains(assembly.GetMetadata().Platform))
+                {
+                    _disabledAdapters.Add(name, assembly);
+                    continue;
+                }
 
-            _adapters.Add(name, assembly);
+                _adapters.Add(name, assembly);
+            }
+            catch(NullReferenceException ex)
+            {
+            }
         }
     }
 
@@ -53,7 +65,7 @@ public bool DisableAdapter(AdapterMetadata metadata)
         return DisableAdapter(metadata.Platform);
     }
 
-    public Tuple<string, IAdapter>? LoadSingleAdapter(string file)
+    public Tuple<string?, IAdapter?>? LoadSingleAdapter(string file)
     {
         try
         {
@@ -67,13 +79,14 @@ public bool DisableAdapter(AdapterMetadata metadata)
                     return new Tuple<string, IAdapter>(adapter.GetMetadata().Name, adapter);
                 }
             }
+            AdapterLoadFailed?.Invoke(file);
+            return new Tuple<string?, IAdapter?>(null, null);
 
-            return null;
         }
         catch (Exception ex)
         {
-            ExceptionService.Instance.Throw(ex, $"Error loading plugin from '{file}': {ex.Message}");
-            return null;
+            AdapterLoadFailed?.Invoke(file);
+            return new Tuple<string?, IAdapter?>(null, null);
         }
     }
 

diff --git a/NonsPlayer/App.xaml.cs b/NonsPlayer/App.xaml.cs
@@ -50,6 +50,7 @@ public App()
                 services.AddSingleton<IActivationService, ActivationService>();
                 services.AddSingleton<IPageService, PageService>();
                 services.AddSingleton<INavigationService, NavigationService>();
+                services.AddSingleton<IFileService, FileService>();
                 services.AddSingleton<VersionService>();
                 services.AddSingleton<UpdateService>();
                 services.AddSingleton<UpdateClient>();
@@ -59,9 +60,6 @@ public App()
                 services.AddSingleton<SMTCService>();
                 services.AddSingleton<RadioService>();
 
-                // Core Services
-                services.AddSingleton<IFileService, FileService>();
-
                 #region Views and ViewModels
 
                 services.AddTransient<PlaylistDetailViewModel>();
@@ -116,7 +114,7 @@ public App()
                 services.AddTransient<RecentlyPlayItemCardViewModel>();
                 services.AddTransient<RecommendedPlaylistCardViewModel>();
                 services.AddTransient<RadioCardViewModel>();
-
+                services.AddTransient<LoginCardViewModel>();
                 #endregion
 
 
@@ -131,12 +129,18 @@ public App()
 
         GetService<IAppNotificationService>().Initialize();
         ConfigManager.Instance.LoadConfig();
+        AdapterService.Instance.AdapterLoadFailed += OnAdapterLoadFailed;
         AdapterService.Instance.Init();
         UnhandledException += App_UnhandledException;
         GetService<PlayCounterService>().Init();
         GetService<SMTCService>().Init();
     }
 
+    private void OnAdapterLoadFailed(string name)
+    {
+        ExceptionService.Instance.Throw($"Failed load adapter: {name}");
+    }
+
     // The .NET Generic Host provides dependency injection, configuration, logging, and other services.
     // https://docs.microsoft.com/dotnet/core/extensions/generic-host
     // https://docs.microsoft.com/dotnet/core/extensions/dependency-injection