morozovsa/autodesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: execute automation commands in AutoCAD command context

Browse Source
This commit is contained in:
codex
2026-08-04 09:37:24 +03:00
parent 1fa25809de
commit bc481d4378
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plant3D2026/P_Rec_Annot/src/PRecAnnot.Plant3D2026/FirstLimitedApplyAutomation.cs
+21 -14
View File
@@ -264,23 +264,30 @@ internal sealed class FirstLimitedApplyAutomationCoordinator
catch (System.Exception ex) { FailFromCallback("ContextVerification", ex, "AUTOMATION_CONTEXT_FAILED"); }
}
private void Queue(string command)
{
if (IsTerminal || document is null) return;
transitions.Add("CommandQueued:" + command);
document.SendStringToExecute(command + "\n", true, true, false);
}
private void Queue(string command) => _ = DispatchCommandAsync(command, false);
private void QueueReadinessBarrier()
{
if (IsTerminal || document is null) return;
var active = AcadApplication.DocumentManager.MdiActiveDocument;
if (active is null || !string.Equals(active.Name, document.Name, StringComparison.OrdinalIgnoreCase))
{
Complete(false, "AUTOMATION_READINESS_DOCUMENT_NOT_ACTIVE");
return;
_ = DispatchCommandAsync("PHP_REC_AUTOMATION_READY", true);
}
transitions.Add("ReadinessBarrierQueued");
document.SendStringToExecute("PHP_REC_AUTOMATION_READY\n", true, false, false);
private async Task DispatchCommandAsync(string command, bool readiness)
{
if (IsTerminal || document is null) return;
var expected = document;
transitions.Add(readiness ? "ReadinessCommandDispatchRequested" : "CommandDispatchRequested:" + command);
try
{
await AcadApplication.DocumentManager.ExecuteInCommandContextAsync(async _ =>
{
transitions.Add("CommandContextEntered:" + command);
var active = AcadApplication.DocumentManager.MdiActiveDocument;
if (active is null || !string.Equals(active.Name, expected.Name, StringComparison.OrdinalIgnoreCase))
throw new InvalidOperationException("AUTOMATION_COMMAND_DOCUMENT_NOT_ACTIVE");
transitions.Add(readiness ? "ReadinessBarrierQueued" : "CommandQueued:" + command);
await active.Editor.CommandAsync(command);
transitions.Add("CommandInvocationReturned:" + command);
}, null);
}
catch (System.Exception exception) { FailFromCallback("CommandDispatcher", exception, "AUTOMATION_COMMAND_CONTEXT_FAILED"); }
}
private void OnCommandEnded(object sender, CommandEventArgs e)
{
Plant3D2026/P_Rec_Annot/tests/PRecAnnot.Core.Tests/FoundationTests.cs
+6 -5
View File
@@ -113,11 +113,12 @@ public sealed class FoundationTests
[Fact] public void QueueReadinessBarrier_RequiresActiveFixtureAndUsesSafeDispatch()
{
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
var barrier = source[source.IndexOf("private void QueueReadinessBarrier", StringComparison.Ordinal)..source.IndexOf("private void OnCommandEnded", StringComparison.Ordinal)];
Assert.Contains("MdiActiveDocument", barrier);
Assert.Contains("AUTOMATION_READINESS_DOCUMENT_NOT_ACTIVE", barrier);
Assert.Contains("PHP_REC_AUTOMATION_READY\\n\", true, false, false", barrier);
Assert.True(barrier.IndexOf("AUTOMATION_READINESS_DOCUMENT_NOT_ACTIVE", StringComparison.Ordinal) < barrier.IndexOf("SendStringToExecute", StringComparison.Ordinal));
var dispatcher = source[source.IndexOf("private async Task DispatchCommandAsync", StringComparison.Ordinal)..source.IndexOf("private void OnCommandEnded", StringComparison.Ordinal)];
Assert.Contains("ExecuteInCommandContextAsync", dispatcher);
Assert.Contains("MdiActiveDocument", dispatcher);
Assert.Contains("AUTOMATION_COMMAND_DOCUMENT_NOT_ACTIVE", dispatcher);
Assert.Contains("Editor.CommandAsync", dispatcher);
Assert.DoesNotContain("SendStringToExecute", dispatcher);
}
[Fact] public void AutomationControlledExit_QueuesNativeQuitAfterPublicCommand()