|
|
|
@ -5,7 +5,6 @@ using System.Text.RegularExpressions;
|
|
|
|
|
using MediaBrowser.Controller.Entities;
|
|
|
|
|
using MediaBrowser.Controller.Library;
|
|
|
|
|
using MediaBrowser.Controller.Resolvers;
|
|
|
|
|
using MediaBrowser.Model.Extensions;
|
|
|
|
|
using MediaBrowser.Model.IO;
|
|
|
|
|
|
|
|
|
|
namespace Emby.Server.Implementations.Library
|
|
|
|
@ -17,12 +16,10 @@ namespace Emby.Server.Implementations.Library
|
|
|
|
|
{
|
|
|
|
|
private readonly ILibraryManager _libraryManager;
|
|
|
|
|
|
|
|
|
|
private bool _ignoreDotPrefix;
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Any folder named in this list will be ignored - can be added to at runtime for extensibility
|
|
|
|
|
/// Any folder named in this list will be ignored
|
|
|
|
|
/// </summary>
|
|
|
|
|
public static readonly string[] IgnoreFolders =
|
|
|
|
|
private static readonly string[] _ignoreFolders =
|
|
|
|
|
{
|
|
|
|
|
"metadata",
|
|
|
|
|
"ps3_update",
|
|
|
|
@ -43,25 +40,14 @@ namespace Emby.Server.Implementations.Library
|
|
|
|
|
"$RECYCLE.BIN",
|
|
|
|
|
"System Volume Information",
|
|
|
|
|
".grab",
|
|
|
|
|
|
|
|
|
|
// macos
|
|
|
|
|
".AppleDouble"
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
public CoreResolutionIgnoreRule(ILibraryManager libraryManager)
|
|
|
|
|
{
|
|
|
|
|
_libraryManager = libraryManager;
|
|
|
|
|
|
|
|
|
|
_ignoreDotPrefix = Environment.OSVersion.Platform != PlatformID.Win32NT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Shoulds the ignore.
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="fileInfo">The file information.</param>
|
|
|
|
|
/// <param name="parent">The parent.</param>
|
|
|
|
|
/// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
|
|
|
|
|
/// <inheritdoc />
|
|
|
|
|
public bool ShouldIgnore(FileSystemMetadata fileInfo, BaseItem parent)
|
|
|
|
|
{
|
|
|
|
|
// Don't ignore top level folders
|
|
|
|
@ -73,46 +59,17 @@ namespace Emby.Server.Implementations.Library
|
|
|
|
|
var filename = fileInfo.Name;
|
|
|
|
|
var path = fileInfo.FullName;
|
|
|
|
|
|
|
|
|
|
// Handle mac .DS_Store
|
|
|
|
|
// https://github.com/MediaBrowser/MediaBrowser/issues/427
|
|
|
|
|
if (_ignoreDotPrefix)
|
|
|
|
|
// Ignore hidden files on UNIX
|
|
|
|
|
if (Environment.OSVersion.Platform != PlatformID.Win32NT
|
|
|
|
|
&& filename[0] == '.')
|
|
|
|
|
{
|
|
|
|
|
if (filename.IndexOf('.') == 0)
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Ignore hidden files and folders
|
|
|
|
|
//if (fileInfo.IsHidden)
|
|
|
|
|
//{
|
|
|
|
|
// if (parent == null)
|
|
|
|
|
// {
|
|
|
|
|
// var parentFolderName = Path.GetFileName(_fileSystem.GetDirectoryName(path));
|
|
|
|
|
|
|
|
|
|
// if (string.Equals(parentFolderName, BaseItem.ThemeSongsFolderName, StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
// {
|
|
|
|
|
// return false;
|
|
|
|
|
// }
|
|
|
|
|
// if (string.Equals(parentFolderName, BaseItem.ThemeVideosFolderName, StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
// {
|
|
|
|
|
// return false;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// // Sometimes these are marked hidden
|
|
|
|
|
// if (_fileSystem.IsRootPath(path))
|
|
|
|
|
// {
|
|
|
|
|
// return false;
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// return true;
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
if (fileInfo.IsDirectory)
|
|
|
|
|
{
|
|
|
|
|
// Ignore any folders in our list
|
|
|
|
|
if (IgnoreFolders.Contains(filename, StringComparer.OrdinalIgnoreCase))
|
|
|
|
|
if (_ignoreFolders.Contains(filename, StringComparer.OrdinalIgnoreCase))
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
@ -120,8 +77,9 @@ namespace Emby.Server.Implementations.Library
|
|
|
|
|
if (parent != null)
|
|
|
|
|
{
|
|
|
|
|
// Ignore trailer folders but allow it at the collection level
|
|
|
|
|
if (string.Equals(filename, BaseItem.TrailerFolderName, StringComparison.OrdinalIgnoreCase) &&
|
|
|
|
|
!(parent is AggregateFolder) && !(parent is UserRootFolder))
|
|
|
|
|
if (string.Equals(filename, BaseItem.TrailerFolderName, StringComparison.OrdinalIgnoreCase)
|
|
|
|
|
&& !(parent is AggregateFolder)
|
|
|
|
|
&& !(parent is UserRootFolder))
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
@ -142,14 +100,15 @@ namespace Emby.Server.Implementations.Library
|
|
|
|
|
if (parent != null)
|
|
|
|
|
{
|
|
|
|
|
// Don't resolve these into audio files
|
|
|
|
|
if (string.Equals(Path.GetFileNameWithoutExtension(filename), BaseItem.ThemeSongFilename) && _libraryManager.IsAudioFile(filename))
|
|
|
|
|
if (string.Equals(Path.GetFileNameWithoutExtension(filename), BaseItem.ThemeSongFilename)
|
|
|
|
|
&& _libraryManager.IsAudioFile(filename))
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Ignore samples
|
|
|
|
|
Match m = Regex.Match(filename,@"\bsample\b",RegexOptions.IgnoreCase);
|
|
|
|
|
Match m = Regex.Match(filename, @"\bsample\b", RegexOptions.IgnoreCase);
|
|
|
|
|
|
|
|
|
|
return m.Success;
|
|
|
|
|
}
|
|
|
|
|