Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-07-31 14:33:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ignore .DS_Store and @eaDir folders when scanning directories. (#314)

Browse Source
This commit is contained in:
Joseph Milazzo 2021-06-18 09:49:30 -05:00 committed by GitHub
parent 1036c731ad
commit 0c88d91278
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
API/Services/DirectoryService.cs
View File

@ -13,6 +13,9 @@ namespace API.Services
public class DirectoryService : IDirectoryService public class DirectoryService : IDirectoryService
{ {
private readonly ILogger<DirectoryService> _logger; private readonly ILogger<DirectoryService> _logger;
private static readonly Regex ExcludeDirectories = new Regex(
@"@eaDir|\.DS_Store",
RegexOptions.Compiled | RegexOptions.IgnoreCase);
public DirectoryService(ILogger<DirectoryService> logger) public DirectoryService(ILogger<DirectoryService> logger)
{ {
@ -222,6 +225,7 @@ namespace API.Services
/// <param name="root">Directory to scan</param> /// <param name="root">Directory to scan</param>
/// <param name="action">Action to apply on file path</param> /// <param name="action">Action to apply on file path</param>
/// <param name="searchPattern">Regex pattern to search against</param> /// <param name="searchPattern">Regex pattern to search against</param>
/// <param name="logger"></param>
/// <exception cref="ArgumentException"></exception> /// <exception cref="ArgumentException"></exception>
public static int TraverseTreeParallelForEach(string root, Action<string> action, string searchPattern, ILogger logger) public static int TraverseTreeParallelForEach(string root, Action<string> action, string searchPattern, ILogger logger)
{ {
@ -241,11 +245,11 @@ namespace API.Services
while (dirs.Count > 0) { while (dirs.Count > 0) {
var currentDir = dirs.Pop(); var currentDir = dirs.Pop();
string[] subDirs; IEnumerable<string> subDirs;
string[] files; string[] files;
try { try {
subDirs = Directory.GetDirectories(currentDir); subDirs = Directory.GetDirectories(currentDir).Where(path => ExcludeDirectories.Matches(path).Count == 0);
} }
// Thrown if we do not have discovery permission on the directory. // Thrown if we do not have discovery permission on the directory.
catch (UnauthorizedAccessException e) { catch (UnauthorizedAccessException e) {
@ -316,7 +320,7 @@ namespace API.Services
// Push the subdirectories onto the stack for traversal. // Push the subdirectories onto the stack for traversal.
// This could also be done before handing the files. // This could also be done before handing the files.
foreach (string str in subDirs) foreach (var str in subDirs)
dirs.Push(str); dirs.Push(str);
} }