diff --git a/Source/AppScaffolding/AppScaffolding.csproj b/Source/AppScaffolding/AppScaffolding.csproj index bafc756f..d3e0854c 100644 --- a/Source/AppScaffolding/AppScaffolding.csproj +++ b/Source/AppScaffolding/AppScaffolding.csproj @@ -5,7 +5,7 @@ 8.3.6.1 - + diff --git a/Source/FileManager/FileNamingTemplate.cs b/Source/FileManager/FileNamingTemplate.cs index 4d79c5af..7b98b5e9 100644 --- a/Source/FileManager/FileNamingTemplate.cs +++ b/Source/FileManager/FileNamingTemplate.cs @@ -52,7 +52,7 @@ namespace FileManager return FileUtility.GetValidFilename(Path.Join(directory, replaceFileName(fileNamePart, paramReplacements, LongPath.MaxFilenameLength - 5)), replacements, returnFirstExisting); } - private string replaceFileName(string filename, Dictionary paramReplacements, int maxFilenameLength) + private static string replaceFileName(string filename, Dictionary paramReplacements, int maxFilenameLength) { List filenameParts = new(); //Build the filename in parts, replacing replacement parameters with @@ -98,7 +98,7 @@ namespace FileManager return string.Join("", filenameParts); } - private string formatValue(object value, ReplacementCharacters replacements) + private static string formatValue(object value, ReplacementCharacters replacements) { if (value is null) return ""; diff --git a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs index 91fcc3f5..619eaa1d 100644 --- a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs +++ b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs @@ -122,7 +122,7 @@ Narrator(s): {libraryBook.Book.NarratorNames()} Length: {(libraryBook.Book.LengthInMinutes == 0 ? "" : $"{libraryBook.Book.LengthInMinutes / 60} hr {libraryBook.Book.LengthInMinutes % 60} min")} Audio Bitrate: {libraryBook.Book.AudioFormat} Category: {string.Join(" > ", libraryBook.Book.CategoriesNames())} -Purchase Date: {libraryBook.DateAdded.ToString("d")} +Purchase Date: {libraryBook.DateAdded:d} Audible ID: {libraryBook.Book.AudibleProductId} ".Trim(); diff --git a/Source/LibationFileManager/PictureStorage.cs b/Source/LibationFileManager/PictureStorage.cs index ba5cea1a..5360501a 100644 --- a/Source/LibationFileManager/PictureStorage.cs +++ b/Source/LibationFileManager/PictureStorage.cs @@ -71,6 +71,12 @@ namespace LibationFileManager } } + public static string GetPicturePathSynchronously(PictureDefinition def) + { + GetPictureSynchronously(def); + return getPath(def); + } + public static byte[] GetPictureSynchronously(PictureDefinition def) { lock (cacheLocker) diff --git a/Source/LibationWinForms/Dialogs/BookDetailsDialog.cs b/Source/LibationWinForms/Dialogs/BookDetailsDialog.cs index 6ddf6f5f..8dd125e8 100644 --- a/Source/LibationWinForms/Dialogs/BookDetailsDialog.cs +++ b/Source/LibationWinForms/Dialogs/BookDetailsDialog.cs @@ -42,7 +42,7 @@ namespace LibationWinForms.Dialogs this.Text = Book.Title; (_, var picture) = PictureStorage.GetPicture(new PictureDefinition(Book.PictureId, PictureSize._80x80)); - this.coverPb.Image = Dinah.Core.Drawing.ImageReader.ToImage(picture); + this.coverPb.Image = Dinah.Core.WindowsDesktop.Drawing.ImageReader.ToImage(picture); var t = @$" Title: {Book.Title} @@ -51,7 +51,7 @@ Narrator(s): {Book.NarratorNames()} Length: {(Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min")} Audio Bitrate: {Book.AudioFormat} Category: {string.Join(" > ", Book.CategoriesNames())} -Purchase Date: {_libraryBook.DateAdded.ToString("d")} +Purchase Date: {_libraryBook.DateAdded:d} Audible ID: {Book.AudibleProductId} ".Trim(); diff --git a/Source/LibationWinForms/Form1._NonUI.cs b/Source/LibationWinForms/Form1._NonUI.cs index c94611be..e17a81a3 100644 --- a/Source/LibationWinForms/Form1._NonUI.cs +++ b/Source/LibationWinForms/Form1._NonUI.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using ApplicationServices; -using Dinah.Core.Drawing; +using Dinah.Core.WindowsDesktop.Drawing; using LibationFileManager; namespace LibationWinForms diff --git a/Source/LibationWinForms/GridView/EditTagsDataGridViewImageButtonColumn.cs b/Source/LibationWinForms/GridView/EditTagsDataGridViewImageButtonColumn.cs index 065afdbb..9cc165dd 100644 --- a/Source/LibationWinForms/GridView/EditTagsDataGridViewImageButtonColumn.cs +++ b/Source/LibationWinForms/GridView/EditTagsDataGridViewImageButtonColumn.cs @@ -1,6 +1,6 @@ -using Dinah.Core.Windows.Forms; -using System.Drawing; +using System.Drawing; using System.Windows.Forms; +using Dinah.Core.WindowsDesktop.Forms; namespace LibationWinForms.GridView { diff --git a/Source/LibationWinForms/GridView/GridEntry.cs b/Source/LibationWinForms/GridView/GridEntry.cs index 6515a677..54afcc24 100644 --- a/Source/LibationWinForms/GridView/GridEntry.cs +++ b/Source/LibationWinForms/GridView/GridEntry.cs @@ -1,7 +1,7 @@ using DataLayer; using Dinah.Core; using Dinah.Core.DataBinding; -using Dinah.Core.Drawing; +using Dinah.Core.WindowsDesktop.Drawing; using LibationFileManager; using System; using System.Collections; diff --git a/Source/LibationWinForms/GridView/ImageDisplay.cs b/Source/LibationWinForms/GridView/ImageDisplay.cs index 831b8ec9..6f74cd04 100644 --- a/Source/LibationWinForms/GridView/ImageDisplay.cs +++ b/Source/LibationWinForms/GridView/ImageDisplay.cs @@ -9,7 +9,7 @@ namespace LibationWinForms.GridView { public string PictureFileName { get; set; } public string BookSaveDirectory { get; set; } - public byte[] CoverPicture { get => _coverBytes; set => pictureBox1.Image = Dinah.Core.Drawing.ImageReader.ToImage(_coverBytes = value); } + public byte[] CoverPicture { get => _coverBytes; set => pictureBox1.Image = Dinah.Core.WindowsDesktop.Drawing.ImageReader.ToImage(_coverBytes = value); } private byte[] _coverBytes; diff --git a/Source/LibationWinForms/GridView/LiberateDataGridViewImageButtonColumn.cs b/Source/LibationWinForms/GridView/LiberateDataGridViewImageButtonColumn.cs index 6e696cb8..5d0a2d10 100644 --- a/Source/LibationWinForms/GridView/LiberateDataGridViewImageButtonColumn.cs +++ b/Source/LibationWinForms/GridView/LiberateDataGridViewImageButtonColumn.cs @@ -1,8 +1,8 @@ -using DataLayer; -using Dinah.Core.Windows.Forms; -using System; +using System; using System.Drawing; using System.Windows.Forms; +using DataLayer; +using Dinah.Core.WindowsDesktop.Forms; namespace LibationWinForms.GridView { diff --git a/Source/LibationWinForms/GridView/ProductsGrid.cs b/Source/LibationWinForms/GridView/ProductsGrid.cs index f7905a4e..ab4507be 100644 --- a/Source/LibationWinForms/GridView/ProductsGrid.cs +++ b/Source/LibationWinForms/GridView/ProductsGrid.cs @@ -1,12 +1,12 @@ -using DataLayer; -using Dinah.Core.Windows.Forms; -using LibationFileManager; -using System; +using System; using System.Collections.Generic; using System.Data; using System.Drawing; using System.Linq; using System.Windows.Forms; +using DataLayer; +using Dinah.Core.WindowsDesktop.Forms; +using LibationFileManager; namespace LibationWinForms.GridView { diff --git a/Source/LibationWinForms/LibationWinForms.csproj b/Source/LibationWinForms/LibationWinForms.csproj index 1358dbb4..8d4373a7 100644 --- a/Source/LibationWinForms/LibationWinForms.csproj +++ b/Source/LibationWinForms/LibationWinForms.csproj @@ -44,7 +44,7 @@ - + diff --git a/Source/LibationWinForms/ProcessQueue/ProcessBook.cs b/Source/LibationWinForms/ProcessQueue/ProcessBook.cs index 0b5655f5..4d538a43 100644 --- a/Source/LibationWinForms/ProcessQueue/ProcessBook.cs +++ b/Source/LibationWinForms/ProcessQueue/ProcessBook.cs @@ -9,6 +9,7 @@ using System.Windows.Forms; using ApplicationServices; using DataLayer; using Dinah.Core; +using Dinah.Core.WindowsDesktop.Drawing; using FileLiberator; using LibationFileManager; @@ -80,7 +81,7 @@ namespace LibationWinForms.ProcessQueue if (isDefault) PictureStorage.PictureCached += PictureStorage_PictureCached; - _cover = Dinah.Core.Drawing.ImageReader.ToImage(picture); + _cover = ImageReader.ToImage(picture); } @@ -88,7 +89,7 @@ namespace LibationWinForms.ProcessQueue { if (e.Definition.PictureId == LibraryBook.Book.PictureId) { - Cover = Dinah.Core.Drawing.ImageReader.ToImage(e.Picture); + Cover = ImageReader.ToImage(e.Picture); PictureStorage.PictureCached -= PictureStorage_PictureCached; } } @@ -240,7 +241,7 @@ namespace LibationWinForms.ProcessQueue private void AudioDecodable_CoverImageDiscovered(object sender, byte[] coverArt) { - Cover = Dinah.Core.Drawing.ImageReader.ToImage(coverArt); + Cover = ImageReader.ToImage(coverArt); } #endregion