diff options
Diffstat (limited to 'MediaBrowser.Controller/Providers')
7 files changed, 13 insertions, 29 deletions
diff --git a/MediaBrowser.Controller/Providers/AlbumInfo.cs b/MediaBrowser.Controller/Providers/AlbumInfo.cs index 74feb4ea2..b0b443fc0 100644 --- a/MediaBrowser.Controller/Providers/AlbumInfo.cs +++ b/MediaBrowser.Controller/Providers/AlbumInfo.cs @@ -22,7 +22,7 @@ namespace MediaBrowser.Controller.Providers { ArtistProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); SongInfos = new List<SongInfo>(); - AlbumArtists = EmptyStringArray; + AlbumArtists = Array.Empty<string>(); } } -}
\ No newline at end of file +} diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs index 65192671e..9bb2f5bed 100644 --- a/MediaBrowser.Controller/Providers/DirectoryService.cs +++ b/MediaBrowser.Controller/Providers/DirectoryService.cs @@ -1,10 +1,7 @@ -using MediaBrowser.Model.Logging; +using Microsoft.Extensions.Logging; using System; -using System.Collections.Concurrent; using System.Collections.Generic; -using System.IO; using System.Linq; -using MediaBrowser.Controller.IO; using MediaBrowser.Model.IO; namespace MediaBrowser.Controller.Providers @@ -26,18 +23,13 @@ namespace MediaBrowser.Controller.Providers _fileSystem = fileSystem; } - public DirectoryService(IFileSystem fileSystem) - : this(new NullLogger(), fileSystem) - { - } - public FileSystemMetadata[] GetFileSystemEntries(string path) { FileSystemMetadata[] entries; if (!_cache.TryGetValue(path, out entries)) { - //_logger.Debug("Getting files for " + path); + //_logger.LogDebug("Getting files for " + path); entries = _fileSystem.GetFileSystemEntries(path).ToArray(); diff --git a/MediaBrowser.Controller/Providers/ImageRefreshOptions.cs b/MediaBrowser.Controller/Providers/ImageRefreshOptions.cs index 942d25071..6cc8a691e 100644 --- a/MediaBrowser.Controller/Providers/ImageRefreshOptions.cs +++ b/MediaBrowser.Controller/Providers/ImageRefreshOptions.cs @@ -20,7 +20,7 @@ namespace MediaBrowser.Controller.Providers ImageRefreshMode = MetadataRefreshMode.Default; DirectoryService = directoryService; - ReplaceImages = new ImageType[] { }; + ReplaceImages = Array.Empty<ImageType>(); IsAutomated = true; } @@ -30,4 +30,4 @@ namespace MediaBrowser.Controller.Providers (ReplaceAllImages || ReplaceImages.Contains(type)); } } -}
\ No newline at end of file +} diff --git a/MediaBrowser.Controller/Providers/ItemLookupInfo.cs b/MediaBrowser.Controller/Providers/ItemLookupInfo.cs index 98122e776..dc7a04135 100644 --- a/MediaBrowser.Controller/Providers/ItemLookupInfo.cs +++ b/MediaBrowser.Controller/Providers/ItemLookupInfo.cs @@ -6,8 +6,6 @@ namespace MediaBrowser.Controller.Providers { public class ItemLookupInfo : IHasProviderIds { - protected static string[] EmptyStringArray = new string[] { }; - /// <summary> /// Gets or sets the name. /// </summary> diff --git a/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs b/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs index 3e34075a6..3dbcc5305 100644 --- a/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs +++ b/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs @@ -1,10 +1,8 @@ using System; -using System.Collections.Generic; using System.Linq; using MediaBrowser.Controller.Entities; -using MediaBrowser.Controller.IO; using MediaBrowser.Model.IO; -using MediaBrowser.Model.Logging; +using Microsoft.Extensions.Logging; using MediaBrowser.Model.Providers; namespace MediaBrowser.Controller.Providers @@ -24,11 +22,6 @@ namespace MediaBrowser.Controller.Providers public bool ForceSave { get; set; } public bool EnableRemoteContentProbe { get; set; } - public MetadataRefreshOptions(IFileSystem fileSystem) - : this(new DirectoryService(new NullLogger(), fileSystem)) - { - } - public MetadataRefreshOptions(IDirectoryService directoryService) : base(directoryService) { @@ -52,7 +45,7 @@ namespace MediaBrowser.Controller.Providers { if (RefreshPaths == null) { - RefreshPaths = new string[] { }; + RefreshPaths = Array.Empty<string>(); } RefreshPaths = copy.RefreshPaths.ToArray(); diff --git a/MediaBrowser.Controller/Providers/MetadataResult.cs b/MediaBrowser.Controller/Providers/MetadataResult.cs index f35d41ca4..271f784d7 100644 --- a/MediaBrowser.Controller/Providers/MetadataResult.cs +++ b/MediaBrowser.Controller/Providers/MetadataResult.cs @@ -74,4 +74,4 @@ namespace MediaBrowser.Controller.Providers return userData; } } -}
\ No newline at end of file +} diff --git a/MediaBrowser.Controller/Providers/SongInfo.cs b/MediaBrowser.Controller/Providers/SongInfo.cs index e3a6f5d37..61e950130 100644 --- a/MediaBrowser.Controller/Providers/SongInfo.cs +++ b/MediaBrowser.Controller/Providers/SongInfo.cs @@ -1,3 +1,4 @@ +using System; namespace MediaBrowser.Controller.Providers { @@ -9,8 +10,8 @@ namespace MediaBrowser.Controller.Providers public SongInfo() { - Artists = EmptyStringArray; - AlbumArtists = EmptyStringArray; + Artists = Array.Empty<string>(); + AlbumArtists = Array.Empty<string>(); } } -}
\ No newline at end of file +} |