From 67729942a188bd22b23437a39976006918c1b670 Mon Sep 17 00:00:00 2001 From: Terry MacDonald Date: Mon, 22 Nov 2021 22:51:07 +1300 Subject: [PATCH] Working ProcessUtils Finally tested the process launching, and finally managed to get it working! THis has been quite a lot of problems to get right, so pretty happy it's all working. --- DisplayMagician/GameLibraries/EpicGame.cs | 2 +- DisplayMagician/GameLibraries/GOGGame.cs | 2 +- DisplayMagician/GameLibraries/OriginGame.cs | 2 +- DisplayMagician/GameLibraries/SteamGame.cs | 2 +- DisplayMagician/GameLibraries/UplayGame.cs | 2 +- DisplayMagician/Processes/ProcessUtils.cs | 14 +++++++------- DisplayMagician/Properties/AssemblyInfo.cs | 4 ++-- DisplayMagician/ShortcutRepository.cs | 8 ++++---- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/DisplayMagician/GameLibraries/EpicGame.cs b/DisplayMagician/GameLibraries/EpicGame.cs index 74809ce..d2e2041 100644 --- a/DisplayMagician/GameLibraries/EpicGame.cs +++ b/DisplayMagician/GameLibraries/EpicGame.cs @@ -102,7 +102,7 @@ namespace DisplayMagician.GameLibraries { get { - return ProcessUtils.ProcessExited(_epicGameProcessName); + return !ProcessUtils.ProcessExited(_epicGameProcessName); /*int numGameProcesses = 0; _epicGameProcesses = Process.GetProcessesByName(_epicGameProcessName).ToList(); foreach (Process gameProcess in _epicGameProcesses) diff --git a/DisplayMagician/GameLibraries/GOGGame.cs b/DisplayMagician/GameLibraries/GOGGame.cs index 903beec..a5f7a0b 100644 --- a/DisplayMagician/GameLibraries/GOGGame.cs +++ b/DisplayMagician/GameLibraries/GOGGame.cs @@ -102,7 +102,7 @@ namespace DisplayMagician.GameLibraries { get { - return ProcessUtils.ProcessExited(_gogGameProcessName); + return !ProcessUtils.ProcessExited(_gogGameProcessName); /*int numGameProcesses = 0; _gogGameProcesses = Process.GetProcessesByName(_gogGameProcessName).ToList(); foreach (Process gameProcess in _gogGameProcesses) diff --git a/DisplayMagician/GameLibraries/OriginGame.cs b/DisplayMagician/GameLibraries/OriginGame.cs index 34c2ec5..57c8573 100644 --- a/DisplayMagician/GameLibraries/OriginGame.cs +++ b/DisplayMagician/GameLibraries/OriginGame.cs @@ -101,7 +101,7 @@ namespace DisplayMagician.GameLibraries { get { - return ProcessUtils.ProcessExited(_originGameProcessName); + return !ProcessUtils.ProcessExited(_originGameProcessName); /*int numGameProcesses = 0; _originGameProcesses = Process.GetProcessesByName(_originGameProcessName).ToList(); foreach (Process gameProcess in _originGameProcesses) diff --git a/DisplayMagician/GameLibraries/SteamGame.cs b/DisplayMagician/GameLibraries/SteamGame.cs index 2e3c45a..6e1d9c0 100644 --- a/DisplayMagician/GameLibraries/SteamGame.cs +++ b/DisplayMagician/GameLibraries/SteamGame.cs @@ -101,7 +101,7 @@ namespace DisplayMagician.GameLibraries get { //int numGameProcesses = 0; - return ProcessUtils.ProcessExited(_steamGameProcessName); + return !ProcessUtils.ProcessExited(_steamGameProcessName); /*_steamGameProcesses = Process.GetProcessesByName(_steamGameProcessName).ToList(); foreach (Process gameProcess in _steamGameProcesses) { diff --git a/DisplayMagician/GameLibraries/UplayGame.cs b/DisplayMagician/GameLibraries/UplayGame.cs index 23bf4ff..3327726 100644 --- a/DisplayMagician/GameLibraries/UplayGame.cs +++ b/DisplayMagician/GameLibraries/UplayGame.cs @@ -100,7 +100,7 @@ namespace DisplayMagician.GameLibraries { get { - return ProcessUtils.ProcessExited(_uplayGameProcessName); + return !ProcessUtils.ProcessExited(_uplayGameProcessName); /*int numGameProcesses = 0; _uplayGameProcesses = Process.GetProcessesByName(_uplayGameProcessName).ToList(); foreach (Process gameProcess in _uplayGameProcesses) diff --git a/DisplayMagician/Processes/ProcessUtils.cs b/DisplayMagician/Processes/ProcessUtils.cs index 8106140..85e0d62 100644 --- a/DisplayMagician/Processes/ProcessUtils.cs +++ b/DisplayMagician/Processes/ProcessUtils.cs @@ -169,7 +169,7 @@ namespace DisplayMagician.Processes } else { - logger.Trace($"ProcessUtils/ProcessExited: {process.Id} is still running as is has not exited yet."); + //logger.Trace($"ProcessUtils/ProcessExited: {process.Id} is still running as is has not exited yet."); return false; } } @@ -196,12 +196,12 @@ namespace DisplayMagician.Processes if (ProcessExited(wantedProcesses)) { - logger.Trace($"ProcessUtils/ProcessExited4: All processes being monitored have exited, so no processes still running!"); + //logger.Trace($"ProcessUtils/ProcessExited4: All processes being monitored have exited, so no processes still running!"); return true; } else { - logger.Trace($"ProcessUtils/ProcessExited4: At least one process is still running!"); + //logger.Trace($"ProcessUtils/ProcessExited4: At least one process is still running!"); return false; } } @@ -212,12 +212,12 @@ namespace DisplayMagician.Processes if (ProcessExited(process)) { - logger.Trace($"ProcessUtils/ProcessExited3: Process with ID {processId} has exited, so no processes still running!"); + //logger.Trace($"ProcessUtils/ProcessExited3: Process with ID {processId} has exited, so no processes still running!"); return true; } else { - logger.Trace($"ProcessUtils/ProcessExited3: Process with ID {processId} is still running!"); + //logger.Trace($"ProcessUtils/ProcessExited3: Process with ID {processId} is still running!"); return false; } } @@ -234,12 +234,12 @@ namespace DisplayMagician.Processes } if (processClosedCount == processes.Count) { - logger.Trace($"ProcessUtils/ProcessExited2: All processes being monitored have exited, so no processes still running!"); + //logger.Trace($"ProcessUtils/ProcessExited2: All processes being monitored have exited, so no processes still running!"); return true; } else { - logger.Trace($"ProcessUtils/ProcessExited2: {processClosedCount} processes out of {processes.Count} processes have exited. At least one process is still running!"); + //logger.Trace($"ProcessUtils/ProcessExited2: {processClosedCount} processes out of {processes.Count} processes have exited. At least one process is still running!"); return false; } } diff --git a/DisplayMagician/Properties/AssemblyInfo.cs b/DisplayMagician/Properties/AssemblyInfo.cs index 8f9fa3a..c862797 100644 --- a/DisplayMagician/Properties/AssemblyInfo.cs +++ b/DisplayMagician/Properties/AssemblyInfo.cs @@ -26,8 +26,8 @@ using System.Resources; [assembly: Guid("e4ceaf5e-ad01-4695-b179-31168eb74c48")] // Version information -[assembly: AssemblyVersion("2.1.0.308")] -[assembly: AssemblyFileVersion("2.1.0.308")] +[assembly: AssemblyVersion("2.1.0.310")] +[assembly: AssemblyFileVersion("2.1.0.310")] [assembly: NeutralResourcesLanguageAttribute( "en" )] [assembly: CLSCompliant(true)] diff --git a/DisplayMagician/ShortcutRepository.cs b/DisplayMagician/ShortcutRepository.cs index 8e22c9e..021b906 100644 --- a/DisplayMagician/ShortcutRepository.cs +++ b/DisplayMagician/ShortcutRepository.cs @@ -294,7 +294,7 @@ namespace DisplayMagician public static ShortcutItem GetShortcut(string shortcutNameOrUuid) { - logger.Trace($"ShortcutRepository/GetShortcut: Finding and returning {shortcutNameOrUuid} if it exists in our shortcut repository"); + //logger.Trace($"ShortcutRepository/GetShortcut: Finding and returning {shortcutNameOrUuid} if it exists in our shortcut repository"); if (String.IsNullOrWhiteSpace(shortcutNameOrUuid)) { @@ -309,7 +309,7 @@ namespace DisplayMagician { if (testShortcut.UUID.Equals(shortcutNameOrUuid, StringComparison.OrdinalIgnoreCase)) { - logger.Trace($"ShortcutRepository/GetShortcut: Returning shortcut with UUID {shortcutNameOrUuid}"); + //logger.Trace($"ShortcutRepository/GetShortcut: Returning shortcut with UUID {shortcutNameOrUuid}"); return testShortcut; } } @@ -321,14 +321,14 @@ namespace DisplayMagician { if (testShortcut.Name.Equals(shortcutNameOrUuid, StringComparison.OrdinalIgnoreCase)) { - logger.Trace($"ShortcutRepository/GetShortcut: Returning shortcut with Name {shortcutNameOrUuid}"); + //logger.Trace($"ShortcutRepository/GetShortcut: Returning shortcut with Name {shortcutNameOrUuid}"); return testShortcut; } } } - logger.Trace($"ShortcutRepository/GetShortcut: No shortcut was found to return with UUID or Name {shortcutNameOrUuid}"); + logger.Warn($"ShortcutRepository/GetShortcut: No shortcut was found to return with UUID or Name {shortcutNameOrUuid}"); return null; }