tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move FindAudiobooks() to AudioFileStorage

Browse Source
This commit is contained in:
Mbucari 2023-02-10 14:53:12 -07:00
parent 1f4ada604a
commit 56823c1105
5 changed files with 54 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml.cs
View File

@ -83,7 +83,7 @@ namespace LibationAvalonia.Dialogs
using var context = DbContexts.GetContext();
await foreach (var book in AudioFileLocator.FindAudiobooks(uri.LocalPath, tokenSource.Token))
await foreach (var book in AudioFileStorage.FindAudiobooksAsync(uri.LocalPath, tokenSource.Token))
{
try
{

50
Source/LibationFileManager/AudibleFileStorage.cs
View File

@ -2,7 +2,11 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text.RegularExpressions;
using Dinah.Core;
using System.Threading.Tasks;
using System.Threading;
using FileManager;
namespace LibationFileManager
@ -104,8 +108,14 @@ namespace LibationFileManager
private static BackgroundFileSystem BookDirectoryFiles { get; set; }
private static object bookDirectoryFilesLocker { get; } = new();
private static EnumerationOptions enumerationOptions { get; } = new()
{
RecurseSubdirectories = true,
IgnoreInaccessible = true,
MatchCasing = MatchCasing.CaseInsensitive
};
protected override LongPath GetFilePathCustom(string productId)
protected override LongPath GetFilePathCustom(string productId)
=> GetFilePathsCustom(productId).FirstOrDefault();
protected override List<LongPath> GetFilePathsCustom(string productId)
@ -122,5 +132,43 @@ namespace LibationFileManager
public void Refresh() => BookDirectoryFiles.RefreshFiles();
public LongPath GetPath(string productId) => GetFilePath(productId);
public static async IAsyncEnumerable<FilePathCache.CacheEntry> FindAudiobooksAsync(LongPath searchDirectory, [EnumeratorCancellation] CancellationToken cancellationToken)
{
ArgumentValidator.EnsureNotNull(searchDirectory, nameof(searchDirectory));
foreach (LongPath path in Directory.EnumerateFiles(searchDirectory, "*.M4B", enumerationOptions))
{
if (cancellationToken.IsCancellationRequested)
yield break;
int generation = 0;
FilePathCache.CacheEntry audioFile = default;
try
{
using var fileStream = File.OpenRead(path);
var mp4File = await Task.Run(() => new AAXClean.Mp4File(fileStream), cancellationToken);
generation = GC.GetGeneration(mp4File);
if (mp4File?.AppleTags?.Asin is not null)
audioFile = new FilePathCache.CacheEntry(mp4File.AppleTags.Asin, FileType.Audio, path);
}
catch (Exception ex)
{
Serilog.Log.Error(ex, "Error checking for asin in {@file}", path);
}
finally
{
GC.Collect(generation);
}
if (audioFile is not null)
yield return audioFile;
}
}
}
}

60
Source/LibationFileManager/AudioFileLocator.cs
View File

@ -1,60 +0,0 @@
using AAXClean;
using Dinah.Core;
using FileManager;
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
namespace LibationFileManager
{
public static class AudioFileLocator
{
private static EnumerationOptions enumerationOptions { get; } = new()
{
RecurseSubdirectories = true,
IgnoreInaccessible = true,
MatchCasing = MatchCasing.CaseInsensitive
};
public static async IAsyncEnumerable<FilePathCache.CacheEntry> FindAudiobooks(LongPath searchDirectory, [EnumeratorCancellation] CancellationToken cancellationToken)
{
ArgumentValidator.EnsureNotNull(searchDirectory, nameof(searchDirectory));
foreach (LongPath path in Directory.EnumerateFiles(searchDirectory, "*.M4B", enumerationOptions))
{
if (cancellationToken.IsCancellationRequested)
yield break;
int generation = 0;
FilePathCache.CacheEntry audioFile = default;
try
{
using var fileStream = File.OpenRead(path);
var mp4File = await Task.Run(() => new Mp4File(fileStream), cancellationToken);
generation = GC.GetGeneration(mp4File);
if (mp4File?.AppleTags?.Asin is not null)
audioFile = new FilePathCache.CacheEntry(mp4File.AppleTags.Asin, FileType.Audio, path);
}
catch(Exception ex)
{
Serilog.Log.Error(ex, "Error checking for asin in {@file}", path);
}
finally
{
GC.Collect(generation);
}
if (audioFile is not null)
yield return audioFile;
}
}
}
}

6
Source/LibationFileManager/Templates.cs
View File

@ -278,9 +278,9 @@ namespace LibationFileManager
var sortedNames
= sortMatch.Success
? (
sortMatch.Groups[1].Value.ToUpper() == "F" ? names.OrderBy(n => n.First)
: sortMatch.Groups[1].Value.ToUpper() == "M" ? names.OrderBy(n => n.Middle)
: sortMatch.Groups[1].Value.ToUpper() == "L" ? names.OrderBy(n => n.Last)
sortMatch.Groups[1].Value == "F" ? names.OrderBy(n => n.First)
: sortMatch.Groups[1].Value == "M" ? names.OrderBy(n => n.Middle)
: sortMatch.Groups[1].Value == "L" ? names.OrderBy(n => n.Last)
: names
)
: names;

2
Source/LibationWinForms/Dialogs/LocateAudiobooksDialog.cs
View File

@ -73,7 +73,7 @@ namespace LibationWinForms.Dialogs
using var context = DbContexts.GetContext();
await foreach (var book in AudioFileLocator.FindAudiobooks(fbd.SelectedPath, tokenSource.Token))
await foreach (var book in AudioFileStorage.FindAudiobooksAsync(fbd.SelectedPath, tokenSource.Token))
{
try
{