Safe Shutdown Steam

rmbadmin · rmbadmin · commit ba2d6888f8f5 · 2022-06-12T20:50:11.000+08:00
diff --git a/src/ST.Client.CommandLine/CommandLineHost.cs b/src/ST.Client.CommandLine/CommandLineHost.cs
@@ -163,7 +163,7 @@ void MainHandlerByCLT_(Action? onInitStartuped)
         // -clt steam -account
         var steamuser = new Command("steam", "Steam 相关操作");
         steamuser.AddOption(new Option<string>("-account", "指定对应 Steam 用户名"));
-        steamuser.Handler = CommandHandler.Create((string account) =>
+        steamuser.Handler = CommandHandler.Create(async (string account) =>
         {
             if (!string.IsNullOrEmpty(account))
             {
@@ -182,7 +182,7 @@ void MainHandlerByCLT_(Action? onInitStartuped)
                     steamService.SetCurrentUser(account);
                 }
 
-                steamService.TryKillSteamProcess();
+                await steamService.ShutdownSteam();
                 steamService.StartSteam();
             }
         });
diff --git a/src/ST.Client.Desktop.Windows/Services/Implementation/SteamServiceImpl.cs b/src/ST.Client.Desktop.Windows/Services/Implementation/SteamServiceImpl.cs
@@ -131,14 +131,22 @@ public bool TryKillSteamProcess()
             }
         }
 
-        public int? GetSteamProcessPid()
+        public int GetSteamProcessPid()
         {
             var processes = Process.GetProcessesByName(steamProcess[0]);
             if (processes.Any_Nullable())
                 return processes.First().Id;
             return default;
         }
 
+        private Process? GetSteamProcess()
+        {
+            var processes = Process.GetProcessesByName(steamProcess[0]);
+            if (processes.Any_Nullable())
+                return processes.First();
+            return null;
+        }
+
         public void StartSteam(string? arguments = null)
         {
             if (!string.IsNullOrWhiteSpace(SteamProgramPath) && File.Exists(SteamProgramPath))
@@ -156,6 +164,19 @@ public void StartSteam(string? arguments = null)
             }
         }
 
+        public async Task ShutdownSteam()
+        {
+            if (!string.IsNullOrWhiteSpace(SteamProgramPath) && File.Exists(SteamProgramPath))
+            {
+                var steamP = GetSteamProcess();
+                if (steamP != null)
+                {
+                    Process2.Start(SteamProgramPath, "-shutdown", useShellExecute: true);
+                    await steamP.WaitForExitAsync();
+                }
+            }
+        }
+
         public string GetLastLoginUserName() => platformService.GetLastSteamLoginUserName();
 
         public List<SteamUser> GetRememberUserList()
diff --git a/src/ST.Client/Services/ISteamService.cs b/src/ST.Client/Services/ISteamService.cs
@@ -46,14 +46,19 @@ public interface ISteamService
         /// Steam 进程是否正在运行，如果正在运行，返回进程PID提示用户去任务管理器中结束进程
         /// </summary>
         /// <returns></returns>
-        int? GetSteamProcessPid();
+        int GetSteamProcessPid();
 
         /// <summary>
         /// 启动 Steam
         /// </summary>
         /// <param name="arguments"></param>
         void StartSteam(string? arguments = null);
 
+        /// <summary>
+        /// 退出 Steam
+        /// </summary>
+        Task ShutdownSteam();
+
         /// <summary>
         /// 获取最后一次自动登录 Steam 用户名称
         /// </summary>
diff --git a/src/ST.Client/UI/ViewModels/Pages/SteamAccountPageViewModel.cs b/src/ST.Client/UI/ViewModels/Pages/SteamAccountPageViewModel.cs
@@ -126,7 +126,7 @@ public void OfflineModeButton_Click(SteamUser user)
             ReStartSteamByUser(user);
         }
 
-        private void ReStartSteamByUser(SteamUser? user = null)
+        private async void ReStartSteamByUser(SteamUser? user = null)
         {
             foreach (var item in SteamUsers.Where(x => x.MostRecent))
                 item.MostRecent = false;
@@ -142,7 +142,7 @@ private void ReStartSteamByUser(SteamUser? user = null)
                 steamService.SetCurrentUser(string.Empty);
             }
 
-            steamService.TryKillSteamProcess();
+            await steamService.ShutdownSteam();
             steamService.StartSteam(SteamSettings.SteamStratParameter.Value);
         }
 
diff --git a/src/ST.Client/UI/ViewModels/Windows/GameListPage/SaveEditedAppInfoWindowViewModel.cs b/src/ST.Client/UI/ViewModels/Windows/GameListPage/SaveEditedAppInfoWindowViewModel.cs
@@ -51,7 +51,7 @@ public async Task SaveSteamEditedApps()
             {
                 if (await MessageBox.ShowAsync(AppResources.SaveEditedAppInfo_RestartSteamTip, ThisAssembly.AssemblyTrademark, MessageBox.Button.OKCancel) == MessageBox.Result.OK)
                 {
-                    ISteamService.Instance.TryKillSteamProcess();
+                    await ISteamService.Instance.ShutdownSteam();
                     ISteamService.Instance.StartSteam();
                 }
                 Toast.Show(AppResources.SaveEditedAppInfo_SaveToSteamSuccess);
diff --git a/src/ST.Client/UI/ViewModels/Windows/SteamAccountPage/ShareManageViewModel.cs b/src/ST.Client/UI/ViewModels/Windows/SteamAccountPage/ShareManageViewModel.cs
@@ -198,7 +198,7 @@ public async void SetActivity_Click()
             var result = await MessageBox.ShowAsync(AppResources.AccountChange_RestartSteam, button: MessageBox.Button.OKCancel);
             if (result.IsOK())
             {
-                steamService.TryKillSteamProcess();
+                await steamService.ShutdownSteam();
                 steamService.StartSteam();
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ void MainHandlerByCLT_(Action? onInitStartuped)`
`163`	`163`	`// -clt steam -account`
`164`	`164`	`var steamuser = new Command("steam", "Steam 相关操作");`
`165`	`165`	`steamuser.AddOption(new Option<string>("-account", "指定对应 Steam 用户名"));`
`166`		`- steamuser.Handler = CommandHandler.Create((string account) =>`
	`166`	`+ steamuser.Handler = CommandHandler.Create(async (string account) =>`
`167`	`167`	`{`
`168`	`168`	`if (!string.IsNullOrEmpty(account))`
`169`	`169`	`{`
`@@ -182,7 +182,7 @@ void MainHandlerByCLT_(Action? onInitStartuped)`
`182`	`182`	`steamService.SetCurrentUser(account);`
`183`	`183`	`}`
`184`	`184`
`185`		`- steamService.TryKillSteamProcess();`
	`185`	`+ await steamService.ShutdownSteam();`
`186`	`186`	`steamService.StartSteam();`
`187`	`187`	`}`
`188`	`188`	`});`
Original file line number	Diff line number	Diff line change
`@@ -131,14 +131,22 @@ public bool TryKillSteamProcess()`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`134`		`- public int? GetSteamProcessPid()`
	`134`	`+ public int GetSteamProcessPid()`
`135`	`135`	`{`
`136`	`136`	`var processes = Process.GetProcessesByName(steamProcess[0]);`
`137`	`137`	`if (processes.Any_Nullable())`
`138`	`138`	`return processes.First().Id;`
`139`	`139`	`return default;`
`140`	`140`	`}`
`141`	`141`
	`142`	`+ private Process? GetSteamProcess()`
	`143`	`+ {`
	`144`	`+ var processes = Process.GetProcessesByName(steamProcess[0]);`
	`145`	`+ if (processes.Any_Nullable())`
	`146`	`+ return processes.First();`
	`147`	`+ return null;`
	`148`	`+ }`
	`149`	`+`
`142`	`150`	`public void StartSteam(string? arguments = null)`
`143`	`151`	`{`
`144`	`152`	`if (!string.IsNullOrWhiteSpace(SteamProgramPath) && File.Exists(SteamProgramPath))`
`@@ -156,6 +164,19 @@ public void StartSteam(string? arguments = null)`
`156`	`164`	`}`
`157`	`165`	`}`
`158`	`166`
	`167`	`+ public async Task ShutdownSteam()`
	`168`	`+ {`
	`169`	`+ if (!string.IsNullOrWhiteSpace(SteamProgramPath) && File.Exists(SteamProgramPath))`
	`170`	`+ {`
	`171`	`+ var steamP = GetSteamProcess();`
	`172`	`+ if (steamP != null)`
	`173`	`+ {`
	`174`	`+ Process2.Start(SteamProgramPath, "-shutdown", useShellExecute: true);`
	`175`	`+ await steamP.WaitForExitAsync();`
	`176`	`+ }`
	`177`	`+ }`
	`178`	`+ }`
	`179`	`+`
`159`	`180`	`public string GetLastLoginUserName() => platformService.GetLastSteamLoginUserName();`
`160`	`181`
`161`	`182`	`public List<SteamUser> GetRememberUserList()`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public void OfflineModeButton_Click(SteamUser user)`
`126`	`126`	`ReStartSteamByUser(user);`
`127`	`127`	`}`
`128`	`128`
`129`		`- private void ReStartSteamByUser(SteamUser? user = null)`
	`129`	`+ private async void ReStartSteamByUser(SteamUser? user = null)`
`130`	`130`	`{`
`131`	`131`	`foreach (var item in SteamUsers.Where(x => x.MostRecent))`
`132`	`132`	`item.MostRecent = false;`
`@@ -142,7 +142,7 @@ private void ReStartSteamByUser(SteamUser? user = null)`
`142`	`142`	`steamService.SetCurrentUser(string.Empty);`
`143`	`143`	`}`
`144`	`144`
`145`		`- steamService.TryKillSteamProcess();`
	`145`	`+ await steamService.ShutdownSteam();`
`146`	`146`	`steamService.StartSteam(SteamSettings.SteamStratParameter.Value);`
`147`	`147`	`}`
`148`	`148`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public async Task SaveSteamEditedApps()`
`51`	`51`	`{`
`52`	`52`	`if (await MessageBox.ShowAsync(AppResources.SaveEditedAppInfo_RestartSteamTip, ThisAssembly.AssemblyTrademark, MessageBox.Button.OKCancel) == MessageBox.Result.OK)`
`53`	`53`	`{`
`54`		`- ISteamService.Instance.TryKillSteamProcess();`
	`54`	`+ await ISteamService.Instance.ShutdownSteam();`
`55`	`55`	`ISteamService.Instance.StartSteam();`
`56`	`56`	`}`
`57`	`57`	`Toast.Show(AppResources.SaveEditedAppInfo_SaveToSteamSuccess);`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public async void SetActivity_Click()`
`198`	`198`	`var result = await MessageBox.ShowAsync(AppResources.AccountChange_RestartSteam, button: MessageBox.Button.OKCancel);`
`199`	`199`	`if (result.IsOK())`
`200`	`200`	`{`
`201`		`- steamService.TryKillSteamProcess();`
	`201`	`+ await steamService.ShutdownSteam();`
`202`	`202`	`steamService.StartSteam();`
`203`	`203`	`}`
`204`	`204`	`}`