From f4b890f163cd3be5b399ef03be409106ab8ff60b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 14 Jan 2014 15:03:35 -0500
Subject: added new item by name filters

---
 MediaBrowser.Controller/Dto/IDtoService.cs         |  7 ++++++
 MediaBrowser.Controller/Entities/BaseItem.cs       |  8 +++----
 MediaBrowser.Controller/Entities/Folder.cs         |  2 +-
 MediaBrowser.Controller/Entities/IBaseItem.cs      | 28 ++++++++++++++++++++++
 MediaBrowser.Controller/Entities/ILibraryItem.cs   | 28 ----------------------
 MediaBrowser.Controller/Entities/Movies/Movie.cs   |  2 +-
 MediaBrowser.Controller/Entities/Video.cs          |  2 +-
 .../MediaBrowser.Controller.csproj                 |  2 +-
 8 files changed, 43 insertions(+), 36 deletions(-)
 create mode 100644 MediaBrowser.Controller/Entities/IBaseItem.cs
 delete mode 100644 MediaBrowser.Controller/Entities/ILibraryItem.cs

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Dto/IDtoService.cs b/MediaBrowser.Controller/Dto/IDtoService.cs
index 6cd10a2fb..fd5ccac5b 100644
--- a/MediaBrowser.Controller/Dto/IDtoService.cs
+++ b/MediaBrowser.Controller/Dto/IDtoService.cs
@@ -57,6 +57,13 @@ namespace MediaBrowser.Controller.Dto
         /// <returns>BaseItem.</returns>
         BaseItem GetItemByDtoId(string id, Guid? userId = null);
 
+        /// <summary>
+        /// Attaches the primary image aspect ratio.
+        /// </summary>
+        /// <param name="dto">The dto.</param>
+        /// <param name="item">The item.</param>
+        void AttachPrimaryImageAspectRatio(IItemDto dto, IHasImages item);
+
         /// <summary>
         /// Gets the base item dto.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index dcee4bae7..47b5247c3 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -23,7 +23,7 @@ namespace MediaBrowser.Controller.Entities
     /// <summary>
     /// Class BaseItem
     /// </summary>
-    public abstract class BaseItem : IHasProviderIds, ILibraryItem, IHasImages, IHasUserData
+    public abstract class BaseItem : IHasProviderIds, IBaseItem, IHasImages, IHasUserData
     {
         protected BaseItem()
         {
@@ -662,7 +662,7 @@ namespace MediaBrowser.Controller.Entities
             return LibraryManager.ResolvePaths<Trailer>(files, null).Select(video =>
             {
                 // Try to retrieve it from the db. If we don't find it, use the resolved version
-                var dbItem = LibraryManager.RetrieveItem(video.Id) as Trailer;
+                var dbItem = LibraryManager.GetItemById(video.Id) as Trailer;
 
                 if (dbItem != null)
                 {
@@ -723,7 +723,7 @@ namespace MediaBrowser.Controller.Entities
             return LibraryManager.ResolvePaths<Audio.Audio>(files, null).Select(audio =>
             {
                 // Try to retrieve it from the db. If we don't find it, use the resolved version
-                var dbItem = LibraryManager.RetrieveItem(audio.Id) as Audio.Audio;
+                var dbItem = LibraryManager.GetItemById(audio.Id) as Audio.Audio;
 
                 if (dbItem != null)
                 {
@@ -781,7 +781,7 @@ namespace MediaBrowser.Controller.Entities
             return LibraryManager.ResolvePaths<Video>(files, null).Select(item =>
             {
                 // Try to retrieve it from the db. If we don't find it, use the resolved version
-                var dbItem = LibraryManager.RetrieveItem(item.Id) as Video;
+                var dbItem = LibraryManager.GetItemById(item.Id) as Video;
 
                 if (dbItem != null)
                 {
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index a85157a26..6fb99f547 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -884,7 +884,7 @@ namespace MediaBrowser.Controller.Entities
             // First get using the cached Id
             if (info.ItemId != Guid.Empty)
             {
-                item = LibraryManager.GetItemById(info.ItemId);
+                item = LibraryManager.GetItemById(info.ItemId) as BaseItem;
             }
 
             // If still null, search by path
diff --git a/MediaBrowser.Controller/Entities/IBaseItem.cs b/MediaBrowser.Controller/Entities/IBaseItem.cs
new file mode 100644
index 000000000..83ccd55b0
--- /dev/null
+++ b/MediaBrowser.Controller/Entities/IBaseItem.cs
@@ -0,0 +1,28 @@
+using System;
+
+namespace MediaBrowser.Controller.Entities
+{
+    /// <summary>
+    /// Interface ILibraryItem
+    /// </summary>
+    public interface IBaseItem
+    {
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        string Name { get; }
+
+        /// <summary>
+        /// Gets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        Guid Id { get; }
+
+        /// <summary>
+        /// Gets the path.
+        /// </summary>
+        /// <value>The path.</value>
+        string Path { get; }
+    }
+}
diff --git a/MediaBrowser.Controller/Entities/ILibraryItem.cs b/MediaBrowser.Controller/Entities/ILibraryItem.cs
deleted file mode 100644
index b2f39608f..000000000
--- a/MediaBrowser.Controller/Entities/ILibraryItem.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-
-namespace MediaBrowser.Controller.Entities
-{
-    /// <summary>
-    /// Interface ILibraryItem
-    /// </summary>
-    public interface ILibraryItem
-    {
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        string Name { get; }
-
-        /// <summary>
-        /// Gets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        Guid Id { get; }
-
-        /// <summary>
-        /// Gets the path.
-        /// </summary>
-        /// <value>The path.</value>
-        string Path { get; }
-    }
-}
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index b1d3a871a..ba11b0eef 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -179,7 +179,7 @@ namespace MediaBrowser.Controller.Entities.Movies
             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 = LibraryManager.RetrieveItem(video.Id) as Video;
+                var dbItem = LibraryManager.GetItemById(video.Id) as Video;
 
                 if (dbItem != null)
                 {
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 8ca475650..e663c8353 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -268,7 +268,7 @@ namespace MediaBrowser.Controller.Entities
             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 = LibraryManager.RetrieveItem(video.Id) as Video;
+                var dbItem = LibraryManager.GetItemById(video.Id) as Video;
 
                 if (dbItem != null)
                 {
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index af3857f17..bb5e97621 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -99,7 +99,7 @@
     <Compile Include="Entities\IHasTrailers.cs" />
     <Compile Include="Entities\IHasUserData.cs" />
     <Compile Include="Entities\IItemByName.cs" />
-    <Compile Include="Entities\ILibraryItem.cs" />
+    <Compile Include="Entities\IBaseItem.cs" />
     <Compile Include="Entities\ImageSourceInfo.cs" />
     <Compile Include="Entities\LinkedChild.cs" />
     <Compile Include="Entities\MusicVideo.cs" />
-- 
cgit v1.2.3