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

Revert "Match rmcrackan's changes"

Browse Source 
This reverts commit 52622fadbb50a14141098fbf809573ab569593b2.
This commit is contained in:
Michael Bucari-Tovo 2022-06-23 11:34:29 -06:00
parent 29c7344540
commit 71192cc2ee
15 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/AaxDecrypter/NetworkFileStream.cs
View File

@ -218,7 +218,7 @@ namespace AaxDecrypter
}
/// <summary>
/// Download <see cref="Uri"/> to <see cref="SaveFilePath"/>.
/// Downlod <see cref="Uri"/> to <see cref="SaveFilePath"/>.
/// </summary>
private void DownloadFile()
{

2
Source/AppScaffolding/LibationScaffolding.cs
View File

@ -473,7 +473,7 @@ namespace AppScaffolding
}
catch (Exception ex)
{
Serilog.Log.Logger.Error(ex, "An error occurred while running database migrations in {0}", nameof(migrate_from_7_10_1));
Serilog.Log.Logger.Error(ex, "An error occured while running database migrations in {0}", nameof(migrate_from_7_10_1));
config.SetObject($"{nameof(migrate_from_7_10_1)}_ThrewError", true);
}
}

10
Source/ApplicationServices/LibraryCommands.cs
View File

@ -134,7 +134,7 @@ namespace ApplicationServices
if (newParents >= 0)
{
//If any episodes are still orphaned, their series have been
//removed from the catalog and we'll never be able to find them.
//removed from the catalog and wel'll never be able to find them.
//only do this if findAndAddMissingParents returned >= 0. If it
//returned < 0, an error happened and there's still a chance that
@ -251,7 +251,7 @@ namespace ApplicationServices
}
catch (Exception ex)
{
Serilog.Log.Logger.Error(ex, "An error occurred while trying to remove orphaned episodes from the database");
Serilog.Log.Logger.Error(ex, "An error occured while trying to remove orphaned episodes from the database");
}
}
@ -274,7 +274,7 @@ namespace ApplicationServices
.DistinctBy(s => s.Series.AudibleSeriesId)
.ToList();
// The Catalog endpoint does not require authentication.
// The Catalog endpointdoes not require authentication.
var api = new ApiUnauthenticated(accounts[0].Locale);
var seriesParents = orphanedSeries.Select(o => o.Series.AudibleSeriesId).ToList();
@ -308,7 +308,7 @@ namespace ApplicationServices
}
catch (Exception ex)
{
Serilog.Log.Logger.Error(ex, "An error occurred while trying to scan for orphaned episode parents.");
Serilog.Log.Logger.Error(ex, "An error occured while trying to scan for orphaned episode parents.");
return -1;
}
}
@ -321,7 +321,7 @@ namespace ApplicationServices
}
catch (Microsoft.EntityFrameworkCore.DbUpdateException ex)
{
// DbUpdateException exceptions can wreck serilog. Condense it until we can find a better solution. I suspect the culprit is the "WithExceptionDetails" serilog extension
// DbUpdateException exceptions can wreck serilog. Condense it until we can find a better solution. I suspect the culpret is the "WithExceptionDetails" serilog extension
static string format(Exception ex) => $"\r\nMessage: {ex.Message}\r\nStack Trace:\r\n{ex.StackTrace}";

2
Source/AudibleUtilities/ApiExtended.cs
View File

@ -145,7 +145,7 @@ namespace AudibleUtilities
Serilog.Log.Logger.Debug("Library scan complete. Found {count} books and series. Waiting on {getChildEpisodesTasksCount} series episode scans to complete.", count, getChildEpisodesTasks.Count);
//await and add all episodes from all parents
//await and add all episides from all parents
foreach (var epList in await Task.WhenAll(getChildEpisodesTasks))
items.AddRange(epList);

2
Source/AudibleUtilities/AudibleUtilities.csproj
View File

@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AudibleApi" Version="4.1.1.1" />
<PackageReference Include="AudibleApi" Version="4.1.0.1" />
</ItemGroup>
<ItemGroup>

2
Source/DataLayer/DataLayer.csproj
View File

@ -12,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.1.1" />
<PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

3
Source/DtoImporterService/BookImporter.cs
View File

@ -101,8 +101,7 @@ namespace DtoImporterService
// absence of categories is also possible
// CATEGORY HACK: only use the 1st 2 categories
// after we support full arbitrary-depth category trees and multiple categories per book, the real impl will be something like this
// var lastCategory = item.Categories.LastOrDefault()?.CategoryId ?? "";
// (real impl: var lastCategory = item.Categories.LastOrDefault()?.CategoryId ?? "";)
var lastCategory
= item.Categories.Length == 0 ? ""
: item.Categories.Length == 1 ? item.Categories[0].CategoryId

2
Source/FileLiberator/DownloadDecryptBook.cs
View File

@ -261,7 +261,7 @@ namespace FileLiberator
var realDest = FileUtility.SaferMoveToValidPath(entry.Path, Path.Combine(destinationDir, Path.GetFileName(entry.Path)), Configuration.Instance.ReplacementCharacters);
FilePathCache.Insert(libraryBook.Book.AudibleProductId, realDest);
// propagate corrected path. Must update cache with corrected path. Also want updated path for cue file (after this for-loop)
// propogate corrected path. Must update cache with corrected path. Also want updated path for cue file (after this for-loop)
entries[i] = entry with { Path = realDest };
}

2
Source/FileManager/FileManager.csproj
View File

@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dinah.Core" Version="4.4.1.1" />
<PackageReference Include="Dinah.Core" Version="4.4.0.1" />
<PackageReference Include="Polly" Version="7.2.3" />
</ItemGroup>

4
Source/FileManager/FileUtility.cs
View File

@ -77,7 +77,7 @@ namespace FileManager
return fullfilename;
}
/// <summary>Use with full path, not file name. Valid path characters which are invalid file name characters will be retained: '\\', '/'</summary>
/// <summary>Use with full path, not file name. Valid path charaters which are invalid file name characters will be retained: '\\', '/'</summary>
public static LongPath GetSafePath(LongPath path, ReplacementCharacters replacements)
{
ArgumentValidator.EnsureNotNull(path, nameof(path));
@ -147,7 +147,7 @@ namespace FileManager
// regex is easier by ending with separator
fullfilename += Path.DirectorySeparatorChar;
fullfilename = removeInvalidWhitespace_regex.Replace(fullfilename, Path.DirectorySeparatorChar.ToString());
// take separator back off
// take seperator back off
fullfilename = RemoveLastCharacter(fullfilename);
fullfilename = removeDoubleSlashes(fullfilename);

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

@ -252,7 +252,7 @@ namespace LibationWinForms.Dialogs
{
MessageBoxLib.ShowAdminAlert(
this,
$"An error occurred while exporting account:\r\n{account.AccountName}",
$"An error occured while exporting account:\r\n{account.AccountName}",
"Error Exporting Account",
ex);
}
@ -294,7 +294,7 @@ namespace LibationWinForms.Dialogs
{
MessageBoxLib.ShowAdminAlert(
this,
$"An error occurred while importing an account from:\r\n{ofd.FileName}\r\n\r\nIs the file encrypted?",
$"An error occured while importing an account from:\r\n{ofd.FileName}\r\n\r\nIs the file encrypted?",
"Error Importing Account",
ex);
}

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

@ -3,7 +3,7 @@ using ApplicationServices;
namespace LibationWinForms
{
// This is for the Scanning notification in the upper right. This shown for manual scanning and auto-scan
// This is for the Scanning notificationin the upper right. This shown for manual scanning and auto-scan
public partial class Form1
{
private void Configure_ScanNotification()

2
Source/LibationWinForms/LibationWinForms.csproj
View File

@ -29,7 +29,7 @@
<ItemGroup>
<PackageReference Include="Autoupdater.NET.Official" Version="1.7.3" />
<PackageReference Include="Dinah.Core.WindowsDesktop" Version="4.2.3.1" />
<PackageReference Include="Dinah.Core.WindowsDesktop" Version="4.2.2.1" />
</ItemGroup>
<ItemGroup>

2
Source/LibationWinForms/Program.cs
View File

@ -87,7 +87,7 @@ namespace LibationWinForms
var defaultLibationFilesDir = Configuration.UserProfile;
// check for existing settings in default location
// check for existing settigns in default location
var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
if (Configuration.SettingsFileIsValid(defaultSettingsFile))
config.SetLibationFiles(defaultLibationFilesDir);

2
Source/LibationWinForms/Updater.cs
View File

@ -29,7 +29,7 @@ namespace LibationWinForms
return;
var dialogResult = MessageBox.Show(string.Format(
$"There is a new version available. Would you like to update?\r\n\r\nAfter you close Libation, the upgrade will start automatically."),
$"There is a new version avilable. Would you like to update?\r\n\r\nAfter you close Libation, the upgrade will start automatically."),
"Update Available",
MessageBoxButtons.YesNo,
MessageBoxIcon.Information);