lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Luke Pulverenti 2016-01-11 21:56:13 -05:00
commit f58c61b11f
4 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Api/Reports/ReportsService.cs
View File

@ -215,6 +215,7 @@ namespace MediaBrowser.Api.Reports
Filter = i => ApplyAdditionalFilters(request, i, user, _libraryManager),
IsFavorite = request.IsFavorite,
Limit = request.Limit,
StartIndex = request.StartIndex,
IsMissing = request.IsMissing,
@ -301,8 +302,11 @@ namespace MediaBrowser.Api.Reports
}
}
if (request.HasQueryLimit)
query.Limit = request.Limit;
if (request.HasQueryLimit == false)
{
query.StartIndex = null;
query.Limit = null;
}
return query;
}

7
MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
View File

@ -168,6 +168,13 @@ namespace MediaBrowser.Api.UserLibrary
[ApiMember(Name = "Filters", Description = "Optional. Specify additional filters to apply. This allows multiple, comma delimeted. Options: IsFolder, IsNotFolder, IsUnplayed, IsPlayed, IsFavorite, IsResumable, Likes, Dislikes", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
public string Filters { get; set; }
/// <summary>
/// Gets or sets the Isfavorite option
/// </summary>
/// <value>IsFavorite</value>
[ApiMember(Name = "IsFavorite", Description = "Optional filter by items that are marked as favorite, or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
public bool? IsFavorite { get; set; }
/// <summary>
/// Gets or sets the media types.
/// </summary>

1
MediaBrowser.Api/UserLibrary/ItemsService.cs
View File

@ -186,6 +186,7 @@ namespace MediaBrowser.Api.UserLibrary
Filter = i => ApplyAdditionalFilters(request, i, user, _libraryManager),
IsFavorite = request.IsFavorite,
Limit = request.Limit,
StartIndex = request.StartIndex,
IsMissing = request.IsMissing,

27
MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View File

@ -488,6 +488,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\reports.html">
<Link>Resources\dashboard-ui\reports.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\robots.txt">
<Link>Resources\dashboard-ui\robots.txt</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scheduledtask.html">
<Link>Resources\dashboard-ui\scheduledtask.html</Link>
</BundleResource>
@ -545,9 +548,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\userprofiles.html">
<Link>Resources\dashboard-ui\userprofiles.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\vulcanize.txt">
<Link>Resources\dashboard-ui\vulcanize.txt</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\wizardagreement.html">
<Link>Resources\dashboard-ui\wizardagreement.html</Link>
</BundleResource>
@ -1121,6 +1121,15 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\browserdeviceprofile.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\browserdeviceprofile.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\datetime.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\datetime.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\fetchhelper.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\fetchhelper.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\qualityoptions.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\qualityoptions.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\requirecss.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\requirecss.js</Link>
</BundleResource>
@ -1874,6 +1883,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-icons\notification-icons.html">
<Link>Resources\dashboard-ui\bower_components\iron-icons\notification-icons.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-icons\places-icons.html">
<Link>Resources\dashboard-ui\bower_components\iron-icons\places-icons.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-icons\social-icons.html">
<Link>Resources\dashboard-ui\bower_components\iron-icons\social-icons.html</Link>
</BundleResource>
@ -3548,6 +3560,12 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-progress\.gitignore">
<Link>Resources\dashboard-ui\bower_components\paper-progress\.gitignore</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-progress\.travis.yml">
<Link>Resources\dashboard-ui\bower_components\paper-progress\.travis.yml</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-progress\CONTRIBUTING.md">
<Link>Resources\dashboard-ui\bower_components\paper-progress\CONTRIBUTING.md</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\paper-progress\README.md">
<Link>Resources\dashboard-ui\bower_components\paper-progress\README.md</Link>
</BundleResource>
@ -5207,6 +5225,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\strings\html\hu.json">
<Link>Resources\dashboard-ui\strings\html\hu.json</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\strings\html\id.json">
<Link>Resources\dashboard-ui\strings\html\id.json</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\strings\html\it.json">
<Link>Resources\dashboard-ui\strings\html\it.json</Link>
</BundleResource>