From e730cf6307f5c50c36c38f537d970ee3b7df96aa Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Mon, 18 Mar 2024 16:48:35 -0700
Subject: [PATCH] Fixed: Task progress messages in the UI

(cherry picked from commit c6417337812f3578a27f9dc1e44fdad80f557271)

Closes #4689
---
 .../IndexerSearch/ReleaseSearchService.cs        |  2 +-
 src/NzbDrone.Core/Indexers/RssSyncCommand.cs     |  1 -
 src/NzbDrone.Core/Messaging/Commands/Command.cs  |  2 +-
 .../Music/Commands/RefreshAlbumCommand.cs        |  2 ++
 .../Music/Commands/RefreshArtistCommand.cs       |  2 ++
 .../ProgressMessaging/ProgressMessageContext.cs  | 16 +++++++++++++---
 .../Update/Commands/ApplicationUpdateCommand.cs  |  2 --
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs b/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs
index 89b71f62e..f8da27d52 100644
--- a/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs
+++ b/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs
@@ -137,7 +137,7 @@ namespace NzbDrone.Core.IndexerSearch
 
             var reports = batch.SelectMany(x => x).ToList();
 
-            _logger.Debug("Total of {0} reports were found for {1} from {2} indexers", reports.Count, criteriaBase, indexers.Count);
+            _logger.ProgressDebug("Total of {0} reports were found for {1} from {2} indexers", reports.Count, criteriaBase, indexers.Count);
 
             // Update the last search time for all albums if at least 1 indexer was searched.
             if (indexers.Any())
diff --git a/src/NzbDrone.Core/Indexers/RssSyncCommand.cs b/src/NzbDrone.Core/Indexers/RssSyncCommand.cs
index 519e61f01..8f3ed36ac 100644
--- a/src/NzbDrone.Core/Indexers/RssSyncCommand.cs
+++ b/src/NzbDrone.Core/Indexers/RssSyncCommand.cs
@@ -5,7 +5,6 @@ namespace NzbDrone.Core.Indexers
     public class RssSyncCommand : Command
     {
         public override bool SendUpdatesToClient => true;
-
         public override bool IsLongRunning => true;
     }
 }
diff --git a/src/NzbDrone.Core/Messaging/Commands/Command.cs b/src/NzbDrone.Core/Messaging/Commands/Command.cs
index 057c8d4c4..972b6df7f 100644
--- a/src/NzbDrone.Core/Messaging/Commands/Command.cs
+++ b/src/NzbDrone.Core/Messaging/Commands/Command.cs
@@ -23,7 +23,7 @@ namespace NzbDrone.Core.Messaging.Commands
         }
 
         public virtual bool UpdateScheduledTask => true;
-        public virtual string CompletionMessage => "Completed";
+        public virtual string CompletionMessage => null;
         public virtual bool RequiresDiskAccess => false;
         public virtual bool IsExclusive => false;
         public virtual bool IsTypeExclusive => false;
diff --git a/src/NzbDrone.Core/Music/Commands/RefreshAlbumCommand.cs b/src/NzbDrone.Core/Music/Commands/RefreshAlbumCommand.cs
index 58004c3b6..6d8fc5b0a 100644
--- a/src/NzbDrone.Core/Music/Commands/RefreshAlbumCommand.cs
+++ b/src/NzbDrone.Core/Music/Commands/RefreshAlbumCommand.cs
@@ -20,5 +20,7 @@ namespace NzbDrone.Core.Music.Commands
         public override bool SendUpdatesToClient => true;
 
         public override bool UpdateScheduledTask => !AlbumId.HasValue;
+
+        public override string CompletionMessage => "Completed";
     }
 }
diff --git a/src/NzbDrone.Core/Music/Commands/RefreshArtistCommand.cs b/src/NzbDrone.Core/Music/Commands/RefreshArtistCommand.cs
index 56eb1debf..0cbdcfeb4 100644
--- a/src/NzbDrone.Core/Music/Commands/RefreshArtistCommand.cs
+++ b/src/NzbDrone.Core/Music/Commands/RefreshArtistCommand.cs
@@ -39,5 +39,7 @@ namespace NzbDrone.Core.Music.Commands
         public override bool UpdateScheduledTask => ArtistIds.Empty();
 
         public override bool IsLongRunning => true;
+
+        public override string CompletionMessage => "Completed";
     }
 }
diff --git a/src/NzbDrone.Core/ProgressMessaging/ProgressMessageContext.cs b/src/NzbDrone.Core/ProgressMessaging/ProgressMessageContext.cs
index fba9ca3f3..09fecee2c 100644
--- a/src/NzbDrone.Core/ProgressMessaging/ProgressMessageContext.cs
+++ b/src/NzbDrone.Core/ProgressMessaging/ProgressMessageContext.cs
@@ -1,10 +1,13 @@
-using System;
+using System;
+using System.Threading;
 using NzbDrone.Core.Messaging.Commands;
 
 namespace NzbDrone.Core.ProgressMessaging
 {
     public static class ProgressMessageContext
     {
+        private static AsyncLocal<CommandModel> _commandModelAsync = new AsyncLocal<CommandModel>();
+
         [ThreadStatic]
         private static CommandModel _commandModel;
 
@@ -13,8 +16,15 @@ namespace NzbDrone.Core.ProgressMessaging
 
         public static CommandModel CommandModel
         {
-            get { return _commandModel; }
-            set { _commandModel = value; }
+            get
+            {
+                return _commandModel ?? _commandModelAsync.Value;
+            }
+            set
+            {
+                _commandModel = value;
+                _commandModelAsync.Value = value;
+            }
         }
 
         public static bool LockReentrancy()
diff --git a/src/NzbDrone.Core/Update/Commands/ApplicationUpdateCommand.cs b/src/NzbDrone.Core/Update/Commands/ApplicationUpdateCommand.cs
index 0ca1d8074..59a827a0b 100644
--- a/src/NzbDrone.Core/Update/Commands/ApplicationUpdateCommand.cs
+++ b/src/NzbDrone.Core/Update/Commands/ApplicationUpdateCommand.cs
@@ -6,7 +6,5 @@ namespace NzbDrone.Core.Update.Commands
     {
         public override bool SendUpdatesToClient => true;
         public override bool IsExclusive => true;
-
-        public override string CompletionMessage => null;
     }
 }