add new image params

8 files changed, 83 insertions, 12 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index c9df615e1..b9eaf7001 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -56,6 +56,12 @@ namespace MediaBrowser.Model.Configuration
         public bool SaveLocalMeta { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether [enable localized guids].
+        /// </summary>
+        /// <value><c>true</c> if [enable localized guids]; otherwise, <c>false</c>.</value>
+        public bool EnableLocalizedGuids { get; set; }
+        
+        /// <summary>
         /// Gets or sets the preferred metadata language.
         /// </summary>
         /// <value>The preferred metadata language.</value>
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 4907abfd7..fb26f1ff8 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -298,7 +298,6 @@ namespace MediaBrowser.Model.Dlna
                 playlistItem.VideoCodec = transcodingProfile.VideoCodec;
                 playlistItem.Protocol = transcodingProfile.Protocol;
                 playlistItem.AudioStreamIndex = audioStreamIndex;
-                playlistItem.VideoProfile = transcodingProfile.VideoProfile;
 
                 List<ProfileCondition> videoTranscodingConditions = new List<ProfileCondition>();
                 foreach (CodecProfile i in options.Profile.CodecProfiles)
diff --git a/MediaBrowser.Model/Dlna/TranscodingProfile.cs b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
index ad82d6fac..d9963eb75 100644
--- a/MediaBrowser.Model/Dlna/TranscodingProfile.cs
+++ b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
@@ -29,9 +29,6 @@ namespace MediaBrowser.Model.Dlna
         [XmlAttribute("transcodeSeekInfo")]
         public TranscodeSeekInfo TranscodeSeekInfo { get; set; }
 
-        [XmlAttribute("videoProfile")]
-        public string VideoProfile { get; set; }
-
         [XmlAttribute("context")]
         public EncodingContext Context { get; set; }
 
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index a9f13374b..e0f250deb 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -64,7 +64,7 @@ namespace MediaBrowser.Model.Dto
 
         public float? Metascore { get; set; }
 
-        public bool IsUnidentified { get; set; }
+        public bool? IsUnidentified { get; set; }
 
         public int? AnimeSeriesIndex { get; set; }
 
@@ -218,6 +218,12 @@ namespace MediaBrowser.Model.Dto
         public long? RunTimeTicks { get; set; }
 
         /// <summary>
+        /// Gets or sets the recursive unplayed item count.
+        /// </summary>
+        /// <value>The recursive unplayed item count.</value>
+        public int? RecursiveUnplayedItemCount { get; set; }
+
+        /// <summary>
         /// Gets or sets the play access.
         /// </summary>
         /// <value>The play access.</value>
@@ -236,13 +242,6 @@ namespace MediaBrowser.Model.Dto
         public int? ProductionYear { get; set; }
 
         /// <summary>
-        /// Gets or sets the recursive unplayed item count.
-        /// </summary>
-        /// <value>The recursive unplayed item count.</value>
-        [Obsolete]
-        public int? RecursiveUnplayedItemCount { get; set; }
-        
-        /// <summary>
         /// Gets or sets the season count.
         /// </summary>
         /// <value>The season count.</value>
diff --git a/MediaBrowser.Model/Dto/DtoOptions.cs b/MediaBrowser.Model/Dto/DtoOptions.cs
new file mode 100644
index 000000000..069d71fce
--- /dev/null
+++ b/MediaBrowser.Model/Dto/DtoOptions.cs
@@ -0,0 +1,32 @@
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.Dto
+{
+    public class DtoOptions
+    {
+        public List<ItemFields> Fields { get; set; }
+        public List<ImageType> ImageTypes { get; set; }
+        public int ImageTypeLimit { get; set; }
+        public bool EnableImages { get; set; }
+
+        public DtoOptions()
+        {
+            Fields = new List<ItemFields>();
+            ImageTypes = new List<ImageType>();
+            ImageTypeLimit = int.MaxValue;
+            EnableImages = true;
+        }
+
+        public int GetImageLimit(ImageType type)
+        {
+            if (EnableImages && ImageTypes.Contains(type))
+            {
+                return ImageTypeLimit;
+            }
+
+            return 0;
+        }
+    }
+}
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index df4e6949e..f7eb54292 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -125,6 +125,7 @@
     <Compile Include="Dlna\SubtitleDeliveryMethod.cs" />
     <Compile Include="Dlna\SubtitleStreamInfo.cs" />
     <Compile Include="Drawing\ImageOrientation.cs" />
+    <Compile Include="Dto\DtoOptions.cs" />
     <Compile Include="Dto\IHasServerId.cs" />
     <Compile Include="MediaInfo\LiveMediaInfoResult.cs" />
     <Compile Include="Dto\MediaSourceType.cs" />
@@ -412,6 +413,7 @@
     <Compile Include="Users\ForgotPasswordAction.cs" />
     <Compile Include="Users\ForgotPasswordResult.cs" />
     <Compile Include="Users\PinRedeemResult.cs" />
+    <Compile Include="Users\UserPolicy.cs" />
     <None Include="Fody.targets" />
     <None Include="FodyWeavers.xml" />
     <None Include="MediaBrowser.Model.snk" />
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index 9ceca311c..84f6bd651 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -82,11 +82,21 @@ namespace MediaBrowser.Model.Querying
         Keywords,
 
         /// <summary>
+        /// The media source count
+        /// </summary>
+        MediaSourceCount,
+
+        /// <summary>
         /// The media versions
         /// </summary>
         MediaSources,
 
         /// <summary>
+        /// The metascore
+        /// </summary>
+        Metascore,
+
+        /// <summary>
         /// The metadata settings
         /// </summary>
         Settings,
@@ -102,6 +112,11 @@ namespace MediaBrowser.Model.Querying
         ParentId,
 
         /// <summary>
+        /// The part count
+        /// </summary>
+        PartCount,
+
+        /// <summary>
         /// The physical path of the item
         /// </summary>
         Path,
@@ -127,6 +142,11 @@ namespace MediaBrowser.Model.Querying
         PrimaryImageAspectRatio,
 
         /// <summary>
+        /// The original primary image aspect ratio
+        /// </summary>
+        OriginalPrimaryImageAspectRatio,
+        
+        /// <summary>
         /// The revenue
         /// </summary>
         Revenue,
@@ -172,6 +192,11 @@ namespace MediaBrowser.Model.Querying
         Tags,
 
         /// <summary>
+        /// The vote count
+        /// </summary>
+        VoteCount,
+
+        /// <summary>
         /// The TMDB collection name
         /// </summary>
         TmdbCollectionName,
diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
new file mode 100644
index 000000000..02d177747
--- /dev/null
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace MediaBrowser.Model.Users
+{
+    public class UserPolicy
+    {
+    }
+}