mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-17 19:08:53 -07:00
ec1f5dc317
Add Argument*Exceptions now use proper nameof operators. Added exception messages to quite a few Argument*Exceptions. Fixed rethorwing to be proper syntax. Added a ton of null checkes. (This is only a start, there are about 500 places that need proper null handling) Added some TODOs to log certain exceptions. Fix sln again. Fixed all AssemblyInfo's and added proper copyright (where I could find them) We live in *current year*. Fixed the use of braces. Fixed a ton of properties, and made a fair amount of functions static that should be and can be static. Made more Methods that should be static static. You can now use static to find bad functions! Removed unused variable. And added one more proper XML comment.
88 lines
2.9 KiB
C#
88 lines
2.9 KiB
C#
using MediaBrowser.Controller.Entities.Audio;
|
|
using MediaBrowser.Controller.Library;
|
|
using MediaBrowser.Controller.Resolvers;
|
|
using MediaBrowser.Model.Entities;
|
|
using Microsoft.Extensions.Logging;
|
|
using System;
|
|
using System.IO;
|
|
using System.Linq;
|
|
|
|
using MediaBrowser.Model.IO;
|
|
using MediaBrowser.Controller.Configuration;
|
|
using MediaBrowser.Controller.IO;
|
|
|
|
namespace Emby.Server.Implementations.Library.Resolvers.Audio
|
|
{
|
|
/// <summary>
|
|
/// Class MusicArtistResolver
|
|
/// </summary>
|
|
public class MusicArtistResolver : ItemResolver<MusicArtist>
|
|
{
|
|
private readonly ILogger _logger;
|
|
private readonly IFileSystem _fileSystem;
|
|
private readonly ILibraryManager _libraryManager;
|
|
private readonly IServerConfigurationManager _config;
|
|
|
|
public MusicArtistResolver(ILogger logger, IFileSystem fileSystem, ILibraryManager libraryManager, IServerConfigurationManager config)
|
|
{
|
|
_logger = logger;
|
|
_fileSystem = fileSystem;
|
|
_libraryManager = libraryManager;
|
|
_config = config;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets the priority.
|
|
/// </summary>
|
|
/// <value>The priority.</value>
|
|
public override ResolverPriority Priority => ResolverPriority.Second;
|
|
|
|
/// <summary>
|
|
/// Resolves the specified args.
|
|
/// </summary>
|
|
/// <param name="args">The args.</param>
|
|
/// <returns>MusicArtist.</returns>
|
|
protected override MusicArtist Resolve(ItemResolveArgs args)
|
|
{
|
|
if (!args.IsDirectory) return null;
|
|
|
|
// Don't allow nested artists
|
|
if (args.HasParent<MusicArtist>() || args.HasParent<MusicAlbum>())
|
|
{
|
|
return null;
|
|
}
|
|
|
|
var collectionType = args.GetCollectionType();
|
|
|
|
var isMusicMediaFolder = string.Equals(collectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase);
|
|
|
|
// If there's a collection type and it's not music, it can't be a series
|
|
if (!isMusicMediaFolder)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
if (args.ContainsFileSystemEntryByName("artist.nfo"))
|
|
{
|
|
return new MusicArtist();
|
|
}
|
|
|
|
if (_config.Configuration.EnableSimpleArtistDetection)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
// Avoid mis-identifying top folders
|
|
if (args.Parent.IsRoot) return null;
|
|
|
|
var directoryService = args.DirectoryService;
|
|
|
|
var albumResolver = new MusicAlbumResolver(_logger, _fileSystem, _libraryManager);
|
|
|
|
// If we contain an album assume we are an artist folder
|
|
return args.FileSystemChildren.Where(i => i.IsDirectory).Any(i => albumResolver.IsMusicAlbum(i.FullName, directoryService, args.GetLibraryOptions())) ? new MusicArtist() : null;
|
|
}
|
|
|
|
}
|
|
}
|