aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Images
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api/Images')
-rw-r--r--MediaBrowser.Api/Images/ImageByNameService.cs24
-rw-r--r--MediaBrowser.Api/Images/ImageService.cs33
-rw-r--r--MediaBrowser.Api/Images/RemoteImageService.cs16
3 files changed, 47 insertions, 26 deletions
diff --git a/MediaBrowser.Api/Images/ImageByNameService.cs b/MediaBrowser.Api/Images/ImageByNameService.cs
index 922bd8ed6..45b7d0c10 100644
--- a/MediaBrowser.Api/Images/ImageByNameService.cs
+++ b/MediaBrowser.Api/Images/ImageByNameService.cs
@@ -5,11 +5,13 @@ using System.Linq;
using System.Threading.Tasks;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Services;
+using Microsoft.Extensions.Logging;
namespace MediaBrowser.Api.Images
{
@@ -101,17 +103,19 @@ namespace MediaBrowser.Api.Images
private readonly IServerApplicationPaths _appPaths;
private readonly IFileSystem _fileSystem;
- private readonly IHttpResultFactory _resultFactory;
/// <summary>
/// Initializes a new instance of the <see cref="ImageByNameService" /> class.
/// </summary>
- /// <param name="appPaths">The app paths.</param>
- public ImageByNameService(IServerApplicationPaths appPaths, IFileSystem fileSystem, IHttpResultFactory resultFactory)
+ public ImageByNameService(
+ ILogger<ImageByNameService> logger,
+ IServerConfigurationManager serverConfigurationManager,
+ IHttpResultFactory resultFactory,
+ IFileSystem fileSystem)
+ : base(logger, serverConfigurationManager, resultFactory)
{
- _appPaths = appPaths;
+ _appPaths = serverConfigurationManager.ApplicationPaths;
_fileSystem = fileSystem;
- _resultFactory = resultFactory;
}
public object Get(GetMediaInfoImages request)
@@ -187,7 +191,7 @@ namespace MediaBrowser.Api.Images
var path = paths.FirstOrDefault(File.Exists) ?? paths.FirstOrDefault();
- return _resultFactory.GetStaticFileResult(Request, path);
+ return ResultFactory.GetStaticFileResult(Request, path);
}
/// <summary>
@@ -207,7 +211,7 @@ namespace MediaBrowser.Api.Images
if (!string.IsNullOrEmpty(path))
{
- return _resultFactory.GetStaticFileResult(Request, path);
+ return ResultFactory.GetStaticFileResult(Request, path);
}
}
@@ -224,7 +228,7 @@ namespace MediaBrowser.Api.Images
if (!string.IsNullOrEmpty(path))
{
- return _resultFactory.GetStaticFileResult(Request, path);
+ return ResultFactory.GetStaticFileResult(Request, path);
}
}
@@ -247,7 +251,7 @@ namespace MediaBrowser.Api.Images
if (!string.IsNullOrEmpty(path))
{
- return _resultFactory.GetStaticFileResult(Request, path);
+ return ResultFactory.GetStaticFileResult(Request, path);
}
}
@@ -263,7 +267,7 @@ namespace MediaBrowser.Api.Images
if (!string.IsNullOrEmpty(path))
{
- return _resultFactory.GetStaticFileResult(Request, path);
+ return ResultFactory.GetStaticFileResult(Request, path);
}
}
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index 6d3037b24..e94c1321f 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -6,12 +6,12 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Drawing;
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net;
-using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Drawing;
using MediaBrowser.Model.Dto;
@@ -231,7 +231,6 @@ namespace MediaBrowser.Api.Images
private readonly IProviderManager _providerManager;
- private readonly IItemRepository _itemRepo;
private readonly IImageProcessor _imageProcessor;
private readonly IFileSystem _fileSystem;
private readonly IAuthorizationContext _authContext;
@@ -239,12 +238,21 @@ namespace MediaBrowser.Api.Images
/// <summary>
/// Initializes a new instance of the <see cref="ImageService" /> class.
/// </summary>
- public ImageService(IUserManager userManager, ILibraryManager libraryManager, IProviderManager providerManager, IItemRepository itemRepo, IImageProcessor imageProcessor, IFileSystem fileSystem, IAuthorizationContext authContext)
+ public ImageService(
+ ILogger<ImageService> logger,
+ IServerConfigurationManager serverConfigurationManager,
+ IHttpResultFactory httpResultFactory,
+ IUserManager userManager,
+ ILibraryManager libraryManager,
+ IProviderManager providerManager,
+ IImageProcessor imageProcessor,
+ IFileSystem fileSystem,
+ IAuthorizationContext authContext)
+ : base(logger, serverConfigurationManager, httpResultFactory)
{
_userManager = userManager;
_libraryManager = libraryManager;
_providerManager = providerManager;
- _itemRepo = itemRepo;
_imageProcessor = imageProcessor;
_fileSystem = fileSystem;
_authContext = authContext;
@@ -402,7 +410,7 @@ namespace MediaBrowser.Api.Images
public object Get(GetItemByNameImage request)
{
- var type = GetPathValue(0);
+ var type = GetPathValue(0).ToString();
var item = GetItemByName(request.Name, type, _libraryManager, new DtoOptions(false));
@@ -411,7 +419,7 @@ namespace MediaBrowser.Api.Images
public object Head(GetItemByNameImage request)
{
- var type = GetPathValue(0);
+ var type = GetPathValue(0).ToString();
var item = GetItemByName(request.Name, type, _libraryManager, new DtoOptions(false));
@@ -424,12 +432,13 @@ namespace MediaBrowser.Api.Images
/// <param name="request">The request.</param>
public Task Post(PostUserImage request)
{
- var userId = GetPathValue(1);
- AssertCanUpdateUser(_authContext, _userManager, new Guid(userId), true);
+ var id = Guid.Parse(GetPathValue(1));
- request.Type = (ImageType)Enum.Parse(typeof(ImageType), GetPathValue(3), true);
+ AssertCanUpdateUser(_authContext, _userManager, id, true);
- var item = _userManager.GetUserById(userId);
+ request.Type = Enum.Parse<ImageType>(GetPathValue(3).ToString(), true);
+
+ var item = _userManager.GetUserById(id);
return PostImage(item, request.RequestStream, request.Type, Request.ContentType);
}
@@ -440,9 +449,9 @@ namespace MediaBrowser.Api.Images
/// <param name="request">The request.</param>
public Task Post(PostItemImage request)
{
- var id = GetPathValue(1);
+ var id = Guid.Parse(GetPathValue(1));
- request.Type = (ImageType)Enum.Parse(typeof(ImageType), GetPathValue(3), true);
+ request.Type = Enum.Parse<ImageType>(GetPathValue(3).ToString(), true);
var item = _libraryManager.GetItemById(id);
diff --git a/MediaBrowser.Api/Images/RemoteImageService.cs b/MediaBrowser.Api/Images/RemoteImageService.cs
index 24d4751c5..5a37d3730 100644
--- a/MediaBrowser.Api/Images/RemoteImageService.cs
+++ b/MediaBrowser.Api/Images/RemoteImageService.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller;
-using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net;
@@ -16,6 +16,7 @@ using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Providers;
using MediaBrowser.Model.Services;
+using Microsoft.Extensions.Logging;
namespace MediaBrowser.Api.Images
{
@@ -108,13 +109,20 @@ namespace MediaBrowser.Api.Images
private readonly IHttpClient _httpClient;
private readonly IFileSystem _fileSystem;
- private readonly IDtoService _dtoService;
private readonly ILibraryManager _libraryManager;
- public RemoteImageService(IProviderManager providerManager, IDtoService dtoService, IServerApplicationPaths appPaths, IHttpClient httpClient, IFileSystem fileSystem, ILibraryManager libraryManager)
+ public RemoteImageService(
+ ILogger<RemoteImageService> logger,
+ IServerConfigurationManager serverConfigurationManager,
+ IHttpResultFactory httpResultFactory,
+ IProviderManager providerManager,
+ IServerApplicationPaths appPaths,
+ IHttpClient httpClient,
+ IFileSystem fileSystem,
+ ILibraryManager libraryManager)
+ : base(logger, serverConfigurationManager, httpResultFactory)
{
_providerManager = providerManager;
- _dtoService = dtoService;
_appPaths = appPaths;
_httpClient = httpClient;
_fileSystem = fileSystem;
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-07 19:20:34 +0000