From a4142e87647cadda1b3a157935e500ade683cc38 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 27 Jul 2013 13:18:10 -0400
Subject: [PATCH] added user id to get ibn methods

---
 MediaBrowser.Model/ApiClient/IApiClient.cs | 20 ++++++---------
 MediaBrowser.Model/Dto/BaseItemDto.cs      | 30 ++++++++++++++++++++++
 Nuget/MediaBrowser.Common.Internal.nuspec  |  4 +--
 Nuget/MediaBrowser.Common.nuspec           |  2 +-
 Nuget/MediaBrowser.Server.Core.nuspec      |  4 +--
 5 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 89c73db1b..b15d1c1d5 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -219,9 +219,10 @@ namespace MediaBrowser.Model.ApiClient
         /// Gets a studio
         /// </summary>
         /// <param name="name">The name.</param>
+        /// <param name="userId">The user id.</param>
         /// <returns>Task{BaseItemDto}.</returns>
         /// <exception cref="ArgumentNullException">userId</exception>
-        Task<BaseItemDto> GetStudioAsync(string name);
+        Task<BaseItemDto> GetStudioAsync(string name, string userId);
 
         /// <summary>
         /// Gets the next up async.
@@ -234,17 +235,19 @@ namespace MediaBrowser.Model.ApiClient
         /// Gets a genre
         /// </summary>
         /// <param name="name">The name.</param>
+        /// <param name="userId">The user id.</param>
         /// <returns>Task{BaseItemDto}.</returns>
         /// <exception cref="ArgumentNullException">userId</exception>
-        Task<BaseItemDto> GetGenreAsync(string name);
+        Task<BaseItemDto> GetGenreAsync(string name, string userId);
 
         /// <summary>
         /// Gets the artist async.
         /// </summary>
         /// <param name="name">The name.</param>
+        /// <param name="userId">The user id.</param>
         /// <returns>Task{BaseItemDto}.</returns>
         /// <exception cref="ArgumentNullException">name</exception>
-        Task<BaseItemDto> GetArtistAsync(string name);
+        Task<BaseItemDto> GetArtistAsync(string name, string userId);
 
         /// <summary>
         /// Restarts the server.
@@ -262,17 +265,10 @@ namespace MediaBrowser.Model.ApiClient
         /// Gets a person
         /// </summary>
         /// <param name="name">The name.</param>
+        /// <param name="userId">The user id.</param>
         /// <returns>Task{BaseItemDto}.</returns>
         /// <exception cref="ArgumentNullException">userId</exception>
-        Task<BaseItemDto> GetPersonAsync(string name);
-
-        /// <summary>
-        /// Gets a year
-        /// </summary>
-        /// <param name="year">The year.</param>
-        /// <returns>Task{BaseItemDto}.</returns>
-        /// <exception cref="ArgumentNullException">userId</exception>
-        Task<BaseItemDto> GetYearAsync(int year);
+        Task<BaseItemDto> GetPersonAsync(string name, string userId);
 
         /// <summary>
         /// Gets a list of plugins installed on the server
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 1c0fbed07..fa9ed2536 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -703,6 +703,36 @@ namespace MediaBrowser.Model.Dto
             get { return string.Equals(Type, "AggregateFolder", StringComparison.OrdinalIgnoreCase); }
         }
 
+        [IgnoreDataMember]
+        public bool IsMusicGenre
+        {
+            get { return string.Equals(Type, "MusicGenre", StringComparison.OrdinalIgnoreCase); }
+        }
+
+        [IgnoreDataMember]
+        public bool IsGameGenre
+        {
+            get { return string.Equals(Type, "GameGenre", StringComparison.OrdinalIgnoreCase); }
+        }
+
+        [IgnoreDataMember]
+        public bool IsGenre
+        {
+            get { return string.Equals(Type, "Genre", StringComparison.OrdinalIgnoreCase); }
+        }
+
+        [IgnoreDataMember]
+        public bool IsArtist
+        {
+            get { return string.Equals(Type, "Artist", StringComparison.OrdinalIgnoreCase); }
+        }
+
+        [IgnoreDataMember]
+        public bool IsStudio
+        {
+            get { return string.Equals(Type, "Studio", StringComparison.OrdinalIgnoreCase); }
+        }
+
         /// <summary>
         /// Occurs when [property changed].
         /// </summary>
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index ee3cf1584..d1e556df6 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.165</version>
+        <version>3.0.166</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.165" />
+            <dependency id="MediaBrowser.Common" version="3.0.166" />
             <dependency id="NLog" version="2.0.1.2" />
             <dependency id="ServiceStack.Text" version="3.9.45" />
             <dependency id="SimpleInjector" version="2.2.3" />
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index c572af2ff..d8178ea1c 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.165</version>
+        <version>3.0.166</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index 6ce395ca7..9bbc1832f 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.165</version>
+        <version>3.0.166</version>
         <title>Media Browser.Server.Core</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Media Browser Server.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.165" />
+            <dependency id="MediaBrowser.Common" version="3.0.166" />
         </dependencies>
     </metadata>
     <files>