fix

XTsat · Jun 8, 2022 · 0bbc561 · 0bbc561
1 parent dcebb03
commit 0bbc561
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/references/ArchiSteamFarm b/references/ArchiSteamFarm
diff --git a/src/ST.Client/ServiceCollectionExtensions.cs b/src/ST.Client/ServiceCollectionExtensions.cs
@@ -1,4 +1,5 @@
 using ArchiSteamFarm;
+using ArchiSteamFarm.Library;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using System.Application;
 using System.Application.Entities;

diff --git a/src/ST.Client/Services/Implementation/ArchiSteamFarmServiceImpl.cs b/src/ST.Client/Services/Implementation/ArchiSteamFarmServiceImpl.cs
@@ -7,6 +7,7 @@
 using ArchiSteamFarm.Steam.Storage;
 using ArchiSteamFarm.Storage;
 using Microsoft.Extensions.Configuration;
+using NLog;
 using ReactiveUI;
 using System.Application.UI;
 using System.Application.UI.Resx;
@@ -17,13 +18,19 @@
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
+using MSEXLog = Microsoft.Extensions.Logging;
 
 namespace System.Application.Services.Implementation
 {
-    public partial class ArchiSteamFarmServiceImpl : ReactiveObject, IArchiSteamFarmService
+    public partial class ArchiSteamFarmServiceImpl : ReactiveObject, IArchiSteamFarmService, IIoc
     {
         const string TAG = "ArchiSteamFarmS";
 
+        public ArchiSteamFarmServiceImpl()
+        {
+            ArchiSteamFarmLibrary.Init(this, IOPath.AppDataDirectory, IApplication.LogDirPathASF);
+        }
+
         public event Action<string>? OnConsoleWirteLine;
 
         public TaskCompletionSource<string>? ReadLineTask { get; set; }
@@ -42,16 +49,9 @@ public bool IsReadPasswordLine
 
         private bool isFirstStart = true;
 
-        sealed class Ioc : IIoc
-        {
-            private Ioc() { }
-
-            public static Ioc Instance { get; } = new();
+        T IIoc.GetRequiredService<T>() where T : class => DI.Get<T>();
 
-            public T GetRequiredService<T>() where T : class => DI.Get<T>();
-
-            public T? GetService<T>() where T : class => DI.Get_Nullable<T>();
-        }
+        T? IIoc.GetService<T>() where T : class => DI.Get_Nullable<T>();
 
         public async Task<bool> Start(string[]? args = null)
         {
@@ -63,8 +63,6 @@ public async Task<bool> Start(string[]? args = null)
                 {
                     //IArchiSteamFarmService.InitCoreLoggers?.Invoke();
 
-                    ArchiSteamFarmLibrary.Init(Ioc.Instance, IOPath.AppDataDirectory, IApplication.LogDirPathASF);
-
                     InitHistoryLogger();
 
                     ArchiSteamFarm.NLog.Logging.GetUserInputFunc = async (bool isPassword) =>
@@ -126,6 +124,8 @@ async Task IArchiSteamFarmHelperService.Restart()
             Toast.Show(AppResources.ASF_Restarted, ToastLength.Short);
         }
 
+        MSEXLog.LogLevel IArchiSteamFarmHelperService.MinimumLevel => IApplication.LoggerMinLevel;
+
         private void InitHistoryLogger()
         {
             ArchiSteamFarm.NLog.Logging.InitHistoryLogger();

diff --git a/src/Startup.cs b/src/Startup.cs
@@ -49,7 +49,7 @@
 using ReactiveUI;
 using System.Reactive;
 #endif
-#if !MAUI
+#if !MAUI && !__MOBILE__
 using AvaloniaApplication = Avalonia.Application;
 #endif
 #if __ANDROID__ && !MAUI