From e2b3320f8000b695f5e45c79adc12b03505e4dff Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 4 Jul 2014 15:17:22 -0400
Subject: add one year tolerance to movie lookups

---
 MediaBrowser.Server.Implementations/Library/MusicManager.cs    | 10 ++++++++--
 .../Localization/Server/server.json                            |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/Library/MusicManager.cs b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
index 9d58264545..df122e1664 100644
--- a/MediaBrowser.Server.Implementations/Library/MusicManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
@@ -18,7 +18,12 @@ namespace MediaBrowser.Server.Implementations.Library
 
         public IEnumerable<Audio> GetInstantMixFromSong(Audio item, User user)
         {
-            return GetInstantMixFromGenres(item.Genres, user);
+            var list = new List<Audio>
+            {
+                item
+            };
+
+            return list.Concat(GetInstantMixFromGenres(item.Genres, user));
         }
 
         public IEnumerable<Audio> GetInstantMixFromArtist(string name, User user)
@@ -39,7 +44,7 @@ namespace MediaBrowser.Server.Implementations.Library
         public IEnumerable<Audio> GetInstantMixFromAlbum(MusicAlbum item, User user)
         {
             var genres = item
-               .RecursiveChildren
+                .GetRecursiveChildren(user, true)
                .OfType<Audio>()
                .SelectMany(i => i.Genres)
                .Concat(item.Genres)
@@ -57,6 +62,7 @@ namespace MediaBrowser.Server.Implementations.Library
             return inputItems
                 .OfType<Audio>()
                 .Select(i => new Tuple<Audio, int>(i, i.Genres.Count(genresDictionary.ContainsKey)))
+                .Where(i => i.Item2 > 0)
                 .OrderByDescending(i => i.Item2)
                 .ThenBy(i => Guid.NewGuid())
                 .Select(i => i.Item1)
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index d6d4bbc516..a1c08c8d8a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -858,5 +858,7 @@
 	"TabBranding": "Branding",
 	"HeaderBrandingHelp": "Customize the appearance of Media Browser to fit the needs of your group or organization.",
 	"LabelLoginDisclaimer": "Login disclaimer:",
-	"LabelLoginDisclaimerHelp": "This will be displayed at the bottom of the login page."
+	"LabelLoginDisclaimerHelp": "This will be displayed at the bottom of the login page.",
+	"LabelAutomaticallyDonate": "Automatically donate this amount each month",
+	"LabelAutomaticallyDonateHelp": "You can cancel at any time via your PayPal account."
 }
\ No newline at end of file
-- 
cgit v1.2.3