Fixed: Task progress messages in the UI

(cherry picked from commit c6417337812f3578a27f9dc1e44fdad80f557271)

Closes #9855
This commit is contained in:
Mark McDowall 2024-03-18 16:48:35 -07:00 committed by Bogdan
parent d6dcae3d6a
commit 280083f4d7
7 changed files with 27 additions and 12 deletions

View File

@ -112,7 +112,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 movie if at least 1 indexer was searched.
if (indexers.Any())

View File

@ -5,7 +5,6 @@ namespace NzbDrone.Core.Indexers
public class RssSyncCommand : Command
{
public override bool SendUpdatesToClient => true;
public override bool IsLongRunning => true;
}
}

View File

@ -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;

View File

@ -1,5 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Messaging.Commands;
namespace NzbDrone.Core.Movies.Commands
@ -20,6 +20,10 @@ namespace NzbDrone.Core.Movies.Commands
public override bool SendUpdatesToClient => true;
public override bool UpdateScheduledTask => !CollectionIds.Any();
public override bool UpdateScheduledTask => CollectionIds.Empty();
public override bool IsLongRunning => true;
public override string CompletionMessage => "Completed";
}
}

View File

@ -1,5 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Messaging.Commands;
namespace NzbDrone.Core.Movies.Commands
@ -22,6 +22,10 @@ namespace NzbDrone.Core.Movies.Commands
public override bool SendUpdatesToClient => true;
public override bool UpdateScheduledTask => !MovieIds.Any();
public override bool UpdateScheduledTask => MovieIds.Empty();
public override bool IsLongRunning => true;
public override string CompletionMessage => "Completed";
}
}

View File

@ -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()

View File

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