From 0beb803aed85378fc4b945e1b2c9e34968a7e39f Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 13 May 2017 15:31:25 -0400
Subject: add sample rate condition

---
 MediaBrowser.Controller/Entities/IHasAwards.cs   | 15 ---------------
 MediaBrowser.Controller/Entities/Movies/Movie.cs |  4 +---
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 MediaBrowser.Controller/Entities/IHasAwards.cs

(limited to 'MediaBrowser.Controller/Entities')

diff --git a/MediaBrowser.Controller/Entities/IHasAwards.cs b/MediaBrowser.Controller/Entities/IHasAwards.cs
deleted file mode 100644
index 6661702fa..000000000
--- a/MediaBrowser.Controller/Entities/IHasAwards.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-
-namespace MediaBrowser.Controller.Entities
-{
-    /// <summary>
-    /// Interface IHasAwards
-    /// </summary>
-    public interface IHasAwards
-    {
-        /// <summary>
-        /// Gets or sets the awards summary.
-        /// </summary>
-        /// <value>The awards summary.</value>
-        string AwardSummary { get; set; }
-    }
-}
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index 371be3dfe..c2a01f4ff 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Controller.Entities.Movies
     /// <summary>
     /// Class Movie
     /// </summary>
-    public class Movie : Video, IHasSpecialFeatures, IHasTrailers, IHasAwards, IHasLookupInfo<MovieInfo>, ISupportsBoxSetGrouping
+    public class Movie : Video, IHasSpecialFeatures, IHasTrailers, IHasLookupInfo<MovieInfo>, ISupportsBoxSetGrouping
     {
         public List<Guid> SpecialFeatureIds { get; set; }
 
@@ -29,8 +29,6 @@ namespace MediaBrowser.Controller.Entities.Movies
             RemoteTrailerIds = new List<Guid>();
         }
 
-        public string AwardSummary { get; set; }
-
         public List<Guid> LocalTrailerIds { get; set; }
         public List<Guid> RemoteTrailerIds { get; set; }
 
-- 
cgit v1.2.3


From 5e994eabd5e30aacd3f9a90f548b167fe0e8f69b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 14 May 2017 22:28:32 -0400
Subject: update other parental control option

---
 MediaBrowser.Controller/Entities/InternalItemsQuery.cs |  2 +-
 MediaBrowser.Controller/Entities/PhotoAlbum.cs         | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'MediaBrowser.Controller/Entities')

diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index 092461c84..3c948487d 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -251,7 +251,7 @@ namespace MediaBrowser.Controller.Entities
 
                 if (policy.MaxParentalRating.HasValue)
                 {
-                    BlockUnratedItems = policy.BlockUnratedItems;
+                    BlockUnratedItems = policy.BlockUnratedItems.Where(i => i != UnratedItem.Other).ToArray();
                 }
 
                 ExcludeInheritedTags = policy.BlockedTags;
diff --git a/MediaBrowser.Controller/Entities/PhotoAlbum.cs b/MediaBrowser.Controller/Entities/PhotoAlbum.cs
index c902ac8cd..dd3cd98fb 100644
--- a/MediaBrowser.Controller/Entities/PhotoAlbum.cs
+++ b/MediaBrowser.Controller/Entities/PhotoAlbum.cs
@@ -1,7 +1,4 @@
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Users;
-using System.Linq;
-using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -24,10 +21,5 @@ namespace MediaBrowser.Controller.Entities
                 return false;
             }
         }
-
-        protected override bool GetBlockUnratedValue(UserPolicy config)
-        {
-            return config.BlockUnratedItems.Contains(UnratedItem.Other);
-        }
     }
 }
-- 
cgit v1.2.3