From 9b92cc20f2a365018b349e1aba87fdd74e21f965 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 11 Aug 2014 19:41:11 -0400
Subject: implement removing from playlists

---
 .../Channels/RefreshChannelsScheduledTask.cs                        | 2 +-
 .../EntryPoints/ActivityLogEntryPoint.cs                            | 6 ++++--
 .../Playlists/ManualPlaylistsFolder.cs                              | 4 ++--
 MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs    | 5 +++--
 4 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs b/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
index ee75e4d05..c6ecfc250 100644
--- a/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
@@ -42,7 +42,7 @@ namespace MediaBrowser.Server.Implementations.Channels
         {
             return new ITaskTrigger[] 
             { 
-                new StartupTrigger(),
+                new StartupTrigger{DelayMs = 10000},
 
                 new SystemEventTrigger{ SystemEvent = SystemEvent.WakeFromSleep},
 
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs b/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs
index 0e18fa465..b8290fda7 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs
@@ -195,7 +195,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             {
                 Name = string.Format(_localization.GetLocalizedString("FailedLoginAttemptWithUserName"), e.Argument.Username),
                 Type = "AuthenticationFailed",
-                ShortOverview = string.Format(_localization.GetLocalizedString("LabelIpAddressValue"), e.Argument.RemoteEndPoint)
+                ShortOverview = string.Format(_localization.GetLocalizedString("LabelIpAddressValue"), e.Argument.RemoteEndPoint),
+                Severity = LogSeverity.Error
             });
         }
 
@@ -427,7 +428,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
                     Name = string.Format(_localization.GetLocalizedString("ScheduledTaskFailedWithName"), task.Name),
                     Type = "ScheduledTaskFailed",
                     Overview = string.Join(Environment.NewLine, vals.ToArray()),
-                    ShortOverview = runningTime
+                    ShortOverview = runningTime,
+                    Severity = LogSeverity.Error
                 });
             }
         }
diff --git a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
index a87edde7b..e7e53181c 100644
--- a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
-using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Playlists;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
diff --git a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
index d46177352..3cdea0793 100644
--- a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
@@ -193,13 +193,14 @@ namespace MediaBrowser.Server.Implementations.Playlists
                 throw new ArgumentException("No Playlist exists with the supplied Id");
             }
 
-            var children = playlist.LinkedChildren.ToList();
+            var children = playlist.GetManageableItems().ToList();
 
             var idList = entryIds.ToList();
 
-            var removals = children.Where(i => idList.Contains(i.Id));
+            var removals = children.Where(i => idList.Contains(i.Item1.Id));
 
             playlist.LinkedChildren = children.Except(removals)
+                .Select(i => i.Item1)
                 .ToList();
 
             await playlist.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
-- 
cgit v1.2.3