From e3c5968db577d10e4053290fb65dcc4010f7a2ad Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 12 Jan 2017 14:50:38 -0500 Subject: add + button to song lists --- Emby.Server.Implementations/Data/SqliteItemRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index 79bc55d5d..5809d84fd 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -372,7 +372,7 @@ namespace Emby.Server.Implementations.Data userDataRepo.Initialize(WriteLock, _connection); - _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(15)); + _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(30)); } private void OnShrinkMemoryTimerCallback(object state) -- cgit v1.2.3 From 4104bc4716c9ddc525cab9957cc68910919e7240 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 13 Jan 2017 02:26:22 -0500 Subject: fix recent activity episode titles --- .../Activity/ActivityLogEntryPoint.cs | 8 ++------ .../Notifications/Notifications.cs | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs index 11fd3a872..d3b2ef7ef 100644 --- a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs +++ b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs @@ -138,7 +138,7 @@ namespace Emby.Server.Implementations.Activity CreateLogEntry(new ActivityLogEntry { - Name = string.Format(_localization.GetLocalizedString("UserStoppedPlayingItemWithValues"), user.Name, item.Name), + Name = string.Format(_localization.GetLocalizedString("UserStoppedPlayingItemWithValues"), user.Name, Notifications.Notifications.GetItemName(item)), Type = "PlaybackStopped", ShortOverview = string.Format(_localization.GetLocalizedString("AppDeviceValues"), e.ClientName, e.DeviceName), UserId = user.Id.ToString("N") @@ -170,7 +170,7 @@ namespace Emby.Server.Implementations.Activity CreateLogEntry(new ActivityLogEntry { - Name = string.Format(_localization.GetLocalizedString("UserStartedPlayingItemWithValues"), user.Name, item.Name), + Name = string.Format(_localization.GetLocalizedString("UserStartedPlayingItemWithValues"), user.Name, Notifications.Notifications.GetItemName(item)), Type = "PlaybackStart", ShortOverview = string.Format(_localization.GetLocalizedString("AppDeviceValues"), e.ClientName, e.DeviceName), UserId = user.Id.ToString("N") @@ -235,10 +235,6 @@ namespace Emby.Server.Implementations.Activity }); } - void _logManager_LoggerLoaded(object sender, EventArgs e) - { - } - void _config_NamedConfigurationUpdated(object sender, ConfigurationUpdateEventArgs e) { CreateLogEntry(new ActivityLogEntry diff --git a/Emby.Server.Implementations/Notifications/Notifications.cs b/Emby.Server.Implementations/Notifications/Notifications.cs index 2d441c18c..8f24dfe1a 100644 --- a/Emby.Server.Implementations/Notifications/Notifications.cs +++ b/Emby.Server.Implementations/Notifications/Notifications.cs @@ -430,6 +430,23 @@ namespace Emby.Server.Implementations.Notifications return name; } + public static string GetItemName(BaseItemInfo item) + { + var name = item.Name; + + if (!string.IsNullOrWhiteSpace(item.SeriesName)) + { + name = item.SeriesName + " - " + name; + } + + if (item.Artists != null && item.Artists.Count > 0) + { + name = item.Artists[0] + " - " + name; + } + + return name; + } + async void _userManager_UserCreated(object sender, GenericEventArgs e) { var notification = new NotificationRequest -- cgit v1.2.3