Workspace

src/10-Core/Wtq.Core/Configuration/AttachMode.cs

@@ -0,0 +1,32 @@
+namespace Wtq.Core.Configuration;
+
+/// <summary>
+/// How WTQ should try to attach to a process.
+/// </summary>
+public enum AttachMode
+{
+	/// <summary>
+	/// Used to detect serialization issues.
+	/// </summary>
+	None = 0,
+
+	/// <summary>
+	/// Always create a new process.
+	/// </summary>
+	Start,
+
+	/// <summary>
+	/// Only look for existing process.
+	/// </summary>
+	Find,
+
+	/// <summary>
+	/// Look for existing process, create one of one does not exist yet.
+	/// </summary>
+	FindOrStart,
+
+	/// <summary>
+	/// Attach to the foreground process when pressing the assigned hot key.
+	/// </summary>
+	Manual,
+}

src/10-Core/Wtq.Core/Configuration/HotkeyOptions.cs

@@ -2,7 +2,7 @@
 
 namespace Wtq.Core.Configuration;
 
-public class HotkeyOptions
+public class HotKeyOptions
 {
 	public WtqKeys Key { get; set; }
 

src/10-Core/Wtq.Core/Configuration/WtqAppOptions.cs

@@ -4,18 +4,20 @@ namespace Wtq.Core.Configuration;
 
 public class WtqAppOptions
 {
+	public AttachMode? AttachMode { get; set; }
+
 	// TODO: Use dict key?
 	public string Name { get; set; }
 
-	public IEnumerable<HotkeyOptions> Hotkeys { get; set; } = Array.Empty<HotkeyOptions>();
+	public IEnumerable<HotKeyOptions> HotKeys { get; set; } = [];
 
 	[NotNull]
 	[Required]
-	public FindProcessOptions? FindExisting { get; set; }
+	public string? FileName { get; set; }
 
-	[NotNull]
-	[Required]
-	public CreateProcessOptions? StartNew { get; set; }
+	public string? ProcessName { get; set; }
+
+	public string? Arguments { get; set; }
 
 	/// <summary>
 	/// <para>If "PreferMonitor" is set to "AtIndex", this setting determines what monitor to choose.</para>
@@ -30,13 +32,78 @@ public class WtqAppOptions
 	/// </summary>
 	public PreferMonitor? PreferMonitor { get; set; }
 
-	public bool HasHotkey(WtqKeys key, WtqKeyModifiers modifiers)
+	public bool Filter(Process process, bool isStartedByWtq)
+	{
+		ArgumentNullException.ThrowIfNull(process);
+
+		if (process.MainWindowHandle == nint.Zero)
+		{
+			return false;
+		}
+
+		// TODO: Make some notes about webbrowsers being a pain with starting a new process.
+		try
+		{
+			if (process.MainModule == null)
+			{
+				return false;
+			}
+
+			if (process.MainWindowHandle == nint.Zero)
+			{
+				return false;
+			}
+
+			// TODO: Handle extensions either or not being there.
+			var fn1 = Path.GetFileNameWithoutExtension(ProcessName ?? FileName);
+			var fn2 = Path.GetFileNameWithoutExtension(process.MainModule.FileName);
+
+			if (fn2.Contains("windowsterminal", StringComparison.OrdinalIgnoreCase))
+			{
+				var dbg = 2;
+			}
+
+			if (!fn1.Equals(fn2, StringComparison.OrdinalIgnoreCase))
+			{
+				return false;
+			}
+
+			if (isStartedByWtq)
+			{
+				if (!process.StartInfo.Environment.TryGetValue("WTQ_START", out var val))
+				{
+					return false;
+				}
+
+				if (string.IsNullOrWhiteSpace(val))
+				{
+					return false;
+				}
+
+				if (!val.Equals(Name, StringComparison.OrdinalIgnoreCase))
+				{
+					return false;
+				}
+			}
+
+			return true;
+		}
+		catch
+		{
+			// TODO: Remove try/catch, use safe property access methods on "Process" instead.
+		}
+
+		return false;
+	}
+
+	public bool HasHotKey(WtqKeys key, WtqKeyModifiers modifiers)
 	{
-		return Hotkeys.Any(hk => hk.Key == key && hk.Modifiers == modifiers);
+		return HotKeys.Any(hk => hk.Key == key && hk.Modifiers == modifiers);
 	}
 
 	public override string ToString()
 	{
-		return FindExisting?.ProcessName ?? StartNew?.FileName ?? "<unknown>";
+		//return FindExisting?.ProcessName ?? StartNew?.FileName ?? "<unknown>";
+		return Name;
 	}
 }

src/10-Core/Wtq.Core/Configuration/WtqOptions.cs

@@ -5,8 +5,10 @@ public sealed class WtqOptions
 	[Required]
 	public IEnumerable<WtqAppOptions> Apps { get; set; } = [];
 
+	public AttachMode AttachMode { get; set; } = AttachMode.FindOrStart;
+
 	[Required]
-	public IEnumerable<HotkeyOptions> Hotkeys { get; set; } = [];
+	public IEnumerable<HotKeyOptions> HotKeys { get; set; } = [];
 
 	/// <summary>
 	/// <para>Gets or sets if "PreferMonitor" is set to "AtIndex", this setting determines what monitor to choose.</para>

src/10-Core/Wtq.Core/Data/HotkeyInfo.cs

@@ -1,6 +1,6 @@
 namespace Wtq.Core.Data;
 
-public sealed class HotkeyInfo
+public sealed class HotKeyInfo
 {
 	public WtqKeys Key { get; set; }
 

src/10-Core/Wtq.Core/Data/WtqActionType.cs

@@ -4,7 +4,7 @@ public enum WtqActionType
 {
 	ToggleApp,
 
-	HotkeyPressed,
+	HotKeyPressed,
 
-	RegisterHotkeys,
+	RegisterHotKeys,
 }

src/10-Core/Wtq.Core/Data/WtqRect.cs

@@ -60,4 +60,6 @@ public override readonly int GetHashCode()
 	{
 		return HashCode.Combine(Height, Width, X, Y);
 	}
+
+	public override readonly string ToString() => $"X:{X}, Y:{Y}, Width:{Width}, Height:{Height}";
 }

src/10-Core/Wtq.Core/Events/WtqHotkeyPressedEvent.cs

@@ -4,7 +4,7 @@
 
 namespace Wtq.Core.Events;
 
-public sealed class WtqHotkeyPressedEvent : IWtqEvent
+public sealed class WtqHotKeyPressedEvent : IWtqEvent
 {
 	public WtqKeys Key { get; set; }
 

src/10-Core/Wtq.Core/Events/WtqRegisterHotkeyEvent.cs

@@ -4,7 +4,7 @@
 
 namespace Wtq.Core.Events;
 
-public sealed class WtqRegisterHotkeyEvent : IWtqEvent
+public sealed class WtqRegisterHotKeyEvent : IWtqEvent
 {
 	public WtqActionType ActionType { get; set; }
 

src/10-Core/Wtq.Core/GlobalUsings.cs

@@ -6,6 +6,8 @@
 global using System.ComponentModel.DataAnnotations;
 global using System.Diagnostics;
 global using System.Diagnostics.CodeAnalysis;
+global using System.IO;
 global using System.Linq;
+global using System.Threading;
 global using System.Threading.Tasks;
 global using Wtq.Utils;

src/10-Core/Wtq.Core/Services/IWtqAppFactory.cs

@@ -0,0 +1,8 @@
+using Wtq.Core.Configuration;
+
+namespace Wtq.Services;
+
+public interface IWtqAppFactory
+{
+	WtqApp Create(WtqAppOptions app);
+}

src/10-Core/Wtq.Core/Services/IWtqAppRepo.cs

@@ -3,7 +3,7 @@
 
 namespace Wtq.Core.Services;
 
-public interface IWtqAppRepo : IDisposable
+public interface IWtqAppRepo : IAsyncDisposable
 {
 	IReadOnlyCollection<WtqApp> Apps { get; }
 

src/10-Core/Wtq.Core/Services/IWtqBus.cs

@@ -4,5 +4,8 @@ public interface IWtqBus
 {
 	void On(Func<IWtqEvent, bool> predicate, Func<IWtqEvent, Task> onEvent);
 
+	void On<TEvent>(Func<TEvent, Task> onEvent)
+		where TEvent : IWtqEvent;
+
 	void Publish(IWtqEvent eventType);
 }

src/10-Core/Wtq.Core/Services/IWtqHotkeyService.cs

@@ -1,6 +1,6 @@
 namespace Wtq.Core.Service;
 
-public interface IWtqHotkeyService
+public interface IWtqHotKeyService
 {
-	// void OnHotkey(Func<HotkeyInfo, Task> onHotkey);
+	// void OnHotKey(Func<HotKeyInfo, Task> onHotKey);
 }