From 21d18aa565912eb3bfeff959cd07af2b3fcea353 Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Sun, 19 Feb 2023 10:38:19 -0700 Subject: [PATCH] Final edits --- Scripts/Bundle_MacOS.sh | 2 +- Source/AaxDecrypter/AudiobookDownloadBase.cs | 2 +- .../LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Scripts/Bundle_MacOS.sh b/Scripts/Bundle_MacOS.sh index cb837dd1..d9bd31b9 100644 --- a/Scripts/Bundle_MacOS.sh +++ b/Scripts/Bundle_MacOS.sh @@ -94,7 +94,7 @@ do rm $BUNDLE_MACOS/$n done -APP_FILE=Libation.${VERSION}-chardonnay-macOS-${ARCH}.tgz +APP_FILE=Libation.${VERSION}-macOS-chardonnay-${ARCH}.tgz echo "Creating app bundle: $APP_FILE" tar -czvf $APP_FILE $BUNDLE diff --git a/Source/AaxDecrypter/AudiobookDownloadBase.cs b/Source/AaxDecrypter/AudiobookDownloadBase.cs index ca730ca1..fbbb3716 100644 --- a/Source/AaxDecrypter/AudiobookDownloadBase.cs +++ b/Source/AaxDecrypter/AudiobookDownloadBase.cs @@ -59,7 +59,7 @@ namespace AaxDecrypter { BytesReceived = 0, ProgressPercentage = 0, - TotalBytesToReceive = InputFileStream.Length + TotalBytesToReceive = 0 }; OnDecryptProgressUpdate(zeroProgress); diff --git a/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs b/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs index 2083768c..db25a07e 100644 --- a/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs +++ b/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs @@ -10,8 +10,6 @@ using ApplicationServices; using AudibleUtilities; using LibationAvalonia.Dialogs.Login; using Avalonia.Collections; -using LibationSearchEngine; -using Octokit.Internal; namespace LibationAvalonia.ViewModels { @@ -62,6 +60,7 @@ namespace LibationAvalonia.ViewModels { var existingSeriesEntries = SOURCE.SeriesEntries().ToList(); + FilteredInGridEntries?.Clear(); SOURCE.Clear(); SOURCE.AddRange(CreateGridEntries(dbBooks)); @@ -164,7 +163,7 @@ namespace LibationAvalonia.ViewModels return FilteredInGridEntries.Contains(item); } - private static List QueryResults(List entries, string searchString) + private static List QueryResults(IEnumerable entries, string searchString) { if (string.IsNullOrEmpty(searchString)) return null;