From 0246ea8a6369bfd57c7d67bbbb3fccd7c8f1cb38 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 25 Sep 2014 23:47:46 -0400 Subject: [PATCH] support head requests for images --- MediaBrowser.Api/Images/ImageService.cs | 2 + MediaBrowser.Api/LiveTv/LiveTvService.cs | 6 +- .../MediaBrowser.Model.Portable.csproj | 20 - MediaBrowser.Model.Portable/packages.config | 3 - MediaBrowser.Model/ApiClient/IApiClient.cs | 5 - .../LiveTv/LiveTvChannelQuery.cs | 6 + .../Library/LibraryManager.cs | 2 +- .../LiveTv/LiveTvManager.cs | 25 + .../Localization/JavaScript/ar.json | 16 +- .../Localization/JavaScript/ca.json | 16 +- .../Localization/JavaScript/cs.json | 16 +- .../Localization/JavaScript/da.json | 16 +- .../Localization/JavaScript/de.json | 16 +- .../Localization/JavaScript/el.json | 16 +- .../Localization/JavaScript/en_GB.json | 16 +- .../Localization/JavaScript/en_US.json | 16 +- .../Localization/JavaScript/es.json | 16 +- .../Localization/JavaScript/es_MX.json | 16 +- .../Localization/JavaScript/fr.json | 26 +- .../Localization/JavaScript/he.json | 16 +- .../Localization/JavaScript/hr.json | 588 ++++++++ .../Localization/JavaScript/it.json | 16 +- .../Localization/JavaScript/javascript.json | 16 +- .../Localization/JavaScript/kk.json | 16 +- .../Localization/JavaScript/ms.json | 16 +- .../Localization/JavaScript/nb.json | 104 +- .../Localization/JavaScript/nl.json | 16 +- .../Localization/JavaScript/pl.json | 16 +- .../Localization/JavaScript/pt_BR.json | 16 +- .../Localization/JavaScript/pt_PT.json | 16 +- .../Localization/JavaScript/ru.json | 42 +- .../Localization/JavaScript/sv.json | 16 +- .../Localization/JavaScript/tr.json | 16 +- .../Localization/JavaScript/vi.json | 16 +- .../Localization/JavaScript/zh_TW.json | 16 +- .../Localization/LocalizationManager.cs | 1 + .../Localization/Server/ar.json | 364 ++--- .../Localization/Server/ca.json | 364 ++--- .../Localization/Server/cs.json | 364 ++--- .../Localization/Server/da.json | 364 ++--- .../Localization/Server/de.json | 364 ++--- .../Localization/Server/el.json | 364 ++--- .../Localization/Server/en_GB.json | 364 ++--- .../Localization/Server/en_US.json | 364 ++--- .../Localization/Server/es.json | 364 ++--- .../Localization/Server/es_MX.json | 364 ++--- .../Localization/Server/fr.json | 372 +++--- .../Localization/Server/he.json | 364 ++--- .../Localization/Server/hr.json | 1186 +++++++++++++++++ .../Localization/Server/it.json | 364 ++--- .../Localization/Server/kk.json | 364 ++--- .../Localization/Server/ko.json | 364 ++--- .../Localization/Server/ms.json | 364 ++--- .../Localization/Server/nb.json | 450 +++---- .../Localization/Server/nl.json | 364 ++--- .../Localization/Server/pl.json | 364 ++--- .../Localization/Server/pt_BR.json | 364 ++--- .../Localization/Server/pt_PT.json | 364 ++--- .../Localization/Server/ru.json | 390 +++--- .../Localization/Server/server.json | 3 +- .../Localization/Server/sv.json | 364 ++--- .../Localization/Server/tr.json | 364 ++--- .../Localization/Server/vi.json | 364 ++--- .../Localization/Server/zh_TW.json | 364 ++--- ...MediaBrowser.Server.Implementations.csproj | 2 + .../Api/DashboardService.cs | 4 +- .../MediaBrowser.WebDashboard.csproj | 63 + MediaBrowser.XbmcMetadata/EntryPoint.cs | 2 +- .../Savers/BaseNfoSaver.cs | 5 + Nuget/MediaBrowser.Common.Internal.nuspec | 4 +- Nuget/MediaBrowser.Common.nuspec | 11 +- Nuget/MediaBrowser.Model.Signed.nuspec | 5 +- Nuget/MediaBrowser.Server.Core.nuspec | 4 +- 73 files changed, 7167 insertions(+), 4904 deletions(-) create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/hr.json create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/hr.json diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs index 2aa6800612..89ee18265a 100644 --- a/MediaBrowser.Api/Images/ImageService.cs +++ b/MediaBrowser.Api/Images/ImageService.cs @@ -39,6 +39,8 @@ namespace MediaBrowser.Api.Images [Route("/Items/{Id}/Images/{Type}", "GET")] [Route("/Items/{Id}/Images/{Type}/{Index}", "GET")] + [Route("/Items/{Id}/Images/{Type}", "HEAD")] + [Route("/Items/{Id}/Images/{Type}/{Index}", "HEAD")] [Route("/Items/{Id}/Images/{Type}/{Index}/{Tag}/{Format}/{MaxWidth}/{MaxHeight}/{PercentPlayed}", "GET")] [Route("/Items/{Id}/Images/{Type}/{Index}/{Tag}/{Format}/{MaxWidth}/{MaxHeight}/{PercentPlayed}", "HEAD")] [Api(Description = "Gets an item image")] diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs index cd21265778..807ff2fe24 100644 --- a/MediaBrowser.Api/LiveTv/LiveTvService.cs +++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs @@ -50,6 +50,9 @@ namespace MediaBrowser.Api.LiveTv [ApiMember(Name = "IsDisliked", Description = "Filter by channels that are disliked, or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] public bool? IsDisliked { get; set; } + + [ApiMember(Name = "EnableFavoriteSorting", Description = "Incorporate favorite and like status into channel sorting.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] + public bool EnableFavoriteSorting { get; set; } } [Route("/LiveTv/Channels/{Id}", "GET", Summary = "Gets a live tv channel")] @@ -312,7 +315,8 @@ namespace MediaBrowser.Api.LiveTv Limit = request.Limit, IsFavorite = request.IsFavorite, IsLiked = request.IsLiked, - IsDisliked = request.IsDisliked + IsDisliked = request.IsDisliked, + EnableFavoriteSorting = request.EnableFavoriteSorting }, CancellationToken.None).ConfigureAwait(false); diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index 89a17055eb..38232a1fd5 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -62,25 +62,10 @@ - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll - ..\packages\PropertyChanged.Fody.1.41.0.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\PropertyChanged.dll False - - ..\packages\Microsoft.Bcl.1.1.8\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll - - - ..\packages\Microsoft.Bcl.1.1.8\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll - - - ..\packages\Microsoft.Bcl.1.1.8\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll - @@ -987,11 +972,6 @@ xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\portable\" /y /d /r /i - - - - -