From bba0c564c7f9db6a6d5d2b16b1c8ae453eeaed34 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 17 Oct 2016 12:35:29 -0400 Subject: remove dead interface objects --- MediaBrowser.Controller/Entities/BaseItem.cs | 2 +- .../Entities/BasePluginFolder.cs | 2 +- .../Entities/IByReferenceItem.cs | 12 ---------- .../Entities/IHasCriticRating.cs | 20 ---------------- .../Entities/IHasShortOverview.cs | 12 ---------- MediaBrowser.Controller/Entities/ILibraryItem.cs | 28 ---------------------- .../Entities/ImageSourceInfo.cs | 10 -------- MediaBrowser.Controller/Entities/Movies/Movie.cs | 2 +- MediaBrowser.Controller/Entities/TV/Season.cs | 2 +- MediaBrowser.Controller/Entities/Trailer.cs | 2 +- .../Entities/UserViewBuilder.cs | 11 +-------- MediaBrowser.Controller/Entities/Video.cs | 1 - 12 files changed, 6 insertions(+), 98 deletions(-) delete mode 100644 MediaBrowser.Controller/Entities/IByReferenceItem.cs delete mode 100644 MediaBrowser.Controller/Entities/IHasCriticRating.cs delete mode 100644 MediaBrowser.Controller/Entities/IHasShortOverview.cs delete mode 100644 MediaBrowser.Controller/Entities/ILibraryItem.cs delete mode 100644 MediaBrowser.Controller/Entities/ImageSourceInfo.cs (limited to 'MediaBrowser.Controller/Entities') diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 3ebefa217..e1a7741c9 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -33,7 +33,7 @@ namespace MediaBrowser.Controller.Entities /// /// Class BaseItem /// - public abstract class BaseItem : IHasProviderIds, ILibraryItem, IHasImages, IHasUserData, IHasMetadata, IHasLookupInfo + public abstract class BaseItem : IHasProviderIds, IHasImages, IHasUserData, IHasMetadata, IHasLookupInfo { protected BaseItem() { diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs index 5a1ad6b15..bd109af7a 100644 --- a/MediaBrowser.Controller/Entities/BasePluginFolder.cs +++ b/MediaBrowser.Controller/Entities/BasePluginFolder.cs @@ -7,7 +7,7 @@ namespace MediaBrowser.Controller.Entities /// Plugins derive from and export this class to create a folder that will appear in the root along /// with all the other actual physical folders in the system. /// - public abstract class BasePluginFolder : Folder, ICollectionFolder, IByReferenceItem + public abstract class BasePluginFolder : Folder, ICollectionFolder { public virtual string CollectionType { diff --git a/MediaBrowser.Controller/Entities/IByReferenceItem.cs b/MediaBrowser.Controller/Entities/IByReferenceItem.cs deleted file mode 100644 index b071473e1..000000000 --- a/MediaBrowser.Controller/Entities/IByReferenceItem.cs +++ /dev/null @@ -1,12 +0,0 @@ - -namespace MediaBrowser.Controller.Entities -{ - /// - /// This is a marker class that tells us that a particular item type may be physically resolved - /// more than once within the library and we need to be sure to resolve them all to the same - /// instance of that item. - /// - public interface IByReferenceItem - { - } -} diff --git a/MediaBrowser.Controller/Entities/IHasCriticRating.cs b/MediaBrowser.Controller/Entities/IHasCriticRating.cs deleted file mode 100644 index d2b93759d..000000000 --- a/MediaBrowser.Controller/Entities/IHasCriticRating.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace MediaBrowser.Controller.Entities -{ - /// - /// Interface IHasCriticRating - /// - public interface IHasCriticRating - { - /// - /// Gets or sets the critic rating. - /// - /// The critic rating. - float? CriticRating { get; set; } - - /// - /// Gets or sets the critic rating summary. - /// - /// The critic rating summary. - string CriticRatingSummary { get; set; } - } -} diff --git a/MediaBrowser.Controller/Entities/IHasShortOverview.cs b/MediaBrowser.Controller/Entities/IHasShortOverview.cs deleted file mode 100644 index 437201faa..000000000 --- a/MediaBrowser.Controller/Entities/IHasShortOverview.cs +++ /dev/null @@ -1,12 +0,0 @@ - -namespace MediaBrowser.Controller.Entities -{ - public interface IHasShortOverview - { - /// - /// Gets or sets the short overview. - /// - /// The short overview. - string ShortOverview { get; set; } - } -} 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 -{ - /// - /// Interface ILibraryItem - /// - public interface ILibraryItem - { - /// - /// Gets the name. - /// - /// The name. - string Name { get; } - - /// - /// Gets the id. - /// - /// The id. - Guid Id { get; } - - /// - /// Gets the path. - /// - /// The path. - string Path { get; } - } -} diff --git a/MediaBrowser.Controller/Entities/ImageSourceInfo.cs b/MediaBrowser.Controller/Entities/ImageSourceInfo.cs deleted file mode 100644 index 6dc072431..000000000 --- a/MediaBrowser.Controller/Entities/ImageSourceInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; - -namespace MediaBrowser.Controller.Entities -{ - public class ImageSourceInfo - { - public Guid ImagePathMD5 { get; set; } - public Guid ImageUrlMD5 { get; set; } - } -} diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs index dea42c463..f13adb21c 100644 --- a/MediaBrowser.Controller/Entities/Movies/Movie.cs +++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs @@ -15,7 +15,7 @@ namespace MediaBrowser.Controller.Entities.Movies /// /// Class Movie /// - public class Movie : Video, IHasCriticRating, IHasSpecialFeatures, IHasBudget, IHasTrailers, IHasAwards, IHasMetascore, IHasLookupInfo, ISupportsBoxSetGrouping, IHasOriginalTitle + public class Movie : Video, IHasSpecialFeatures, IHasBudget, IHasTrailers, IHasAwards, IHasMetascore, IHasLookupInfo, ISupportsBoxSetGrouping, IHasOriginalTitle { public List SpecialFeatureIds { get; set; } diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs index 62af14159..ce13f5fc5 100644 --- a/MediaBrowser.Controller/Entities/TV/Season.cs +++ b/MediaBrowser.Controller/Entities/TV/Season.cs @@ -36,7 +36,7 @@ namespace MediaBrowser.Controller.Entities.TV { get { - return true; + return false; } } diff --git a/MediaBrowser.Controller/Entities/Trailer.cs b/MediaBrowser.Controller/Entities/Trailer.cs index 0bcd5c14e..0780cfec5 100644 --- a/MediaBrowser.Controller/Entities/Trailer.cs +++ b/MediaBrowser.Controller/Entities/Trailer.cs @@ -10,7 +10,7 @@ namespace MediaBrowser.Controller.Entities /// /// Class Trailer /// - public class Trailer : Video, IHasCriticRating, IHasBudget, IHasMetascore, IHasOriginalTitle, IHasLookupInfo + public class Trailer : Video, IHasBudget, IHasMetascore, IHasOriginalTitle, IHasLookupInfo { public Trailer() { diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs index 3b7e3c5d2..38397572e 100644 --- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs +++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs @@ -1668,16 +1668,7 @@ namespace MediaBrowser.Controller.Entities { var val = query.MinCriticRating.Value; - var hasCriticRating = item as IHasCriticRating; - - if (hasCriticRating != null) - { - if (!(hasCriticRating.CriticRating.HasValue && hasCriticRating.CriticRating >= val)) - { - return false; - } - } - else + if (!(item.CriticRating.HasValue && item.CriticRating >= val)) { return false; } diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index e87b726b2..78d7a7fdd 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -24,7 +24,6 @@ namespace MediaBrowser.Controller.Entities IHasAspectRatio, ISupportsPlaceHolders, IHasMediaSources, - IHasShortOverview, IThemeMedia { [IgnoreDataMember] -- cgit v1.2.3