Code cleanup

This commit is contained in:
Stone_Red
2026-06-10 00:29:28 +02:00
parent 91e8cbb00a
commit 31e54c1637
11 changed files with 184 additions and 186 deletions
+13 -11
View File
@@ -33,7 +33,7 @@ public static class ProcessManager
InMemoryLogger processLogger = new();
ProxyLogger proxyLogger = new([logger, processLogger]);
processLoggers.TryAdd(id, processLogger);
_ = processLoggers.TryAdd(id, processLogger);
T process = new()
{
@@ -41,7 +41,7 @@ public static class ProcessManager
Logger = proxyLogger
};
processesByType.AddOrUpdate(typeof(T), _ => [id], (_, set) =>
_ = processesByType.AddOrUpdate(typeof(T), _ => [id], (_, set) =>
{
set.Add(id);
return set;
@@ -59,24 +59,26 @@ public static class ProcessManager
}
finally
{
processes.TryRemove(id, out _);
_ = processes.TryRemove(id, out _);
if (processesByType.TryGetValue(typeof(T), out var set))
if (processesByType.TryGetValue(typeof(T), out ConcurrentHashSet<int>? set))
{
set.TryRemove(id);
_ = set.TryRemove(id);
if (set.Count == 0)
processesByType.TryRemove(typeof(T), out _);
{
_ = processesByType.TryRemove(typeof(T), out _);
}
}
WindowManager.CloseWindowsForProcess(id);
logger.Log($"Process {process.Name} (ID: {process.Id}) has stopped.", LogSeverity.Info);
processLoggers.TryRemove(id, out _);
_ = processLoggers.TryRemove(id, out _);
}
});
processes.TryAdd(id, (process, thread));
_ = processes.TryAdd(id, (process, thread));
thread.Start();
logger.Log($"Spawned process {process.Name} of type {typeof(T).Name} with ID {id}.", LogSeverity.Info);
@@ -106,7 +108,7 @@ public static class ProcessManager
entry.Process.RequestStop();
logger.Log($"Waiting for process {entry.Process.Name} (ID: {entry.Process.Id}) to stop.", LogSeverity.Info);
await Task.Run(() => entry.Thread.Join());
await Task.Run(entry.Thread.Join);
}
public static void StopAllProcesses()
@@ -131,12 +133,12 @@ public static class ProcessManager
public static bool IsProcessRunning<T>() where T : Process
{
return processesByType.TryGetValue(typeof(T), out var set) && set.Count > 0;
return processesByType.TryGetValue(typeof(T), out ConcurrentHashSet<int>? set) && set.Count > 0;
}
public static IEnumerable<T> GetProcessesOfType<T>() where T : Process
{
if (processesByType.TryGetValue(typeof(T), out var set))
if (processesByType.TryGetValue(typeof(T), out ConcurrentHashSet<int>? set))
{
foreach (int processId in set)
{
+21 -27
View File
@@ -1,36 +1,30 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using RemSox.Processes;
using RemSox.Processing;
namespace RemSox.Processing
namespace RemSox.Processing;
public static class ProcessManifest
{
public static class ProcessManifest
[Flags]
public enum ProcessManifestFlags
{
[Flags]
public enum ProcessManifestFlags
{
None = 0,
Singleton = 1 << 0,
System = 1 << 1
}
None = 0,
Singleton = 1 << 0,
System = 1 << 1
}
private static readonly Dictionary<Type, ProcessManifestFlags> map = new()
{
{ typeof(DesktopProcess), ProcessManifestFlags.Singleton | ProcessManifestFlags.System },
{ typeof(CliProcess), ProcessManifestFlags.Singleton | ProcessManifestFlags.System }
};
private static readonly Dictionary<Type, ProcessManifestFlags> map = new()
{
{ typeof(DesktopProcess), ProcessManifestFlags.Singleton | ProcessManifestFlags.System },
{ typeof(CliProcess), ProcessManifestFlags.Singleton | ProcessManifestFlags.System }
};
public static bool HasFlag<T>(ProcessManifestFlags flag) where T : Process
{
return map.TryGetValue(typeof(T), out var flags) && flags.HasFlag(flag);
}
public static bool HasFlag<T>(ProcessManifestFlags flag) where T : Process
{
return map.TryGetValue(typeof(T), out ProcessManifestFlags flags) && flags.HasFlag(flag);
}
public static bool HasFlag(Type t, ProcessManifestFlags flag)
{
return map.TryGetValue(t, out var flags) && flags.HasFlag(flag);
}
public static bool HasFlag(Type t, ProcessManifestFlags flag)
{
return map.TryGetValue(t, out ProcessManifestFlags flags) && flags.HasFlag(flag);
}
}