alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-17 11:43:44 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Backport pull request #12025 from jellyfin/release-10.9.z

Browse Source 
Fix empty image folder removal for legacy locations

Original-merge: 476dc01f4d

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Shadowghost
2024-06-24 20:28:58 -04:00
committed by Joshua M. Boniface
parent ac114b27a9
commit 6734450d40
9 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MediaBrowser.Providers/Manager/MetadataService.cs
View File

@@ -92,10 +92,6 @@ namespace MediaBrowser.Providers.Manager
}
}
var localImagesFailed = false;
var allImageProviders = ProviderManager.GetImageProviders(item, refreshOptions).ToList();
if (refreshOptions.RemoveOldMetadata && refreshOptions.ReplaceAllImages)
{
if (ImageProvider.RemoveImages(item))
@@ -105,6 +101,8 @@ namespace MediaBrowser.Providers.Manager
}
// Start by validating images
var localImagesFailed = false;
var allImageProviders = ProviderManager.GetImageProviders(item, refreshOptions).ToList();
try
{
// Always validate images and check for new locally stored ones.
@@ -813,19 +811,16 @@ namespace MediaBrowser.Providers.Manager
{
var refreshResult = new RefreshResult();
var tmpDataMerged = false;
if (id is not null)
{
MergeNewData(temp.Item, id);
}
foreach (var provider in providers)
{
var providerName = provider.GetType().Name;
Logger.LogDebug("Running {Provider} for {Item}", providerName, logName);
if (id is not null && !tmpDataMerged)
{
MergeNewData(temp.Item, id);
tmpDataMerged = true;
}
try
{
var result = await provider.GetMetadata(id, cancellationToken).ConfigureAwait(false);