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

update dependencies

Browse Source
This commit is contained in:
Robert McRackan 2022-08-08 11:47:08 -04:00
parent 3272541e81
commit 86c7f89788
13 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/AppScaffolding/AppScaffolding.csproj
View File

@ -5,7 +5,7 @@
<Version>8.3.6.1</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Octokit" Version="1.0.1" />
<PackageReference Include="Octokit" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />

4
Source/FileManager/FileNamingTemplate.cs
View File

@ -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<string,string> paramReplacements, int maxFilenameLength)
private static string replaceFileName(string filename, Dictionary<string,string> paramReplacements, int maxFilenameLength)
{
List<StringBuilder> 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 "";

2
Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs
View File

@ -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();

6
Source/LibationFileManager/PictureStorage.cs
View File

@ -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)

4
Source/LibationWinForms/Dialogs/BookDetailsDialog.cs
View File

@ -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();

2
Source/LibationWinForms/Form1._NonUI.cs
View File

@ -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

4
Source/LibationWinForms/GridView/EditTagsDataGridViewImageButtonColumn.cs
View File

@ -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
{

2
Source/LibationWinForms/GridView/GridEntry.cs
View File

@ -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;

2
Source/LibationWinForms/GridView/ImageDisplay.cs
View File

@ -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;

6
Source/LibationWinForms/GridView/LiberateDataGridViewImageButtonColumn.cs
View File

@ -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
{

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

@ -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
{

2
Source/LibationWinForms/LibationWinForms.csproj
View File

@ -44,7 +44,7 @@
<ItemGroup>
<PackageReference Include="Autoupdater.NET.Official" Version="1.7.4" />
<PackageReference Include="Dinah.Core.WindowsDesktop" Version="5.0.0.1" />
<PackageReference Include="Dinah.Core.WindowsDesktop" Version="5.2.0.1" />
</ItemGroup>
<ItemGroup>

7
Source/LibationWinForms/ProcessQueue/ProcessBook.cs
View File

@ -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