improve shortcut performance

1 files changed, 20 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 5e6b02e08..95a68c009 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Localization;
-using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Model.Entities;
 using System;
@@ -1140,12 +1139,30 @@ namespace MediaBrowser.Controller.Entities
                 throw new ArgumentException("Encountered linked child with empty path.");
             }
 
-            var item = LibraryManager.RootFolder.FindByPath(info.Path);
+            BaseItem item = null;
 
+            // First get using the cached Id
+            if (info.ItemId != Guid.Empty)
+            {
+                item = LibraryManager.GetItemById(info.ItemId);
+            }
+
+            // If still null, search by path
+            if (item == null)
+            {
+                item = LibraryManager.RootFolder.FindByPath(info.Path);
+            }
+
+            // If still null, log
             if (item == null)
             {
                 Logger.Warn("Unable to find linked item at {0}", info.Path);
             }
+            else
+            {
+                // Cache the id for next time
+                info.ItemId = item.Id;
+            }
 
             return item;
         }
@@ -1215,7 +1232,7 @@ namespace MediaBrowser.Controller.Entities
                 .Where(i => i != null)
                 .ToList();
 
-            if (!newShortcutLinks.SequenceEqual(currentShortcutLinks))
+            if (!newShortcutLinks.SequenceEqual(currentShortcutLinks, new LinkedChildComparer()))
             {
                 Logger.Info("Shortcut links have changed for {0}", Path);