unified the two sorting api's

4 files changed, 23 insertions, 29 deletions

diff --git a/MediaBrowser.Model/DTO/BaseItemDto.cs b/MediaBrowser.Model/DTO/BaseItemDto.cs
index 971b0bde74..b1d3f83c23 100644
--- a/MediaBrowser.Model/DTO/BaseItemDto.cs
+++ b/MediaBrowser.Model/DTO/BaseItemDto.cs
@@ -316,13 +316,6 @@ namespace MediaBrowser.Model.Dto
         public List<DayOfWeek> AirDays { get; set; }
 
         /// <summary>
-        /// Gets or sets the sort options.
-        /// </summary>
-        /// <value>The sort options.</value>
-        [ProtoMember(53)]
-        public string[] SortOptions { get; set; }
-
-        /// <summary>
         /// Gets or sets the index options.
         /// </summary>
         /// <value>The index options.</value>
diff --git a/MediaBrowser.Model/DTO/ItemFields.cs b/MediaBrowser.Model/DTO/ItemFields.cs
index a24c8a8f01..981afe8947 100644
--- a/MediaBrowser.Model/DTO/ItemFields.cs
+++ b/MediaBrowser.Model/DTO/ItemFields.cs
@@ -87,11 +87,6 @@ namespace MediaBrowser.Model.Dto
         SortName,
 
         /// <summary>
-        /// The fields that the server supports sorting on
-        /// </summary>
-        SortOptions,
-
-        /// <summary>
         /// The studios of the item
         /// </summary>
         Studios,
diff --git a/MediaBrowser.Model/DTO/ItemQuery.cs b/MediaBrowser.Model/DTO/ItemQuery.cs
index 6d64a093bc..085a872b1a 100644
--- a/MediaBrowser.Model/DTO/ItemQuery.cs
+++ b/MediaBrowser.Model/DTO/ItemQuery.cs
@@ -36,7 +36,7 @@ namespace MediaBrowser.Model.Dto
         /// What to sort the results by
         /// </summary>
         /// <value>The sort by.</value>
-        public ItemSortBy[] SortBy { get; set; }
+        public string[] SortBy { get; set; }
 
         /// <summary>
         /// The sort order to return results with
@@ -117,12 +117,6 @@ namespace MediaBrowser.Model.Dto
         public string IndexBy { get; set; }
 
         /// <summary>
-        /// The dynamic, localized sort function name
-        /// </summary>
-        /// <value>The dynamic sort by.</value>
-        public string DynamicSortBy { get; set; }
-
-        /// <summary>
         /// Gets or sets the image types.
         /// </summary>
         /// <value>The image types.</value>
diff --git a/MediaBrowser.Model/DTO/ItemSortBy.cs b/MediaBrowser.Model/DTO/ItemSortBy.cs
index 30cd1c3a45..141690a55a 100644
--- a/MediaBrowser.Model/DTO/ItemSortBy.cs
+++ b/MediaBrowser.Model/DTO/ItemSortBy.cs
@@ -2,41 +2,53 @@
 namespace MediaBrowser.Model.Dto
 {
     /// <summary>
-    /// Enum ItemSortBy
+    /// These represent sort orders that are known by the core
     /// </summary>
-    public enum ItemSortBy
+    public static class ItemSortBy
     {
         /// <summary>
         /// The album
         /// </summary>
-        Album,
+        public const string Album = "Album";
         /// <summary>
         /// The album artist
         /// </summary>
-        AlbumArtist,
+        public const string AlbumArtist = "AlbumArtist";
         /// <summary>
         /// The artist
         /// </summary>
-        Artist,
+        public const string Artist = "Artist";
         /// <summary>
         /// The date created
         /// </summary>
-        DateCreated,
+        public const string DateCreated = "DateCreated";
         /// <summary>
         /// The date played
         /// </summary>
-        DatePlayed,
+        public const string DatePlayed = "DatePlayed";
         /// <summary>
         /// The premiere date
         /// </summary>
-        PremiereDate,
+        public const string PremiereDate = "PremiereDate";
         /// <summary>
         /// The sort name
         /// </summary>
-        SortName,
+        public const string SortName = "SortName";
         /// <summary>
         /// The random
         /// </summary>
-        Random
+        public const string Random = "Random";
+        /// <summary>
+        /// The runtime
+        /// </summary>
+        public const string Runtime = "Runtime";
+        /// <summary>
+        /// The community rating
+        /// </summary>
+        public const string CommunityRating = "CommunityRating";
+        /// <summary>
+        /// The production year
+        /// </summary>
+        public const string ProductionYear = "ProductionYear";
     }
 }