ckaczor/ProcessCpuUsageStatusWindow
1
0
Fork 0
mirror of https://github.com/ckaczor/ProcessCpuUsageStatusWindow.git synced 2026-01-13 17:23:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle when Process V2 isn't available

Browse Source
This commit is contained in:
Chris Kaczor
2023-04-03 08:23:20 -04:00
parent ebd9dc607b
commit eebd23f702
3 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Options/GeneralOptionsPanel.xaml.cs
View File

@@ -5,9 +5,13 @@ namespace ProcessCpuUsageStatusWindow.Options
{ {
public partial class GeneralOptionsPanel public partial class GeneralOptionsPanel
{ {
public GeneralOptionsPanel() private bool IsV2 { get; }
public GeneralOptionsPanel(bool isV2)
{ {
InitializeComponent(); InitializeComponent();
IsV2 = isV2;
} }
public override void LoadPanel(object data) public override void LoadPanel(object data)
@@ -19,6 +23,8 @@ namespace ProcessCpuUsageStatusWindow.Options
StartWithWindows.IsChecked = settings.AutoStart; StartWithWindows.IsChecked = settings.AutoStart;
NumberOfProcesses.Text = settings.ProcessCount.ToString(); NumberOfProcesses.Text = settings.ProcessCount.ToString();
ShowProcessId.IsChecked = settings.ShowProcessId; ShowProcessId.IsChecked = settings.ShowProcessId;
ShowProcessId.Visibility = IsV2 ? Visibility.Visible : Visibility.Collapsed;
} }
public override bool ValidatePanel() public override bool ValidatePanel()

5
ProcessCpuUsageWatcher.cs
View File

@@ -28,6 +28,8 @@ namespace ProcessCpuUsageStatusWindow
public Dictionary<string, ProcessCpuUsage> CurrentProcessList; public Dictionary<string, ProcessCpuUsage> CurrentProcessList;
public bool IsV2 => _processCategory.CategoryName == "Process V2";
#endregion #endregion
#region Initialize and terminate #region Initialize and terminate
@@ -40,7 +42,8 @@ namespace ProcessCpuUsageStatusWindow
CurrentProcessList = new Dictionary<string, ProcessCpuUsage>(); CurrentProcessList = new Dictionary<string, ProcessCpuUsage>();
// Get the category for process performance info // Get the category for process performance info
_processCategory = PerformanceCounterCategory.GetCategories().FirstOrDefault(category => category.CategoryName == "Process V2"); _processCategory = PerformanceCounterCategory.GetCategories().FirstOrDefault(category => category.CategoryName == "Process V2") ??
PerformanceCounterCategory.GetCategories().FirstOrDefault(category => category.CategoryName == "Process");
if (_processCategory == null) if (_processCategory == null)
return; return;

28
WindowSource.cs
View File

@@ -62,7 +62,7 @@ namespace ProcessCpuUsageStatusWindow
{ {
var panels = new List<CategoryPanel> var panels = new List<CategoryPanel>
{ {
new GeneralOptionsPanel(), new GeneralOptionsPanel(_processCpuUsageWatcher.IsV2),
new AboutOptionsPanel() new AboutOptionsPanel()
}; };
@@ -114,7 +114,8 @@ namespace ProcessCpuUsageStatusWindow
private static class PredefinedProcessName private static class PredefinedProcessName
{ {
public const string Total = "_Total"; public const string Total = "_Total";
public const string Idle = "Idle:0"; public const string Idle = "Idle";
public const string IdleWithProcessId = "Idle:0";
} }
private void UpdateDisplay(Dictionary<string, ProcessCpuUsage> currentProcessList) private void UpdateDisplay(Dictionary<string, ProcessCpuUsage> currentProcessList)
@@ -123,7 +124,7 @@ namespace ProcessCpuUsageStatusWindow
var validProcessList = (currentProcessList.Values.Where( var validProcessList = (currentProcessList.Values.Where(
process => process =>
process.UsageValid && process.ProcessName != PredefinedProcessName.Total && process.UsageValid && process.ProcessName != PredefinedProcessName.Total &&
process.ProcessName != PredefinedProcessName.Idle)).ToList(); process.ProcessName != (_processCpuUsageWatcher.IsV2 ? PredefinedProcessName.IdleWithProcessId : PredefinedProcessName.Idle))).ToList();
// Calculate the total usage by adding up all the processes we know about // Calculate the total usage by adding up all the processes we know about
var totalUsage = validProcessList.Sum(process => process.PercentUsage); var totalUsage = validProcessList.Sum(process => process.PercentUsage);
@@ -149,13 +150,24 @@ namespace ProcessCpuUsageStatusWindow
if (stringBuilder.Length != 0) if (stringBuilder.Length != 0)
stringBuilder.AppendLine(); stringBuilder.AppendLine();
var colonPosition = processCpuUsage.ProcessName.LastIndexOf(':'); if (_processCpuUsageWatcher.IsV2)
{
// Split the process name from the process ID
var colonPosition = processCpuUsage.ProcessName.LastIndexOf(':');
var processName = colonPosition == -1 ? processCpuUsage.ProcessName : processCpuUsage.ProcessName.Substring(0, colonPosition); var processName = processCpuUsage.ProcessName.Substring(0, colonPosition);
var processId = colonPosition == -1 ? string.Empty : processCpuUsage.ProcessName.Substring(colonPosition + 1); var processId = processCpuUsage.ProcessName.Substring(colonPosition + 1);
// Format the process information into a string to display var formatString = Settings.Default.ShowProcessId ? Resources.ProcessLineWithProcessId : Resources.ProcessLine;
stringBuilder.AppendFormat(Settings.Default.ShowProcessId ? Resources.ProcessLineWithProcessId : Resources.ProcessLine, processName, processCpuUsage.PercentUsage, processId);
// Format the process information into a string to display
stringBuilder.AppendFormat(formatString, processName, processCpuUsage.PercentUsage, processId);
}
else
{
// Format the process information into a string to display
stringBuilder.AppendFormat(Resources.ProcessLine, processCpuUsage.ProcessName, processCpuUsage.PercentUsage);
}
} }
// Add the footer line (if any) // Add the footer line (if any)