Fixed: Task progress messages in the UI

(cherry picked from commit c6417337812f3578a27f9dc1e44fdad80f557271)
This commit is contained in:
Mark McDowall
2024-03-18 16:48:35 -07:00
committed by Bogdan
parent 02e420580e
commit 2cacfba81f
5 changed files with 16 additions and 8 deletions

View File

@@ -13,6 +13,6 @@ namespace NzbDrone.Core.Applications
public override bool SendUpdatesToClient => true; public override bool SendUpdatesToClient => true;
public override string CompletionMessage => null; public override string CompletionMessage => "Completed";
} }
} }

View File

@@ -196,7 +196,7 @@ namespace NzbDrone.Core.IndexerSearch
var reports = batch.SelectMany(x => x).ToList(); var reports = batch.SelectMany(x => x).ToList();
_logger.Debug("Total of {0} reports were found for {1} from {2} indexer(s)", reports.Count, criteriaBase, indexers.Count); _logger.ProgressDebug("Total of {0} reports were found for {1} from {2} indexer(s)", reports.Count, criteriaBase, indexers.Count);
return reports; return reports;
} }

View File

@@ -23,7 +23,7 @@ namespace NzbDrone.Core.Messaging.Commands
} }
public virtual bool UpdateScheduledTask => true; public virtual bool UpdateScheduledTask => true;
public virtual string CompletionMessage => "Completed"; public virtual string CompletionMessage => null;
public virtual bool RequiresDiskAccess => false; public virtual bool RequiresDiskAccess => false;
public virtual bool IsExclusive => false; public virtual bool IsExclusive => false;
public virtual bool IsTypeExclusive => false; public virtual bool IsTypeExclusive => false;

View File

@@ -1,10 +1,13 @@
using System; using System;
using System.Threading;
using NzbDrone.Core.Messaging.Commands; using NzbDrone.Core.Messaging.Commands;
namespace NzbDrone.Core.ProgressMessaging namespace NzbDrone.Core.ProgressMessaging
{ {
public static class ProgressMessageContext public static class ProgressMessageContext
{ {
private static AsyncLocal<CommandModel> _commandModelAsync = new AsyncLocal<CommandModel>();
[ThreadStatic] [ThreadStatic]
private static CommandModel _commandModel; private static CommandModel _commandModel;
@@ -13,8 +16,15 @@ namespace NzbDrone.Core.ProgressMessaging
public static CommandModel CommandModel public static CommandModel CommandModel
{ {
get { return _commandModel; } get
set { _commandModel = value; } {
return _commandModel ?? _commandModelAsync.Value;
}
set
{
_commandModel = value;
_commandModelAsync.Value = value;
}
} }
public static bool LockReentrancy() public static bool LockReentrancy()

View File

@@ -6,7 +6,5 @@ namespace NzbDrone.Core.Update.Commands
{ {
public override bool SendUpdatesToClient => true; public override bool SendUpdatesToClient => true;
public override bool IsExclusive => true; public override bool IsExclusive => true;
public override string CompletionMessage => null;
} }
} }