mirror of
https://github.com/Radarr/Radarr.git
synced 2024-10-05 15:47:20 +02:00
Fixed: Task progress messages in the UI
(cherry picked from commit c6417337812f3578a27f9dc1e44fdad80f557271) Closes #9855
This commit is contained in:
parent
d6dcae3d6a
commit
280083f4d7
@ -112,7 +112,7 @@ private async Task<List<DownloadDecision>> Dispatch(Func<IIndexer, Task<IList<Re
|
|||||||
|
|
||||||
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} 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.
|
// Update the last search time for movie if at least 1 indexer was searched.
|
||||||
if (indexers.Any())
|
if (indexers.Any())
|
||||||
|
@ -5,7 +5,6 @@ namespace NzbDrone.Core.Indexers
|
|||||||
public class RssSyncCommand : Command
|
public class RssSyncCommand : Command
|
||||||
{
|
{
|
||||||
public override bool SendUpdatesToClient => true;
|
public override bool SendUpdatesToClient => true;
|
||||||
|
|
||||||
public override bool IsLongRunning => true;
|
public override bool IsLongRunning => true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,7 @@ public virtual bool SendUpdatesToClient
|
|||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using NzbDrone.Common.Extensions;
|
||||||
using NzbDrone.Core.Messaging.Commands;
|
using NzbDrone.Core.Messaging.Commands;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Movies.Commands
|
namespace NzbDrone.Core.Movies.Commands
|
||||||
@ -20,6 +20,10 @@ public RefreshCollectionsCommand(List<int> collectionIds)
|
|||||||
|
|
||||||
public override bool SendUpdatesToClient => true;
|
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";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using NzbDrone.Common.Extensions;
|
||||||
using NzbDrone.Core.Messaging.Commands;
|
using NzbDrone.Core.Messaging.Commands;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Movies.Commands
|
namespace NzbDrone.Core.Movies.Commands
|
||||||
@ -22,6 +22,10 @@ public RefreshMovieCommand(List<int> movieIds, bool isNewMovie = false)
|
|||||||
|
|
||||||
public override bool SendUpdatesToClient => true;
|
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";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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 @@ public static class ProgressMessageContext
|
|||||||
|
|
||||||
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()
|
||||||
|
@ -6,7 +6,5 @@ public class ApplicationUpdateCommand : Command
|
|||||||
{
|
{
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user