Use new Dinah.Core string extensions.

This commit is contained in:
Michael Bucari-Tovo 2021-08-18 14:11:25 -06:00
parent 215a626c92
commit 64a8f007a5

View File

@ -7,6 +7,7 @@ using System.Linq;
using ApplicationServices; using ApplicationServices;
using DataLayer; using DataLayer;
using Dinah.Core.DataBinding; using Dinah.Core.DataBinding;
using Dinah.Core;
using Dinah.Core.Drawing; using Dinah.Core.Drawing;
namespace LibationWinForms namespace LibationWinForms
@ -47,9 +48,9 @@ namespace LibationWinForms
Title = Book.Title; Title = Book.Title;
Series = Book.SeriesNames; Series = Book.SeriesNames;
Length = Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min"; Length = Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min";
MyRating = ValueOrDefault(Book.UserDefinedItem.Rating?.ToStarString(), ""); MyRating = Book.UserDefinedItem.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
PurchaseDate = libraryBook.DateAdded.ToString("d"); PurchaseDate = libraryBook.DateAdded.ToString("d");
ProductRating = ValueOrDefault(Book.Rating?.ToStarString(), ""); ProductRating = Book.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
Authors = Book.AuthorNames; Authors = Book.AuthorNames;
Narrators = Book.NarratorNames; Narrators = Book.NarratorNames;
Category = string.Join(" > ", Book.CategoriesNames); Category = string.Join(" > ", Book.CategoriesNames);
@ -207,8 +208,8 @@ namespace LibationWinForms
{ {
var details = new List<string>(); var details = new List<string>();
var locale = ValueOrDefault(libraryBook.Book.Locale, "[unknown]"); var locale = libraryBook.Book.Locale.DefaultIfNullOrWhiteSpace("[unknown]");
var acct = ValueOrDefault(libraryBook.Account, "[unknown]"); var acct = libraryBook.Account.DefaultIfNullOrWhiteSpace("[unknown]");
details.Add($"Account: {locale} - {acct}"); details.Add($"Account: {locale} - {acct}");
@ -228,10 +229,6 @@ namespace LibationWinForms
return string.Join("\r\n", details); return string.Join("\r\n", details);
} }
//Maybe add to Dinah StringExtensions?
private static string ValueOrDefault(string value, string defaultValue)
=> string.IsNullOrWhiteSpace(value) ? defaultValue : value;
#endregion #endregion
} }
} }