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

All books that pass the filter are counted as "visible" (#536)

Browse Source
This commit is contained in:
MBucari 2023-03-17 19:31:36 -06:00
parent 2725340994
commit 18cf20ecad
3 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs
View File

@ -5,7 +5,6 @@ using Avalonia.Threading;
using DataLayer;
using LibationAvalonia.Dialogs.Login;
using LibationUiBase.GridView;
using NPOI.SS.Formula.Functions;
using ReactiveUI;
using System;
using System.Collections.Generic;
@ -32,10 +31,14 @@ namespace LibationAvalonia.ViewModels
public bool RemoveColumnVisivle { get => _removeColumnVisivle; private set => this.RaiseAndSetIfChanged(ref _removeColumnVisivle, value); }
public List<LibraryBook> GetVisibleBookEntries()
=> GridEntries
.OfType<ILibraryBookEntry>()
.Select(lbe => lbe.LibraryBook)
.ToList();
=> FilteredInGridEntries?
.OfType<ILibraryBookEntry>()
.Select(lbe => lbe.LibraryBook)
.ToList()
?? SOURCE
.OfType<ILibraryBookEntry>()
.Select(lbe => lbe.LibraryBook)
.ToList();
private IEnumerable<ILibraryBookEntry> GetAllBookEntries()
=> SOURCE
@ -122,7 +125,13 @@ namespace LibationAvalonia.ViewModels
}
private void GridEntries_CollectionChanged(object sender = null, EventArgs e = null)
=> VisibleCountChanged?.Invoke(this, GridEntries.OfType<ILibraryBookEntry>().Count());
{
var count
= FilteredInGridEntries?.OfType<ILibraryBookEntry>().Count()
?? SOURCE.OfType<ILibraryBookEntry>().Count();
VisibleCountChanged?.Invoke(this, count);
}
/// <summary>
/// Call when there's been a change to the library

16
Source/LibationWinForms/GridView/GridEntryBindingList.cs
View File

@ -28,6 +28,18 @@ namespace LibationWinForms.GridView
/// <returns>All items in the list, including those filtered out.</returns>
public List<IGridEntry> AllItems() => Items.Concat(FilterRemoved).ToList();
/// <summary>All items that pass the current filter</summary>
public IEnumerable<ILibraryBookEntry> GetFilteredInItems()
=> SearchResults is null
? FilterRemoved
.OfType<ILibraryBookEntry>()
.Union(Items.OfType<ILibraryBookEntry>())
: FilterRemoved
.OfType<ILibraryBookEntry>()
.Join(SearchResults.Docs, o => o.Book.AudibleProductId, i => i.ProductId, (o, _) => o)
.Union(Items.OfType<ILibraryBookEntry>());
public bool SupportsFiltering => true;
public string Filter { get => FilterString; set => ApplyFilter(value); }
@ -102,7 +114,7 @@ namespace LibationWinForms.GridView
public void CollapseItem(ISeriesEntry sEntry)
{
foreach (var episode in Items.BookEntries().Where(b => b.Parent == sEntry).ToList())
foreach (var episode in sEntry.Children.Join(Items.BookEntries(), o => o, i => i, (_, i) => i).ToList())
{
FilterRemoved.Add(episode);
base.Remove(episode);
@ -115,7 +127,7 @@ namespace LibationWinForms.GridView
{
var sindex = Items.IndexOf(sEntry);
foreach (var episode in FilterRemoved.BookEntries().Where(b => b.Parent == sEntry).ToList())
foreach (var episode in sEntry.Children.Join(FilterRemoved.BookEntries(), o => o, i => i, (_, i) => i).ToList())
{
if (SearchResults is null || SearchResults.Docs.Any(d => d.ProductId == episode.AudibleProductId))
{

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

@ -7,7 +7,6 @@ using LibationWinForms.Dialogs;
using System;
using System.Collections.Generic;
using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.Linq;
using System.Threading.Tasks;
@ -34,7 +33,7 @@ namespace LibationWinForms.GridView
private GridEntryBindingList bindingList;
internal IEnumerable<LibraryBook> GetVisibleBooks()
=> bindingList
.BookEntries()
.GetFilteredInItems()
.Select(lbe => lbe.LibraryBook);
internal IEnumerable<ILibraryBookEntry> GetAllBookEntries()
=> bindingList.AllItems().BookEntries();
@ -84,7 +83,7 @@ namespace LibationWinForms.GridView
else
bindingList.ExpandItem(sEntry);
VisibleCountChanged?.Invoke(this, bindingList.BookEntries().Count());
VisibleCountChanged?.Invoke(this, bindingList.GetFilteredInItems().Count());
}
else if (e.ColumnIndex == descriptionGVColumn.Index)
DescriptionClicked?.Invoke(sEntry, gridEntryDataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false));
@ -248,7 +247,7 @@ namespace LibationWinForms.GridView
bindingList = new GridEntryBindingList(geList.OrderByDescending(e => e.DateAdded));
bindingList.CollapseAll();
syncBindingSource.DataSource = bindingList;
VisibleCountChanged?.Invoke(this, bindingList.BookEntries().Count());
VisibleCountChanged?.Invoke(this, bindingList.GetFilteredInItems().Count());
}
internal void UpdateGrid(List<LibraryBook> dbBooks)
@ -317,7 +316,7 @@ namespace LibationWinForms.GridView
//no need to re-filter for removed books
bindingList.Remove(removed);
VisibleCountChanged?.Invoke(this, bindingList.BookEntries().Count());
VisibleCountChanged?.Invoke(this, bindingList.GetFilteredInItems().Count());
}
private void AddOrUpdateBook(LibraryBook book, ILibraryBookEntry existingBookEntry)
@ -364,6 +363,7 @@ namespace LibationWinForms.GridView
//Series exists. Create and add episode child then update the SeriesEntry
episodeEntry = new LibraryBookEntry<WinFormsEntryStatus>(episodeBook, seriesEntry);
seriesEntry.Children.Add(episodeEntry);
seriesEntry.Children.Sort((c1,c2) => c1.SeriesIndex.CompareTo(c2.SeriesIndex));
var seriesBook = dbBooks.Single(lb => lb.Book.AudibleProductId == seriesEntry.LibraryBook.Book.AudibleProductId);
seriesEntry.UpdateLibraryBook(seriesBook);
}
@ -395,7 +395,7 @@ namespace LibationWinForms.GridView
syncBindingSource.Filter = searchString;
if (visibleCount != bindingList.Count)
VisibleCountChanged?.Invoke(this, bindingList.BookEntries().Count());
VisibleCountChanged?.Invoke(this, bindingList.GetFilteredInItems().Count());
}
#endregion