🎨 asf 路径修改启动问题修复

BeyondDimension · Nov 15, 2023 · a7572ec · a7572ec
1 parent d433d60
commit a7572ec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/...TS.Client.Plugins.ArchiSteamFarmPlus/Services.Implementation/ArchiSteamFarmServiceImpl.cs b/...TS.Client.Plugins.ArchiSteamFarmPlus/Services.Implementation/ArchiSteamFarmServiceImpl.cs
@@ -120,9 +120,12 @@ private async Task<bool> StartProcess()
                 options.ArgumentList.Add(EncryptionKey);
             }
             ASFProcess = Process.Start(options);
+
+            ASFService.Current.ConsoleLogText = string.Empty;
             ThreadPool.QueueUserWorkItem(ReadOutPutData);
             AppDomain.CurrentDomain.ProcessExit += ExitHandler;
             AppDomain.CurrentDomain.UnhandledException += ExitHandler;
+
             ASFProcess!.ErrorDataReceived += new DataReceivedEventHandler(ExitHandler);
             ASFProcess.BeginErrorReadLine();
             while (!SocketHelper.IsUsePort(CurrentIPCPortValue))
@@ -227,11 +230,12 @@ private async void ReadOutPutData(object? obj)
         {
             int readResult;
             char ch;
-            var len = string.Empty;
             StringBuilder sb = new();
+            var len = string.Empty;
+
             while (true)
             {
-                Task<int> readAsync = Task.Run(sr.Read);
+                var readAsync = Task.Run(sr.Read);
 
                 await Task.WhenAny(readAsync, Task.Delay(TimeSpan.FromSeconds(3)));
 
@@ -287,7 +291,7 @@ public async Task StopAsync()
         ReadLineTask?.TrySetResult("");
         if (ASFProcess != null)
         {
-            await webApiService.ASF.Exit();
+            await Task.WhenAny(webApiService.ASF.Exit(), Task.Delay(TimeSpan.FromSeconds(3)));
             ASFProcess.Kill();
             ASFProcess.Dispose();
             ASFProcess = null;
@@ -407,9 +411,7 @@ public int CurrentIPCPortValue
         {
             if (_currentIpcPortValue == default)
             {
-                _currentIpcPortValue = ASFSettings.IPCPortId.Value != default(int)
-                    ? ASFSettings.IPCPortId.Value
-                    : ASFSettings.DefaultIPCPortIdValue;
+                _currentIpcPortValue = ASFSettings.IPCPortId.Value;
 
                 if (ASFSettings.IPCPortOccupiedRandom.Value)
                 {

diff --git a/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/Services/Mvvm/ASFService.cs b/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/Services/Mvvm/ASFService.cs
@@ -110,6 +110,7 @@ public async Task InitASFCoreAsync(bool showToast)
         if (!isOk)
         {
             if (showToast) Toast.Show(ToastIcon.Error, AppResources.ASF_Stoped, ToastLength.Short);
+            IsASFRunOrStoping = false;
             return;
         }
 

diff --git a/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/_/ArchiSteamFarm/SharedInfo.cs b/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/_/ArchiSteamFarm/SharedInfo.cs
@@ -13,16 +13,16 @@ internal static string DirCreateByNotExists(string dirPath)
         return dirPath;
     }
 
-    private static string _ASFExecuteFilePath = ASFSettings.ArchiSteamFarmExePath.Value ?? string.Empty;
+    private static string ASFSettingsExecuteFilePath { get { return ASFSettings.ArchiSteamFarmExePath.Value ?? string.Empty; } }
 
     internal static string ASFExecuteFilePath
     {
         get
         {
-            if (!string.IsNullOrEmpty(_ASFExecuteFilePath) && File.Exists(_ASFExecuteFilePath))
+            if (!string.IsNullOrEmpty(ASFSettingsExecuteFilePath) && File.Exists(ASFSettingsExecuteFilePath))
             {
-                Version = new Version(FileVersionInfo.GetVersionInfo(_ASFExecuteFilePath)?.FileVersion ?? string.Empty);
-                return _ASFExecuteFilePath;
+                Version = new Version(FileVersionInfo.GetVersionInfo(ASFSettingsExecuteFilePath)?.FileVersion ?? string.Empty);
+                return ASFSettingsExecuteFilePath;
             }
             return string.Empty;
         }
@@ -32,7 +32,7 @@ internal static string HomeDirectory
     {
         get
         {
-            return Path.GetDirectoryName(_ASFExecuteFilePath);
+            return Path.GetDirectoryName(ASFSettingsExecuteFilePath) ?? string.Empty;
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,6 +110,7 @@ public async Task InitASFCoreAsync(bool showToast) @@
             if (!isOk)
             {
                 if (showToast) Toast.Show(ToastIcon.Error, AppResources.ASF_Stoped, ToastLength.Short);
+                IsASFRunOrStoping = false;
                 return;
             }
@@ Expand Down @@