aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-03-30 10:57:30 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-03-30 10:57:30 -0400
commit1fcf696bd540bca6fc541f8b96b28e031c24f5f7 (patch)
tree2b5c1d56fcab8e7a56eb6b68693b5029606279a2
parenta0834c57106e1fdcff501cc968eced5a507c6195 (diff)
Added filters to the item list page
-rw-r--r--MediaBrowser.Api/UserLibrary/ItemsService.cs18
-rw-r--r--MediaBrowser.Model/Querying/ItemFilter.cs10
-rw-r--r--MediaBrowser.Model/Querying/ItemSortBy.cs4
-rw-r--r--MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj1
-rw-r--r--MediaBrowser.Server.Implementations/Sorting/PlayCountComparer.cs50
5 files changed, 81 insertions, 2 deletions
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index 939a17314..a8a9109c1 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -48,7 +48,7 @@ namespace MediaBrowser.Api.UserLibrary
/// What to sort the results by
/// </summary>
/// <value>The sort by.</value>
- [ApiMember(Name = "SortBy", Description = "Optional. Specify one or more sort orders, comma delimeted. Options: Album, AlbumArtist, Artist, CommunityRating, DateCreated, DatePlayed, PremiereDate, ProductionYear, SortName, Random, Runtime", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
+ [ApiMember(Name = "SortBy", Description = "Optional. Specify one or more sort orders, comma delimeted. Options: Album, AlbumArtist, Artist, CommunityRating, DateCreated, DatePlayed, PlayCount, PremiereDate, ProductionYear, SortName, Random, Runtime", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
public string SortBy { get; set; }
/// <summary>
@@ -243,6 +243,22 @@ namespace MediaBrowser.Api.UserLibrary
{
switch (filter)
{
+ case ItemFilter.Likes:
+ return items.Where(item =>
+ {
+ var userdata = item.GetUserData(user, false);
+
+ return userdata != null && userdata.Likes.HasValue && userdata.Likes.Value;
+ });
+
+ case ItemFilter.Dislikes:
+ return items.Where(item =>
+ {
+ var userdata = item.GetUserData(user, false);
+
+ return userdata != null && userdata.Likes.HasValue && !userdata.Likes.Value;
+ });
+
case ItemFilter.IsFavorite:
return items.Where(item =>
{
diff --git a/MediaBrowser.Model/Querying/ItemFilter.cs b/MediaBrowser.Model/Querying/ItemFilter.cs
index 9c7f139a8..38ca67fa2 100644
--- a/MediaBrowser.Model/Querying/ItemFilter.cs
+++ b/MediaBrowser.Model/Querying/ItemFilter.cs
@@ -33,6 +33,14 @@ namespace MediaBrowser.Model.Querying
/// <summary>
/// The item is resumable
/// </summary>
- IsResumable = 7
+ IsResumable = 7,
+ /// <summary>
+ /// The likes
+ /// </summary>
+ Likes = 8,
+ /// <summary>
+ /// The dislikes
+ /// </summary>
+ Dislikes = 9
}
}
diff --git a/MediaBrowser.Model/Querying/ItemSortBy.cs b/MediaBrowser.Model/Querying/ItemSortBy.cs
index 9599e2aac..c85ed8780 100644
--- a/MediaBrowser.Model/Querying/ItemSortBy.cs
+++ b/MediaBrowser.Model/Querying/ItemSortBy.cs
@@ -50,5 +50,9 @@ namespace MediaBrowser.Model.Querying
/// The production year
/// </summary>
public const string ProductionYear = "ProductionYear";
+ /// <summary>
+ /// The play count
+ /// </summary>
+ public const string PlayCount = "PlayCount";
}
}
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 4303c4f80..0ce5a7f44 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -163,6 +163,7 @@
<Compile Include="Sorting\CommunityRatingComparer.cs" />
<Compile Include="Sorting\DateCreatedComparer.cs" />
<Compile Include="Sorting\DatePlayedComparer.cs" />
+ <Compile Include="Sorting\PlayCountComparer.cs" />
<Compile Include="Sorting\PremiereDateComparer.cs" />
<Compile Include="Sorting\ProductionYearComparer.cs" />
<Compile Include="Sorting\RandomComparer.cs" />
diff --git a/MediaBrowser.Server.Implementations/Sorting/PlayCountComparer.cs b/MediaBrowser.Server.Implementations/Sorting/PlayCountComparer.cs
new file mode 100644
index 000000000..9cd5281c3
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Sorting/PlayCountComparer.cs
@@ -0,0 +1,50 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Sorting;
+using MediaBrowser.Model.Querying;
+
+namespace MediaBrowser.Server.Implementations.Sorting
+{
+ /// <summary>
+ /// Class PlayCountComparer
+ /// </summary>
+ public class PlayCountComparer : IUserBaseItemComparer
+ {
+ /// <summary>
+ /// Gets or sets the user.
+ /// </summary>
+ /// <value>The user.</value>
+ public User User { get; set; }
+
+ /// <summary>
+ /// Compares the specified x.
+ /// </summary>
+ /// <param name="x">The x.</param>
+ /// <param name="y">The y.</param>
+ /// <returns>System.Int32.</returns>
+ public int Compare(BaseItem x, BaseItem y)
+ {
+ return GetValue(x).CompareTo(GetValue(y));
+ }
+
+ /// <summary>
+ /// Gets the date.
+ /// </summary>
+ /// <param name="x">The x.</param>
+ /// <returns>DateTime.</returns>
+ private int GetValue(BaseItem x)
+ {
+ var userdata = x.GetUserData(User, false);
+
+ return userdata == null ? 0 : userdata.PlayCount;
+ }
+
+ /// <summary>
+ /// Gets the name.
+ /// </summary>
+ /// <value>The name.</value>
+ public string Name
+ {
+ get { return ItemSortBy.PlayCount; }
+ }
+ }
+}