Second bug fix for issue 263

Fix my own screwup

Source/AppScaffolding/AppScaffolding.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-    <Version>7.10.0.1</Version>
+    <Version>7.10.2.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

Source/AudibleUtilities/ApiExtended.cs

@@ -149,7 +149,7 @@ namespace AudibleUtilities
 			Serilog.Log.Logger.Debug("Completed library scan.");
 
 #if DEBUG
-//System.IO.File.WriteAllText(library_json, AudibleApi.Common.Converter.ToJson(items));
+			//System.IO.File.WriteAllText(library_json, AudibleApi.Common.Converter.ToJson(items));
 #endif
 			var validators = new List<IValidator>();
 			validators.AddRange(getValidators());
@@ -164,7 +164,7 @@ namespace AudibleUtilities
 		}
 
 		#region episodes and podcasts
-		
+
 		private async Task<List<Item>> getChildEpisodesAsync(SemaphoreSlim concurrencySemaphore, Item parent)
 		{
 			await concurrencySemaphore.WaitAsync();
@@ -175,10 +175,14 @@ namespace AudibleUtilities
 
 				var children = await getEpisodeChildrenAsync(parent);
 
-				// actual individual episode, not the parent of a series.
-				// for now I'm keeping it inside this method since it fits the work flow, incl. importEpisodes logic
 				if (!children.Any())
-					return new List<Item>() { parent };
+				{
+					//The parent is the only episode in the podcase series,
+					//so the parent is its own child.
+					parent.Series = new Series[] { new Series { Asin = parent.Asin, Sequence = RelationshipToProduct.Parent, Title = parent.TitleWithSubtitle } };
+					children.Add(parent);
+					return children;
+				}
 
 				foreach (var child in children)
 				{
@@ -191,7 +195,7 @@ namespace AudibleUtilities
 						{
 							Asin = parent.Asin,
 							// This should properly be Single() not FirstOrDefault(), but FirstOrDefault is defensive for malformed data from audible
-							Sequence = parent.Relationships.FirstOrDefault(r => r.Asin == child.Asin).Sort.ToString(),
+							Sequence = parent.Relationships.FirstOrDefault(r => r.Asin == child.Asin)?.Sort?.ToString() ?? "0",
 							Title = parent.TitleWithSubtitle
 						}
 					};
@@ -239,8 +243,8 @@ namespace AudibleUtilities
 				{
 					childrenBatch = await Api.GetCatalogProductsAsync(idBatch, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
 #if DEBUG
-//var childrenBatchDebug = childrenBatch.Select(i => i.ToJson()).Aggregate((a, b) => $"{a}\r\n\r\n{b}");
-//System.IO.File.WriteAllText($"children of {parent.Asin}.json", childrenBatchDebug);
+					//var childrenBatchDebug = childrenBatch.Select(i => i.ToJson()).Aggregate((a, b) => $"{a}\r\n\r\n{b}");
+					//System.IO.File.WriteAllText($"children of {parent.Asin}.json", childrenBatchDebug);
 #endif
 				}
 				catch (Exception ex)

Source/FileManager/BackgroundFileSystem.cs

@@ -134,7 +134,8 @@ namespace FileManager
 
         private void AddPath(string path)
         {
-            if (!File.Exists(path)) return;
+            if (!File.Exists(path) && !Directory.Exists(path))
+                return;
             if (File.GetAttributes(path).HasFlag(FileAttributes.Directory))
                 AddUniqueFiles(FileUtility.SaferEnumerateFiles(path, SearchPattern, SearchOption));
             else

Source/LibationWinForms/GridView/GridEntry.cs

@@ -109,5 +109,6 @@ namespace LibationWinForms.GridView
 			=> gridEntries.Series().FirstOrDefault(i => matchSeries.Any(s => s.Series.Name == i.Series));
 		public static IEnumerable<SeriesEntry> EmptySeries(this IEnumerable<GridEntry> gridEntries)
 			=> gridEntries.Series().Where(i => i.Children.Count == 0);
+		public static bool IsEpisodeChild(this LibraryBook lb) => lb.Book.ContentType == ContentType.Episode;
 	}
 }

Source/LibationWinForms/GridView/ProductsDisplay.cs

@@ -84,18 +84,25 @@ namespace LibationWinForms.GridView
 
 		public void Display()
 		{
-			// don't return early if lib size == 0. this will not update correctly if all books are removed
-			var lib = DbContexts.GetLibrary_Flat_NoTracking();
-
-			if (!hasBeenDisplayed)
+			try
 			{
-				// bind
-				productsGrid.BindToGrid(lib);
-				hasBeenDisplayed = true;
-				InitialLoaded?.Invoke(this, new());
+				// don't return early if lib size == 0. this will not update correctly if all books are removed
+				var lib = DbContexts.GetLibrary_Flat_NoTracking();
+
+				if (!hasBeenDisplayed)
+				{
+					// bind
+					productsGrid.BindToGrid(lib);
+					hasBeenDisplayed = true;
+					InitialLoaded?.Invoke(this, new());
+				}
+				else
+					productsGrid.UpdateGrid(lib);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "Error displaying library in {0}", nameof(ProductsDisplay));
 			}
-			else
-				productsGrid.UpdateGrid(lib);
 
 		}
 

Source/LibationWinForms/GridView/ProductsGrid.cs

@@ -84,11 +84,12 @@ namespace LibationWinForms.GridView
 		{
 			var geList = dbBooks.Where(b => b.Book.ContentType is not ContentType.Episode).Select(b => new LibraryBookEntry(b)).Cast<GridEntry>().ToList();
 
-			var episodes = dbBooks.Where(b => b.Book.ContentType is ContentType.Episode).ToList();
+			var episodes = dbBooks.Where(b => b.IsEpisodeChild()).ToList();
 
-			foreach (var series in episodes.Select(lb => lb.Book.SeriesLink.First()).DistinctBy(s => s.Series))
+			var allSeries = episodes.SelectMany(lb => lb.Book.SeriesLink.Where(s => !s.Series.AudibleSeriesId.StartsWith("SERIES_"))).DistinctBy(s => s.Series).ToList();
+			foreach (var series in allSeries)
 			{
-				var seriesEntry = new SeriesEntry(series, episodes.Where(lb => lb.Book.SeriesLink.First().Series == series.Book.SeriesLink.First().Series));
+				var seriesEntry = new SeriesEntry(series, episodes.Where(lb => lb.Book.SeriesLink.Any(s => s.Series == series.Series)));
 
 				geList.Add(seriesEntry);
 				geList.AddRange(seriesEntry.Children);
@@ -117,7 +118,7 @@ namespace LibationWinForms.GridView
 				// add new to top
 				if (existingItem is null)
 				{
-					if (libraryBook.Book.ContentType is ContentType.Episode)
+					if (libraryBook.IsEpisodeChild())
 					{
 						LibraryBookEntry lbe;
 						//Find the series that libraryBook belongs to, if it exists
@@ -148,7 +149,7 @@ namespace LibationWinForms.GridView
 
 						series.NotifyPropertyChanged();
 					}
-					else
+					else if (libraryBook.Book.ContentType is not ContentType.Episode)
 						//Add the new product
 						bindingList.Insert(0, new LibraryBookEntry(libraryBook));
 				}