Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clarify naming, minor method ordering improvement

Browse Source
This commit is contained in:
Joe Rogers 2021-12-06 22:31:16 +01:00
parent 56900d0fc3
commit 11c7c24f0e
No known key found for this signature in database
GPG Key ID: 0074AD57B8FDBBB4
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
MediaBrowser.Providers/Manager/ProviderManager.cs
View File

@ -297,18 +297,31 @@ namespace MediaBrowser.Providers.Manager
return GetRemoteImageProviders(item, true).Select(i => new ImageProviderInfo(i.Name, i.GetSupportedImages(item).ToArray())); return GetRemoteImageProviders(item, true).Select(i => new ImageProviderInfo(i.Name, i.GetSupportedImages(item).ToArray()));
} }
private IEnumerable<IRemoteImageProvider> GetRemoteImageProviders(BaseItem item, bool includeDisabled)
{
var options = GetMetadataOptions(item);
var libraryOptions = _libraryManager.GetLibraryOptions(item);
return GetImageProvidersInternal(
item,
libraryOptions,
options,
new ImageRefreshOptions(new DirectoryService(_fileSystem)),
includeDisabled).OfType<IRemoteImageProvider>();
}
/// <inheritdoc/> /// <inheritdoc/>
public IEnumerable<IImageProvider> GetImageProviders(BaseItem item, ImageRefreshOptions refreshOptions) public IEnumerable<IImageProvider> GetImageProviders(BaseItem item, ImageRefreshOptions refreshOptions)
{ {
return GetImageProviders(item, _libraryManager.GetLibraryOptions(item), GetMetadataOptions(item), refreshOptions, false); return GetImageProvidersInternal(item, _libraryManager.GetLibraryOptions(item), GetMetadataOptions(item), refreshOptions, false);
} }
private IEnumerable<IImageProvider> GetImageProviders(BaseItem item, LibraryOptions libraryOptions, MetadataOptions options, ImageRefreshOptions refreshOptions, bool includeDisabled) private IEnumerable<IImageProvider> GetImageProvidersInternal(BaseItem item, LibraryOptions libraryOptions, MetadataOptions options, ImageRefreshOptions refreshOptions, bool includeDisabled)
{ {
var typeOptions = libraryOptions.GetTypeOptions(item.GetType().Name); var typeOptions = libraryOptions.GetTypeOptions(item.GetType().Name);
var fetcherOrder = typeOptions?.ImageFetcherOrder ?? options.ImageFetcherOrder; var fetcherOrder = typeOptions?.ImageFetcherOrder ?? options.ImageFetcherOrder;
return _imageProviders.Where(i => CanRefresh(i, item, libraryOptions, refreshOptions, includeDisabled)) return _imageProviders.Where(i => CanRefreshImages(i, item, libraryOptions, refreshOptions, includeDisabled))
.OrderBy(i => GetConfiguredOrder(fetcherOrder, i.Name)) .OrderBy(i => GetConfiguredOrder(fetcherOrder, i.Name))
.ThenBy(GetOrder); .ThenBy(GetOrder);
} }
@ -342,25 +355,12 @@ namespace MediaBrowser.Providers.Manager
var currentOptions = globalMetadataOptions; var currentOptions = globalMetadataOptions;
return _metadataProviders.OfType<IMetadataProvider<T>>() return _metadataProviders.OfType<IMetadataProvider<T>>()
.Where(i => CanRefresh(i, item, libraryOptions, includeDisabled, forceEnableInternetMetadata)) .Where(i => CanRefreshMetadata(i, item, libraryOptions, includeDisabled, forceEnableInternetMetadata))
.OrderBy(i => GetConfiguredOrder(item, i, libraryOptions, currentOptions)) .OrderBy(i => GetConfiguredOrder(item, i, libraryOptions, currentOptions))
.ThenBy(GetDefaultOrder); .ThenBy(GetDefaultOrder);
} }
private IEnumerable<IRemoteImageProvider> GetRemoteImageProviders(BaseItem item, bool includeDisabled) private bool CanRefreshMetadata(
{
var options = GetMetadataOptions(item);
var libraryOptions = _libraryManager.GetLibraryOptions(item);
return GetImageProviders(
item,
libraryOptions,
options,
new ImageRefreshOptions(new DirectoryService(_fileSystem)),
includeDisabled).OfType<IRemoteImageProvider>();
}
private bool CanRefresh(
IMetadataProvider provider, IMetadataProvider provider,
BaseItem item, BaseItem item,
LibraryOptions libraryOptions, LibraryOptions libraryOptions,
@ -401,7 +401,7 @@ namespace MediaBrowser.Providers.Manager
return true; return true;
} }
private bool CanRefresh( private bool CanRefreshImages(
IImageProvider provider, IImageProvider provider,
BaseItem item, BaseItem item,
LibraryOptions libraryOptions, LibraryOptions libraryOptions,
@ -535,7 +535,7 @@ namespace MediaBrowser.Providers.Manager
var libraryOptions = new LibraryOptions(); var libraryOptions = new LibraryOptions();
var imageProviders = GetImageProviders( var imageProviders = GetImageProvidersInternal(
dummy, dummy,
libraryOptions, libraryOptions,
options, options,

14
tests/Jellyfin.Providers.Tests/Manager/ProviderManagerTests.cs
View File

@ -100,9 +100,9 @@ namespace Jellyfin.Providers.Tests.Manager
[InlineData(true, false, true)] [InlineData(true, false, true)]
[InlineData(false, false, false)] [InlineData(false, false, false)]
[InlineData(true, true, false)] [InlineData(true, true, false)]
public void GetImageProviders_CanRefreshBasic_WhenSupportsWithoutError(bool supports, bool errorOnSupported, bool expected) public void GetImageProviders_CanRefreshImagesBasic_WhenSupportsWithoutError(bool supports, bool errorOnSupported, bool expected)
{ {
GetImageProviders_CanRefresh_Tester(typeof(IImageProvider), supports, expected, errorOnSupported: errorOnSupported); GetImageProviders_CanRefreshImages_Tester(typeof(IImageProvider), supports, expected, errorOnSupported: errorOnSupported);
} }
[Theory] [Theory]
@ -110,9 +110,9 @@ namespace Jellyfin.Providers.Tests.Manager
[InlineData(typeof(ILocalImageProvider), true, true)] [InlineData(typeof(ILocalImageProvider), true, true)]
[InlineData(typeof(IImageProvider), false, false)] [InlineData(typeof(IImageProvider), false, false)]
[InlineData(typeof(IImageProvider), true, true)] [InlineData(typeof(IImageProvider), true, true)]
public void GetImageProviders_CanRefreshLocked_WhenLocalOrFullRefresh(Type providerType, bool fullRefresh, bool expected) public void GetImageProviders_CanRefreshImagesLocked_WhenLocalOrFullRefresh(Type providerType, bool fullRefresh, bool expected)
{ {
GetImageProviders_CanRefresh_Tester(providerType, true, expected, itemLocked: true, fullRefresh: fullRefresh); GetImageProviders_CanRefreshImages_Tester(providerType, true, expected, itemLocked: true, fullRefresh: fullRefresh);
} }
[Theory] [Theory]
@ -121,12 +121,12 @@ namespace Jellyfin.Providers.Tests.Manager
[InlineData(typeof(IDynamicImageProvider), true, true)] [InlineData(typeof(IDynamicImageProvider), true, true)]
[InlineData(typeof(IRemoteImageProvider), false, false)] [InlineData(typeof(IRemoteImageProvider), false, false)]
[InlineData(typeof(IDynamicImageProvider), false, false)] [InlineData(typeof(IDynamicImageProvider), false, false)]
public void GetImageProviders_CanRefreshEnabled_WhenLocalOrEnabled(Type providerType, bool enabled, bool expected) public void GetImageProviders_CanRefreshImagesEnabled_WhenLocalOrEnabled(Type providerType, bool enabled, bool expected)
{ {
GetImageProviders_CanRefresh_Tester(providerType, true, expected, baseItemEnabled: enabled); GetImageProviders_CanRefreshImages_Tester(providerType, true, expected, baseItemEnabled: enabled);
} }
private static void GetImageProviders_CanRefresh_Tester(Type providerType, bool supports, bool expected, bool errorOnSupported = false, bool itemLocked = false, bool fullRefresh = false, bool baseItemEnabled = true) private static void GetImageProviders_CanRefreshImages_Tester(Type providerType, bool supports, bool expected, bool errorOnSupported = false, bool itemLocked = false, bool fullRefresh = false, bool baseItemEnabled = true)
{ {
var item = new Movie var item = new Movie
{ {