mirror/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2024-12-26 01:38:24 +00:00
Code Issues Releases Wiki Activity

fixed some notification issues

Browse source
This commit is contained in:
kay.one 2011-07-02 10:41:10 -07:00
parent a1caa789fe
commit 555e62fd17
3 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
NzbDrone.Core/Providers/NotificationProvider.cs
View file

@ -24,28 +24,40 @@ public virtual List<ProgressNotification> ProgressNotifications
{
get
{
var activeNotification = _progressNotification.Values.Where(p => p.Status == ProgressNotificationStatus.InProgress).ToList();
if (activeNotification.Count == 0)
lock (_lock)
{
//Get notifications that were recently done
activeNotification = _progressNotification.Values.Where(p => p.CompletedTime >= DateTime.Now.AddSeconds(-3)).OrderByDescending(c => c.CompletedTime).ToList();
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();
}
return activeNotification.ToList();
}
return activeNotification.ToList();
}
}
public virtual void Register(ProgressNotification notification)
{
_progressNotification.Add(notification.Id, notification);
lock (_lock)
{
_progressNotification.Add(notification.Id, notification);
}
}
public virtual void Register(BasicNotification notification)
{
_basicNotifications.Add(notification.Id, notification);
lock (_lock)
{
_basicNotifications.Add(notification.Id, notification);
}
}
public virtual void Dismiss(Guid notificationId)

4
NzbDrone.Web/Controllers/NotificationController.cs
View file

@ -52,13 +52,11 @@ public JsonResult Index()
[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();

8
NzbDrone.Web/Scripts/Notification.js
View file

@ -41,9 +41,11 @@
}
function closeMsg() {
//hide the message
$('#msgBox').hide("slide", { direction: "right" }, speed);
isShown = false;
//hide the message
if (isShown) {
$('#msgBox').hide("slide", { direction: "right" }, speed);
isShown = false;
}
}
});