alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-15 02:33:33 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix some warnings

Browse Source
This commit is contained in:
Bond_009
2020-09-07 13:20:39 +02:00
parent 99bbbea9e2
commit 384ab39f5b
39 changed files with 572 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,12 +21,6 @@ namespace MediaBrowser.Providers.Manager
where TItemType : BaseItem, IHasLookupInfo<TIdType>, new()
where TIdType : ItemLookupInfo, new()
{
protected readonly IServerConfigurationManager ServerConfigurationManager;
protected readonly ILogger<MetadataService<TItemType, TIdType>> Logger;
protected readonly IProviderManager ProviderManager;
protected readonly IFileSystem FileSystem;
protected readonly ILibraryManager LibraryManager;
protected MetadataService(IServerConfigurationManager serverConfigurationManager, ILogger<MetadataService<TItemType, TIdType>> logger, IProviderManager providerManager, IFileSystem fileSystem, ILibraryManager libraryManager)
{
ServerConfigurationManager = serverConfigurationManager;
@@ -36,6 +30,26 @@ namespace MediaBrowser.Providers.Manager
LibraryManager = libraryManager;
}
protected IServerConfigurationManager ServerConfigurationManager { get; }
protected ILogger<MetadataService<TItemType, TIdType>> Logger { get; }
protected IProviderManager ProviderManager { get; }
protected IFileSystem FileSystem { get; }
protected ILibraryManager LibraryManager { get; }
protected virtual bool EnableUpdatingPremiereDateFromChildren => false;
protected virtual bool EnableUpdatingGenresFromChildren => false;
protected virtual bool EnableUpdatingStudiosFromChildren => false;
protected virtual bool EnableUpdatingOfficialRatingFromChildren => false;
public virtual int Order => 0;
private FileSystemMetadata TryGetFile(string path, IDirectoryService directoryService)
{
try
@@ -442,14 +456,6 @@ namespace MediaBrowser.Providers.Manager
return updateType;
}
protected virtual bool EnableUpdatingPremiereDateFromChildren => false;
protected virtual bool EnableUpdatingGenresFromChildren => false;
protected virtual bool EnableUpdatingStudiosFromChildren => false;
protected virtual bool EnableUpdatingOfficialRatingFromChildren => false;
private ItemUpdateType UpdatePremiereDate(TItemType item, IList<BaseItem> children)
{
var updateType = ItemUpdateType.None;
@@ -658,7 +664,8 @@ namespace MediaBrowser.Providers.Manager
return type == typeof(TItemType);
}
protected virtual async Task<RefreshResult> RefreshWithProviders(MetadataResult<TItemType> metadata,
protected virtual async Task<RefreshResult> RefreshWithProviders(
MetadataResult<TItemType> metadata,
TIdType id,
MetadataRefreshOptions options,
List<IMetadataProvider> providers,
@@ -773,7 +780,7 @@ namespace MediaBrowser.Providers.Manager
else
{
// TODO: If the new metadata from above has some blank data, this can cause old data to get filled into those empty fields
MergeData(metadata, temp, new MetadataField[] { }, false, false);
MergeData(metadata, temp, Array.Empty<MetadataField>(), false, false);
MergeData(temp, metadata, item.LockedFields, true, false);
}
}
@@ -900,24 +907,23 @@ namespace MediaBrowser.Providers.Manager
}
}
protected abstract void MergeData(MetadataResult<TItemType> source,
protected abstract void MergeData(
MetadataResult<TItemType> source,
MetadataResult<TItemType> target,
MetadataField[] lockedFields,
bool replaceData,
bool mergeMetadataSettings);
public virtual int Order => 0;
private bool HasChanged(BaseItem item, IHasItemChangeMonitor changeMonitor, IDirectoryService directoryService)
{
try
{
var hasChanged = changeMonitor.HasChanged(item, directoryService);
// if (hasChanged)
//{
// logger.LogDebug("{0} reports change to {1}", changeMonitor.GetType().Name, item.Path ?? item.Name);
//}
if (hasChanged)
{
Logger.LogDebug("{0} reports change to {1}", changeMonitor.GetType().Name, item.Path ?? item.Name);
}
return hasChanged;
}
@@ -928,13 +934,4 @@ namespace MediaBrowser.Providers.Manager
}
}
}
public class RefreshResult
{
public ItemUpdateType UpdateType { get; set; }
public string ErrorMessage { get; set; }
public int Failures { get; set; }
}
}