aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-11-05 10:38:59 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-11-05 10:38:59 -0500
commit36dc3a5318d7fe280311b5ffeaa63f40b2410c08 (patch)
tree27cfb64bee8d467aeebd8c096a1c0e106b173cf5
parent3f4784f788efeb42f1bc096045ec9a0cd6b74476 (diff)
hide image buttons when there are no providers
-rw-r--r--MediaBrowser.Api/Images/RemoteImageService.cs69
-rw-r--r--MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj3
-rw-r--r--MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj3
-rw-r--r--MediaBrowser.Model/MediaBrowser.Model.csproj1
-rw-r--r--MediaBrowser.Model/Providers/ImageProviderInfo.cs20
-rw-r--r--MediaBrowser.WebDashboard/ApiClient.js17
-rw-r--r--MediaBrowser.WebDashboard/packages.config2
7 files changed, 110 insertions, 5 deletions
diff --git a/MediaBrowser.Api/Images/RemoteImageService.cs b/MediaBrowser.Api/Images/RemoteImageService.cs
index 617cf0ca1..0cf51abac 100644
--- a/MediaBrowser.Api/Images/RemoteImageService.cs
+++ b/MediaBrowser.Api/Images/RemoteImageService.cs
@@ -11,6 +11,7 @@ using MediaBrowser.Model.Providers;
using ServiceStack.ServiceHost;
using ServiceStack.Text.Controller;
using System;
+using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
@@ -70,6 +71,35 @@ namespace MediaBrowser.Api.Images
public string Name { get; set; }
}
+ [Route("/Items/{Id}/RemoteImages/Providers", "GET")]
+ [Api(Description = "Gets available remote image providers for an item")]
+ public class GetRemoteImageProviders : IReturn<List<ImageProviderInfo>>
+ {
+ /// <summary>
+ /// Gets or sets the id.
+ /// </summary>
+ /// <value>The id.</value>
+ [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+ public string Id { get; set; }
+ }
+
+ [Route("/Artists/{Name}/RemoteImages/Providers", "GET")]
+ [Route("/Genres/{Name}/RemoteImages/Providers", "GET")]
+ [Route("/GameGenres/{Name}/RemoteImages/Providers", "GET")]
+ [Route("/MusicGenres/{Name}/RemoteImages/Providers", "GET")]
+ [Route("/Persons/{Name}/RemoteImages/Providers", "GET")]
+ [Route("/Studios/{Name}/RemoteImages/Providers", "GET")]
+ [Api(Description = "Gets available remote image providers for an item")]
+ public class GetItemByNameRemoteImageProviders : IReturn<List<ImageProviderInfo>>
+ {
+ /// <summary>
+ /// Gets or sets the id.
+ /// </summary>
+ /// <value>The id.</value>
+ [ApiMember(Name = "Name", Description = "Name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+ public string Name { get; set; }
+ }
+
public class BaseDownloadRemoteImage : IReturnVoid
{
[ApiMember(Name = "Type", Description = "The image type", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
@@ -81,7 +111,7 @@ namespace MediaBrowser.Api.Images
[ApiMember(Name = "ImageUrl", Description = "The image url", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
public string ImageUrl { get; set; }
}
-
+
[Route("/Items/{Id}/RemoteImages/Download", "POST")]
[Api(Description = "Downloads a remote image for an item")]
public class DownloadRemoteImage : BaseDownloadRemoteImage
@@ -110,7 +140,7 @@ namespace MediaBrowser.Api.Images
[ApiMember(Name = "Name", Description = "Name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
public string Name { get; set; }
}
-
+
[Route("/Images/Remote", "GET")]
[Api(Description = "Gets a remote image")]
public class GetRemoteImage
@@ -140,6 +170,37 @@ namespace MediaBrowser.Api.Images
_libraryManager = libraryManager;
}
+ public object Get(GetRemoteImageProviders request)
+ {
+ var item = _dtoService.GetItemByDtoId(request.Id);
+
+ var result = GetImageProviders(item);
+
+ return ToOptimizedResult(result);
+ }
+
+ public object Get(GetItemByNameRemoteImageProviders request)
+ {
+ var pathInfo = PathInfo.Parse(RequestContext.PathInfo);
+ var type = pathInfo.GetArgumentValue<string>(0);
+
+ var item = GetItemByName(request.Name, type, _libraryManager);
+
+ var result = GetImageProviders(item);
+
+ return ToOptimizedResult(result);
+ }
+
+ private List<ImageProviderInfo> GetImageProviders(BaseItem item)
+ {
+ return _providerManager.GetImageProviders(item).Select(i => new ImageProviderInfo
+ {
+ Name = i.Name,
+ Priority = i.Priority
+
+ }).ToList();
+ }
+
public object Get(GetRemoteImages request)
{
var item = _dtoService.GetItemByDtoId(request.Id);
@@ -158,7 +219,7 @@ namespace MediaBrowser.Api.Images
return GetRemoteImageResult(item, request);
}
-
+
private RemoteImageResult GetRemoteImageResult(BaseItem item, BaseRemoteImageRequest request)
{
var images = _providerManager.GetAvailableRemoteImages(item, CancellationToken.None, request.ProviderName, request.Type).Result;
@@ -212,7 +273,7 @@ namespace MediaBrowser.Api.Images
Task.WaitAll(task);
}
-
+
/// <summary>
/// Downloads the remote image.
/// </summary>
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index 542620d47..a5bff2b40 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -296,6 +296,9 @@
<Compile Include="..\MediaBrowser.Model\Plugins\PluginInfo.cs">
<Link>Plugins\PluginInfo.cs</Link>
</Compile>
+ <Compile Include="..\MediaBrowser.Model\Providers\ImageProviderInfo.cs">
+ <Link>Providers\ImageProviderInfo.cs</Link>
+ </Compile>
<Compile Include="..\MediaBrowser.Model\Providers\RemoteImageInfo.cs">
<Link>Providers\RemoteImageInfo.cs</Link>
</Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index 31f781fae..60deab47d 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -283,6 +283,9 @@
<Compile Include="..\MediaBrowser.Model\Plugins\PluginInfo.cs">
<Link>Plugins\PluginInfo.cs</Link>
</Compile>
+ <Compile Include="..\MediaBrowser.Model\Providers\ImageProviderInfo.cs">
+ <Link>Providers\ImageProviderInfo.cs</Link>
+ </Compile>
<Compile Include="..\MediaBrowser.Model\Providers\RemoteImageInfo.cs">
<Link>Providers\RemoteImageInfo.cs</Link>
</Compile>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 3ca4ff571..d641b2705 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -61,6 +61,7 @@
<Compile Include="Dto\ItemIndex.cs" />
<Compile Include="LiveTv\EpgFullInfo.cs" />
<Compile Include="LiveTv\EpgInfo.cs" />
+ <Compile Include="Providers\ImageProviderInfo.cs" />
<Compile Include="Providers\RemoteImageInfo.cs" />
<Compile Include="Dto\StudioDto.cs" />
<Compile Include="Entities\CollectionType.cs" />
diff --git a/MediaBrowser.Model/Providers/ImageProviderInfo.cs b/MediaBrowser.Model/Providers/ImageProviderInfo.cs
new file mode 100644
index 000000000..325aa90cb
--- /dev/null
+++ b/MediaBrowser.Model/Providers/ImageProviderInfo.cs
@@ -0,0 +1,20 @@
+namespace MediaBrowser.Model.Providers
+{
+ /// <summary>
+ /// Class ImageProviderInfo.
+ /// </summary>
+ public class ImageProviderInfo
+ {
+ /// <summary>
+ /// Gets or sets the name.
+ /// </summary>
+ /// <value>The name.</value>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// Gets or sets the priority.
+ /// </summary>
+ /// <value>The priority.</value>
+ public int Priority { get; set; }
+ }
+}
diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js
index a55879d2d..3254b84f3 100644
--- a/MediaBrowser.WebDashboard/ApiClient.js
+++ b/MediaBrowser.WebDashboard/ApiClient.js
@@ -342,6 +342,23 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
return urlPrefix;
}
+ self.getRemoteImageProviders = function (options) {
+
+ if (!options) {
+ throw new Error("null options");
+ }
+
+ var urlPrefix = getRemoteImagePrefix(options);
+
+ var url = self.getUrl(urlPrefix + "/RemoteImages/Providers", options);
+
+ return self.ajax({
+ type: "GET",
+ url: url,
+ dataType: "json"
+ });
+ };
+
self.getAvailableRemoteImages = function (options) {
if (!options) {
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index 62726239a..ad8173057 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="MediaBrowser.ApiClient.Javascript" version="3.0.189" targetFramework="net45" />
+ <package id="MediaBrowser.ApiClient.Javascript" version="3.0.190" targetFramework="net45" />
<package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
</packages> \ No newline at end of file