dave/multiboxer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(DD2Switcher): simplify sequence index handling and settings loading

Browse Source
This commit is contained in:
PhatPhuckDave
2025-08-31 21:43:04 +02:00
parent 274a75b93d
commit 0b7aaa2f99
2 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
DD2Switcher/Program.cs
View File

@@ -48,25 +48,21 @@ namespace DD2Switcher {
public static void StartSequenceMode() {
Console.WriteLine($"StartSequenceMode called. FirstIndex: {FirstIndex}, LastIndex: {LastIndex}");
// Compute default indices if not set by user
if (FirstIndex == -1 || LastIndex == -1) {
FirstIndex = FindFirstNonNullWindow();
LastIndex = FindLastNonNullWindow();
Console.WriteLine($"Computed default indices: FirstIndex={FirstIndex}, LastIndex={LastIndex}");
// Compute indices only when sequence starts, not stored permanently
int sequenceFirstIndex = FirstIndex;
int sequenceLastIndex = LastIndex;
// Ensure LastIndex is different from FirstIndex if there are multiple windows
if (FirstIndex != -1 && LastIndex != -1 && FirstIndex == LastIndex) {
int nextWindow = FindNextNonNullWindow(FirstIndex + 1);
if (nextWindow != -1) {
LastIndex = nextWindow;
Console.WriteLine($"Adjusted LastIndex to: {LastIndex} (different from FirstIndex)");
}
}
// If no user indices, use absolute first and last windows
if (sequenceFirstIndex == -1 || sequenceLastIndex == -1) {
sequenceFirstIndex = FindFirstNonNullWindow();
sequenceLastIndex = FindLastNonNullWindow();
Console.WriteLine(
$"Computed sequence indices: FirstIndex={sequenceFirstIndex}, LastIndex={sequenceLastIndex}");
}
if (FirstIndex >= 0 && LastIndex >= 0 && FirstIndex <= LastIndex) {
if (sequenceFirstIndex >= 0 && sequenceLastIndex >= 0 && sequenceFirstIndex <= sequenceLastIndex) {
CurrentState = SequenceState.PROCESSING;
CurrentSequenceIndex = FirstIndex;
CurrentSequenceIndex = sequenceFirstIndex;
Console.WriteLine($"Starting sequence mode, tabbing to index {CurrentSequenceIndex + 1}");
TabTo(CurrentSequenceIndex + 1); // Tab to first window
CurrentState = SequenceState.WAITING;
@@ -77,18 +73,22 @@ namespace DD2Switcher {
}
public static void NextSequenceStep() {
Console.WriteLine(
$"NextSequenceStep called. State: {CurrentState}, CurrentIndex: {CurrentSequenceIndex}, LastIndex: {LastIndex}");
Console.WriteLine($"NextSequenceStep called. State: {CurrentState}, CurrentIndex: {CurrentSequenceIndex}");
if (CurrentState == SequenceState.INACTIVE)
return;
CurrentState = SequenceState.PROCESSING;
CurrentSequenceIndex++;
Console.WriteLine($"Advanced to index {CurrentSequenceIndex}");
if (CurrentSequenceIndex > LastIndex) {
// Get the actual last index for this sequence (computed or user-set)
int sequenceLastIndex = (LastIndex != -1) ? LastIndex : FindLastNonNullWindow();
if (CurrentSequenceIndex > sequenceLastIndex) {
// End of sequence - tab back to first
int sequenceFirstIndex = (FirstIndex != -1) ? FirstIndex : FindFirstNonNullWindow();
Console.WriteLine("End of sequence reached, tabbing back to first window");
TabTo(FirstIndex + 1);
TabTo(sequenceFirstIndex + 1);
ExitSequenceMode();
} else {
Console.WriteLine($"Tabbing to index {CurrentSequenceIndex + 1}");
@@ -116,11 +116,11 @@ namespace DD2Switcher {
string json = File.ReadAllText(settingsPath);
Console.WriteLine($"Read JSON: {json}");
var settings = JsonSerializer.Deserialize<Settings>(json);
FirstIndex = settings.FirstIndex;
LastIndex = settings.LastIndex;
// DO NOT load FirstIndex and LastIndex - they should be set by user only
// FirstIndex = settings.FirstIndex;
// LastIndex = settings.LastIndex;
SequenceKeybind = settings.SequenceKeybind;
Console.WriteLine(
$"Loaded settings: First={FirstIndex}, Last={LastIndex}, Keybind={SequenceKeybind}");
Console.WriteLine($"Loaded settings: Keybind={SequenceKeybind} (First/Last indices NOT loaded)");
} else {
Console.WriteLine($"Settings file does not exist at: {settingsPath}");
Console.WriteLine("Using default settings");