Skip to content

Commit

Permalink
Fixed: Task progress messages in the UI
Browse files Browse the repository at this point in the history
(cherry picked from commit c6417337812f3578a27f9dc1e44fdad80f557271)
  • Loading branch information
markus101 authored and mynameisbogdan committed Mar 22, 2024
1 parent 02e4205 commit 2cacfba
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
Expand Up @@ -13,6 +13,6 @@ public ApplicationIndexerSyncCommand()

public override bool SendUpdatesToClient => true;

public override string CompletionMessage => null;
public override string CompletionMessage => "Completed";
}
}
2 changes: 1 addition & 1 deletion src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs
Expand Up @@ -196,7 +196,7 @@ private async Task<IList<ReleaseInfo>> Dispatch(Func<IIndexer, Task<IndexerPagea

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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/NzbDrone.Core/Messaging/Commands/Command.cs
Expand Up @@ -23,7 +23,7 @@ public virtual bool SendUpdatesToClient
}

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;
Expand Down
16 changes: 13 additions & 3 deletions 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;

Expand All @@ -13,8 +16,15 @@ public static class ProgressMessageContext

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()
Expand Down
2 changes: 0 additions & 2 deletions src/NzbDrone.Core/Update/Commands/ApplicationUpdateCommand.cs
Expand Up @@ -6,7 +6,5 @@ public class ApplicationUpdateCommand : Command
{
public override bool SendUpdatesToClient => true;
public override bool IsExclusive => true;

public override string CompletionMessage => null;
}
}

0 comments on commit 2cacfba

Please sign in to comment.