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

Minor refactoring.

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2022-06-08 08:52:25 -06:00
parent cf1bc1c252
commit 30ba69eca7
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/FileLiberator/Processable.cs
View File

@ -29,8 +29,7 @@ namespace FileLiberator
public IEnumerable<LibraryBook> GetValidLibraryBooks(IEnumerable<LibraryBook> library) public IEnumerable<LibraryBook> GetValidLibraryBooks(IEnumerable<LibraryBook> library)
=> library.Where(libraryBook => => library.Where(libraryBook =>
Validate(libraryBook) Validate(libraryBook)
&& libraryBook.Book.ContentType != ContentType.Parent && (libraryBook.Book.ContentType != ContentType.Episode || LibationFileManager.Configuration.Instance.DownloadEpisodes)
&& (libraryBook.Book.ContentType != ContentType.Episode || Configuration.Instance.DownloadEpisodes)
); );
public async Task<StatusHandler> ProcessSingleAsync(LibraryBook libraryBook, bool validate) public async Task<StatusHandler> ProcessSingleAsync(LibraryBook libraryBook, bool validate)

12
Source/LibationWinForms/GridView/ProductsGrid.cs
View File

@ -93,12 +93,11 @@ namespace LibationWinForms.GridView
{ {
var geList = dbBooks.Where(lb => lb.IsProduct()).Select(b => new LibraryBookEntry(b)).Cast<GridEntry>().ToList(); var geList = dbBooks.Where(lb => lb.IsProduct()).Select(b => new LibraryBookEntry(b)).Cast<GridEntry>().ToList();
var parents = dbBooks.Where(lb => lb.IsEpisodeParent());
var episodes = dbBooks.Where(lb => lb.IsEpisodeChild()); var episodes = dbBooks.Where(lb => lb.IsEpisodeChild());
foreach (var parent in parents) foreach (var parent in dbBooks.Where(lb => lb.IsEpisodeParent()))
{ {
var seriesEpisodes = episodes.Where(lb => lb.Book.SeriesLink?.Any(s => s.Series.AudibleSeriesId == parent.Book.AudibleProductId) == true).ToList(); var seriesEpisodes = episodes.FindChildren(parent).ToList();
if (!seriesEpisodes.Any()) continue; if (!seriesEpisodes.Any()) continue;
@ -133,10 +132,10 @@ namespace LibationWinForms.GridView
{ {
var existingEntry = allEntries.FindByAsin(libraryBook.Book.AudibleProductId); var existingEntry = allEntries.FindByAsin(libraryBook.Book.AudibleProductId);
if (libraryBook.IsEpisodeChild()) if (libraryBook.IsProduct())
AddOrUpdateEpisode(libraryBook, existingEntry, seriesEntries, dbBooks);
else if (libraryBook.IsProduct())
AddOrUpdateBook(libraryBook, existingEntry); AddOrUpdateBook(libraryBook, existingEntry);
else if(libraryBook.IsEpisodeChild())
AddOrUpdateEpisode(libraryBook, existingEntry, seriesEntries, dbBooks);
} }
bindingList.SuspendFilteringOnUpdate = false; bindingList.SuspendFilteringOnUpdate = false;
@ -198,6 +197,7 @@ namespace LibationWinForms.GridView
if (seriesBook is null) if (seriesBook is null)
{ {
//This should be impossible because the importer ensures every episode has a parent.
var ex = new ApplicationException($"Episode's series parent not found in database."); var ex = new ApplicationException($"Episode's series parent not found in database.");
var seriesLinks = string.Join("\r\n", episodeBook.Book.SeriesLink?.Select(sb => $"{nameof(sb.Series.Name)}={sb.Series.Name}, {nameof(sb.Series.AudibleSeriesId)}={sb.Series.AudibleSeriesId}")); var seriesLinks = string.Join("\r\n", episodeBook.Book.SeriesLink?.Select(sb => $"{nameof(sb.Series.Name)}={sb.Series.Name}, {nameof(sb.Series.AudibleSeriesId)}={sb.Series.AudibleSeriesId}"));
Serilog.Log.Logger.Error(ex, "Episode={episodeBook}, Series: {seriesLinks}", episodeBook, seriesLinks); Serilog.Log.Logger.Error(ex, "Episode={episodeBook}, Series: {seriesLinks}", episodeBook, seriesLinks);

3
Source/LibationWinForms/GridView/QueryExtensions.cs
View File

@ -8,6 +8,9 @@ namespace LibationWinForms.GridView
#nullable enable #nullable enable
internal static class QueryExtensions internal static class QueryExtensions
{ {
public static IEnumerable<LibraryBook> FindChildren(this IEnumerable<LibraryBook> bookList, LibraryBook parent)
=> bookList.Where(lb => lb.Book.SeriesLink?.Any(s => s.Series.AudibleSeriesId == parent.Book.AudibleProductId) == true);
public static IEnumerable<LibraryBookEntry> BookEntries(this IEnumerable<GridEntry> gridEntries) public static IEnumerable<LibraryBookEntry> BookEntries(this IEnumerable<GridEntry> gridEntries)
=> gridEntries.OfType<LibraryBookEntry>(); => gridEntries.OfType<LibraryBookEntry>();