fixed some notification issues
This commit is contained in:
parent
a1caa789fe
commit
555e62fd17
|
@ -24,29 +24,41 @@ namespace NzbDrone.Core.Providers
|
|||
{
|
||||
get
|
||||
{
|
||||
|
||||
var activeNotification = _progressNotification.Values.Where(p => p.Status == ProgressNotificationStatus.InProgress).ToList();
|
||||
lock (_lock)
|
||||
{
|
||||
var activeNotification =
|
||||
_progressNotification.Values.Where(p => p.Status == ProgressNotificationStatus.InProgress).
|
||||
ToList();
|
||||
|
||||
if (activeNotification.Count == 0)
|
||||
{
|
||||
//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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void Register(ProgressNotification notification)
|
||||
{
|
||||
lock (_lock)
|
||||
{
|
||||
_progressNotification.Add(notification.Id, notification);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void Register(BasicNotification notification)
|
||||
{
|
||||
lock (_lock)
|
||||
{
|
||||
_basicNotifications.Add(notification.Id, notification);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void Dismiss(Guid notificationId)
|
||||
{
|
||||
|
|
|
@ -52,13 +52,11 @@ namespace NzbDrone.Web.Controllers
|
|||
[HttpGet]
|
||||
public JsonResult Comet(string message)
|
||||
{
|
||||
var requestTimer = Stopwatch.StartNew();
|
||||
|
||||
MiniProfiler.Stop(true);
|
||||
|
||||
var currentMessage = GetCurrentMessage();
|
||||
|
||||
while (message == currentMessage && requestTimer.Elapsed.TotalSeconds < 10)
|
||||
while (message == currentMessage)
|
||||
{
|
||||
Thread.Sleep(250);
|
||||
currentMessage = GetCurrentMessage();
|
||||
|
|
|
@ -42,9 +42,11 @@
|
|||
|
||||
function closeMsg() {
|
||||
//hide the message
|
||||
if (isShown) {
|
||||
$('#msgBox').hide("slide", { direction: "right" }, speed);
|
||||
isShown = false;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue