From 32d800c18227277a767dd72c066dc1710ab50de5 Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Wed, 8 Jan 2025 14:44:23 +0000 Subject: [PATCH] tidy --- .../DicomAnonymiser/Anonymisers/SmiCtpAnonymiser.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/SmiServices/Microservices/DicomAnonymiser/Anonymisers/SmiCtpAnonymiser.cs b/src/SmiServices/Microservices/DicomAnonymiser/Anonymisers/SmiCtpAnonymiser.cs index 5d2f66d36..4ef70607a 100644 --- a/src/SmiServices/Microservices/DicomAnonymiser/Anonymisers/SmiCtpAnonymiser.cs +++ b/src/SmiServices/Microservices/DicomAnonymiser/Anonymisers/SmiCtpAnonymiser.cs @@ -56,7 +56,7 @@ public SmiCtpAnonymiser(GlobalOptions globalOptions) throw new Exception($"Did not receive READY before timeout"); } - void OnCtpOutputDataReceived(object process, DataReceivedEventArgs args) + void OnCtpOutputDataReceived(object _, DataReceivedEventArgs args) { _logger.Debug($"[ctp-anon-cli stdout] {args.Data}"); if ("READY" != args.Data) return; @@ -70,16 +70,19 @@ void OnCtpOutputDataReceived(object process, DataReceivedEventArgs args) public ExtractedFileStatus Anonymise(IFileInfo sourceFile, IFileInfo destFile, string modality, out string? anonymiserStatusMessage) { var args = $"{sourceFile.FullName} {destFile.FullName}"; - _logger.Debug($"[ctp-anon-cli stdin ] {args}"); - ExtractedFileStatus status; string? result = null; _ctpProcess.OutputDataReceived += CtpProcessOnOutputDataReceived; + + _logger.Debug($"[ctp-anon-cli stdin ] {args}"); _ctpProcess.StandardInput.WriteLine(args); + lock (args) Monitor.Wait(args); + _ctpProcess.OutputDataReceived -= CtpProcessOnOutputDataReceived; + ExtractedFileStatus status; if (result == "OK") { anonymiserStatusMessage = null; @@ -93,7 +96,7 @@ public ExtractedFileStatus Anonymise(IFileInfo sourceFile, IFileInfo destFile, s return status; - void CtpProcessOnOutputDataReceived(object sender, DataReceivedEventArgs e) + void CtpProcessOnOutputDataReceived(object _, DataReceivedEventArgs e) { result = e.Data; lock (args)