From af7aa597c35279e286ee88641854db69744e7b15 Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Thu, 28 Feb 2013 14:32:41 -0500
Subject: referenced core plugins, fixed some dashboard issues, extracted
 library manager

---
 MediaBrowser.Controller/Entities/BaseItem.cs         |  3 ++-
 MediaBrowser.Controller/Entities/CollectionFolder.cs |  2 +-
 MediaBrowser.Controller/Entities/Folder.cs           | 12 ++++++------
 MediaBrowser.Controller/Entities/Movies/Movie.cs     |  2 +-
 MediaBrowser.Controller/Entities/User.cs             |  2 +-
 MediaBrowser.Controller/Entities/UserRootFolder.cs   |  2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'MediaBrowser.Controller/Entities')

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index e462ac9e27..47c129dea3 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -95,6 +95,7 @@ namespace MediaBrowser.Controller.Entities
         /// The logger
         /// </summary>
         protected static internal ILogger Logger { get; internal set; }
+        protected static internal ILibraryManager LibraryManager { get; internal set; }
 
         /// <summary>
         /// Returns a <see cref="System.String" /> that represents this instance.
@@ -613,7 +614,7 @@ namespace MediaBrowser.Controller.Entities
                 return new List<Video> { };
             }
 
-            return Kernel.Instance.LibraryManager.GetItems<Video>(files, null).Select(video =>
+            return LibraryManager.ResolvePaths<Video>(files, null).Select(video =>
             {
                 // Try to retrieve it from the db. If we don't find it, use the resolved version
                 var dbItem = Kernel.Instance.ItemRepository.RetrieveItem(video.Id) as Video;
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index fbcd2f5895..a3db5ca26a 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -88,7 +88,7 @@ namespace MediaBrowser.Controller.Entities
                 }
 
                 var ourChildren =
-                    Kernel.Instance.RootFolder.Children.OfType<Folder>()
+                    LibraryManager.RootFolder.Children.OfType<Folder>()
                           .Where(i => folderIds.Contains(i.Id))
                           .SelectMany(c => c.Children);
 
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 28075b9a1b..c6f4790298 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -317,7 +317,7 @@ namespace MediaBrowser.Controller.Entities
                     {
                         try
                         {
-                            return Kernel.Instance.LibraryManager.GetPerson(i).Result;
+                            return LibraryManager.GetPerson(i).Result;
                         }
                         catch (IOException ex)
                         {
@@ -359,7 +359,7 @@ namespace MediaBrowser.Controller.Entities
                     {
                         try
                         {
-                            return Kernel.Instance.LibraryManager.GetStudio(i).Result;
+                            return LibraryManager.GetStudio(i).Result;
                         }
                         catch (IOException ex)
                         {
@@ -399,7 +399,7 @@ namespace MediaBrowser.Controller.Entities
                         {
                             try
                             {
-                                return Kernel.Instance.LibraryManager.GetGenre(i).Result;
+                                return LibraryManager.GetGenre(i).Result;
                             }
                             catch (IOException ex)
                             {
@@ -440,7 +440,7 @@ namespace MediaBrowser.Controller.Entities
                     {
                         try
                         {
-                            return Kernel.Instance.LibraryManager.GetYear(i).Result;
+                            return LibraryManager.GetYear(i).Result;
                         }
                         catch (IOException ex)
                         {
@@ -768,7 +768,7 @@ namespace MediaBrowser.Controller.Entities
                 IndexCache.Clear();
 
                 //and fire event
-                Kernel.Instance.LibraryManager.OnLibraryChanged(changedArgs);
+                LibraryManager.ReportLibraryChanged(changedArgs);
             }
 
             progress.Report(15);
@@ -860,7 +860,7 @@ namespace MediaBrowser.Controller.Entities
                 return new List<BaseItem> { };
             }
 
-            return Kernel.Instance.LibraryManager.GetItems<BaseItem>(fileSystemChildren, this);
+            return LibraryManager.ResolvePaths<BaseItem>(fileSystemChildren, this);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index 92177f9162..5d8ada21f7 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -181,7 +181,7 @@ namespace MediaBrowser.Controller.Entities.Movies
                 return new List<Video> { };
             }
 
-            return Kernel.Instance.LibraryManager.GetItems<Video>(files, null).Select(video =>
+            return LibraryManager.ResolvePaths<Video>(files, null).Select(video =>
             {
                 // Try to retrieve it from the db. If we don't find it, use the resolved version
                 var dbItem = Kernel.Instance.ItemRepository.RetrieveItem(video.Id) as Video;
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index 7196b68b85..bf77cdc959 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -124,7 +124,7 @@ namespace MediaBrowser.Controller.Entities
         {
             get
             {
-                LazyInitializer.EnsureInitialized(ref _rootFolder, ref _userRootFolderInitialized, ref _userRootFolderSyncLock, () => (UserRootFolder)Kernel.Instance.LibraryManager.GetItem(RootFolderPath));
+                LazyInitializer.EnsureInitialized(ref _rootFolder, ref _userRootFolderInitialized, ref _userRootFolderSyncLock, () => (UserRootFolder)LibraryManager.ResolvePath(RootFolderPath));
                 return _rootFolder;
             }
             private set
diff --git a/MediaBrowser.Controller/Entities/UserRootFolder.cs b/MediaBrowser.Controller/Entities/UserRootFolder.cs
index 4ffd3468d9..8fe5f43f1a 100644
--- a/MediaBrowser.Controller/Entities/UserRootFolder.cs
+++ b/MediaBrowser.Controller/Entities/UserRootFolder.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Controller.Entities
         /// <returns>IEnumerable{BaseItem}.</returns>
         protected override IEnumerable<BaseItem> GetNonCachedChildren()
         {
-            return base.GetNonCachedChildren().Concat(Kernel.Instance.RootFolder.VirtualChildren);
+            return base.GetNonCachedChildren().Concat(LibraryManager.RootFolder.VirtualChildren);
         }
     }
 }
-- 
cgit v1.2.3