From 8726b9ca952b33e8a4810f27ac6a00807df676be Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 13 Jun 2013 14:17:42 -0400
Subject: Set initial display media type at resolve time

---
 MediaBrowser.Controller/Entities/Audio/Audio.cs    | 12 -------
 .../Entities/Audio/MusicAlbum.cs                   | 16 ---------
 .../Entities/Audio/MusicAlbumDisc.cs               | 16 +--------
 MediaBrowser.Controller/Entities/BaseItem.cs       | 12 +++----
 .../Entities/BasePluginFolder.cs                   | 42 +---------------------
 MediaBrowser.Controller/Entities/User.cs           | 16 ---------
 6 files changed, 8 insertions(+), 106 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index dd28218ceb..5ee1e8152a 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -101,17 +101,5 @@ namespace MediaBrowser.Controller.Entities.Audio
         {
             return string.Equals(Artist, name, StringComparison.OrdinalIgnoreCase) || string.Equals(AlbumArtist, name, StringComparison.OrdinalIgnoreCase);
         }
-
-        public override string DisplayMediaType
-        {
-            get
-            {
-                return "Song";
-            }
-            set
-            {
-                base.DisplayMediaType = value;
-            }
-        }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index f3fdbb4990..79624826ae 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -164,22 +164,6 @@ namespace MediaBrowser.Controller.Entities.Audio
             }
         }
 
-        /// <summary>
-        /// Gets or sets the display type of the media.
-        /// </summary>
-        /// <value>The display type of the media.</value>
-        public override string DisplayMediaType
-        {
-            get
-            {
-                return "Album";
-            }
-            set
-            {
-                base.DisplayMediaType = value;
-            }
-        }
-
         /// <summary>
         /// Gets or sets the music brainz release group id.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbumDisc.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbumDisc.cs
index 9007a1bfd4..27b7337c8f 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbumDisc.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbumDisc.cs
@@ -6,20 +6,6 @@ namespace MediaBrowser.Controller.Entities.Audio
     /// </summary>
     public class MusicAlbumDisc : Folder
     {
-        /// <summary>
-        /// Gets or sets the display type of the media.
-        /// </summary>
-        /// <value>The display type of the media.</value>
-        public override string DisplayMediaType
-        {
-            get
-            {
-                return "Disc";
-            }
-            set
-            {
-                base.DisplayMediaType = value;
-            }
-        }
+
     }
 }
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 9e28e42424..fbed70af9a 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -48,7 +48,7 @@ namespace MediaBrowser.Controller.Entities
         /// The supported image extensions
         /// </summary>
         public static readonly string[] SupportedImageExtensions = new[] { ".png", ".jpg", ".jpeg" };
-        
+
         /// <summary>
         /// The trailer folder name
         /// </summary>
@@ -82,7 +82,7 @@ namespace MediaBrowser.Controller.Entities
         /// Gets or sets the id.
         /// </summary>
         /// <value>The id.</value>
-        public virtual Guid Id { get; set; }
+        public Guid Id { get; set; }
 
         /// <summary>
         /// Gets or sets the path.
@@ -171,7 +171,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The locked images.</value>
         public List<ImageType> LockedImages { get; set; }
-        
+
         /// <summary>
         /// Determines whether the item has a saved local image of the specified name (jpg or png).
         /// </summary>
@@ -764,7 +764,7 @@ namespace MediaBrowser.Controller.Entities
                 return false;
             }));
 
-            var trailers= LibraryManager.ResolvePaths<Trailer>(files, null).Select(video =>
+            var trailers = 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;
@@ -964,7 +964,7 @@ namespace MediaBrowser.Controller.Entities
 
             return itemsChanged || results.Contains(true);
         }
-        
+
         private async Task<bool> RefreshThemeVideos(CancellationToken cancellationToken, bool forceSave = false, bool forceRefresh = false, bool allowSlowProviders = true)
         {
             var newThemeVideos = LoadThemeVideos().ToList();
@@ -980,7 +980,7 @@ namespace MediaBrowser.Controller.Entities
 
             return themeVideosChanged || results.Contains(true);
         }
-        
+
         /// <summary>
         /// Refreshes the theme songs.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
index bf8040a9fe..fabb69c0fb 100644
--- a/MediaBrowser.Controller/Entities/BasePluginFolder.cs
+++ b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
@@ -1,6 +1,4 @@
-using MediaBrowser.Common.Extensions;
-using System;
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -10,27 +8,6 @@ namespace MediaBrowser.Controller.Entities
     /// </summary>
     public abstract class BasePluginFolder : Folder, ICollectionFolder, IByReferenceItem
     {
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        public override Guid Id
-        {
-            get
-            {
-                // This doesn't get populated through the normal resolving process
-                if (base.Id == Guid.Empty)
-                {
-                    base.Id = (Path ?? Name).GetMBId(GetType());
-                }
-                return base.Id;
-            }
-            set
-            {
-                base.Id = value;
-            }
-        }        
-        
         /// <summary>
         /// Gets or sets the type of the location.
         /// </summary>
@@ -42,22 +19,5 @@ namespace MediaBrowser.Controller.Entities
                 return LocationType.Virtual;
             }
         }
-
-
-        /// <summary>
-        /// We don't resolve normally so need to fill this in
-        /// </summary>
-        public override string DisplayMediaType
-        {
-            get
-            {
-                return "CollectionFolder"; // Plug-in folders are collection folders
-            }
-            set
-            {
-                base.DisplayMediaType = value;
-            }
-        }
-
     }
 }
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index 65c3793e90..96507f2696 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -74,22 +74,6 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
-        /// <summary>
-        /// Ensure this has a value
-        /// </summary>
-        /// <value>The display type of the media.</value>
-        public override string DisplayMediaType
-        {
-            get
-            {
-                return base.DisplayMediaType ?? GetType().Name;
-            }
-            set
-            {
-                base.DisplayMediaType = value;
-            }
-        }
-
         /// <summary>
         /// The _root folder
         /// </summary>
-- 
cgit v1.2.3