mirror of
https://github.com/Radarr/Radarr
synced 2024-12-27 02:09:59 +00:00
fixed some notification issues
This commit is contained in:
parent
a1caa789fe
commit
555e62fd17
3 changed files with 28 additions and 16 deletions
|
@ -24,29 +24,41 @@ public virtual List<ProgressNotification> ProgressNotifications
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
|
lock (_lock)
|
||||||
var activeNotification = _progressNotification.Values.Where(p => p.Status == ProgressNotificationStatus.InProgress).ToList();
|
{
|
||||||
|
var activeNotification =
|
||||||
|
_progressNotification.Values.Where(p => p.Status == ProgressNotificationStatus.InProgress).
|
||||||
|
ToList();
|
||||||
|
|
||||||
if (activeNotification.Count == 0)
|
if (activeNotification.Count == 0)
|
||||||
{
|
{
|
||||||
//Get notifications that were recently done
|
//Get notifications that were recently done
|
||||||
activeNotification = _progressNotification.Values.Where(p => p.CompletedTime >= DateTime.Now.AddSeconds(-3)).OrderByDescending(c => c.CompletedTime).ToList();
|
activeNotification =
|
||||||
|
_progressNotification.Values.Where(p => p.CompletedTime >= DateTime.Now.AddSeconds(-3)).
|
||||||
|
OrderByDescending(c => c.CompletedTime).ToList();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return activeNotification.ToList();
|
return activeNotification.ToList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public virtual void Register(ProgressNotification notification)
|
public virtual void Register(ProgressNotification notification)
|
||||||
|
{
|
||||||
|
lock (_lock)
|
||||||
{
|
{
|
||||||
_progressNotification.Add(notification.Id, notification);
|
_progressNotification.Add(notification.Id, notification);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public virtual void Register(BasicNotification notification)
|
public virtual void Register(BasicNotification notification)
|
||||||
|
{
|
||||||
|
lock (_lock)
|
||||||
{
|
{
|
||||||
_basicNotifications.Add(notification.Id, notification);
|
_basicNotifications.Add(notification.Id, notification);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public virtual void Dismiss(Guid notificationId)
|
public virtual void Dismiss(Guid notificationId)
|
||||||
{
|
{
|
||||||
|
|
|
@ -52,13 +52,11 @@ public JsonResult Index()
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
public JsonResult Comet(string message)
|
public JsonResult Comet(string message)
|
||||||
{
|
{
|
||||||
var requestTimer = Stopwatch.StartNew();
|
|
||||||
|
|
||||||
MiniProfiler.Stop(true);
|
MiniProfiler.Stop(true);
|
||||||
|
|
||||||
var currentMessage = GetCurrentMessage();
|
var currentMessage = GetCurrentMessage();
|
||||||
|
|
||||||
while (message == currentMessage && requestTimer.Elapsed.TotalSeconds < 10)
|
while (message == currentMessage)
|
||||||
{
|
{
|
||||||
Thread.Sleep(250);
|
Thread.Sleep(250);
|
||||||
currentMessage = GetCurrentMessage();
|
currentMessage = GetCurrentMessage();
|
||||||
|
|
|
@ -42,9 +42,11 @@
|
||||||
|
|
||||||
function closeMsg() {
|
function closeMsg() {
|
||||||
//hide the message
|
//hide the message
|
||||||
|
if (isShown) {
|
||||||
$('#msgBox').hide("slide", { direction: "right" }, speed);
|
$('#msgBox').hide("slide", { direction: "right" }, speed);
|
||||||
isShown = false;
|
isShown = false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue