mirror of
https://github.com/rmcrackan/Libation.git
synced 2026-02-01 01:32:50 -05:00
Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eed7f1811b | ||
|
|
33cd6b8639 | ||
|
|
06014f467e | ||
|
|
b2eef18217 | ||
|
|
443d1f64ca | ||
|
|
c43e88d269 | ||
|
|
5c56e1d39b | ||
|
|
b39e2c3e0b |
@@ -2,7 +2,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<Version>13.1.5.1</Version>
|
||||
<Version>13.1.7.1</Version>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Octokit" Version="14.0.0" />
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
<TextBlock
|
||||
Grid.Column="0"
|
||||
Text="If you'd like to report this error to an advinistrator:

Step 1: Go to Libation's "issues" page on github
Step 2: Find your log files
Setp 3: Click "New issue" button
Step 4: Drag/drop your log files" />
|
||||
Text="If you'd like to report this error to an administrator:

Step 1: Go to Libation's "issues" page on github
Step 2: Find your log files
Setp 3: Click "New issue" button
Step 4: Drag/drop your log files" />
|
||||
|
||||
<StackPanel
|
||||
Margin="50,0,0,0"
|
||||
|
||||
@@ -20,10 +20,16 @@ namespace LibationCli
|
||||
protected static TProcessable CreateProcessable<TProcessable>(EventHandler<LibraryBook>? completedAction = null)
|
||||
where TProcessable : Processable, IProcessable<TProcessable>
|
||||
{
|
||||
var progressBar = new ConsoleProgressBar(Console.Out);
|
||||
var strProc = TProcessable.Create(Configuration.Instance);
|
||||
LibraryBook? currentLibraryBook = null;
|
||||
|
||||
if (Environment.UserInteractive && !Console.IsOutputRedirected && !Console.IsErrorRedirected) {
|
||||
var progressBar = new ConsoleProgressBar(Console.Out);
|
||||
strProc.Completed += (_, e) => progressBar.Clear();
|
||||
strProc.StreamingTimeRemaining += (_, e) => progressBar.RemainingTime = e;
|
||||
strProc.StreamingProgressChanged += (_, e) => progressBar.Progress = e.ProgressPercentage;
|
||||
}
|
||||
|
||||
strProc.Begin += (o, e) =>
|
||||
{
|
||||
currentLibraryBook = e;
|
||||
@@ -32,7 +38,6 @@ namespace LibationCli
|
||||
|
||||
strProc.Completed += (o, e) =>
|
||||
{
|
||||
progressBar.Clear();
|
||||
Console.WriteLine($"{typeof(TProcessable).Name} Completed: {e}");
|
||||
};
|
||||
|
||||
@@ -49,9 +54,6 @@ namespace LibationCli
|
||||
}
|
||||
};
|
||||
|
||||
strProc.StreamingTimeRemaining += (_, e) => progressBar.RemainingTime = e;
|
||||
strProc.StreamingProgressChanged += (_, e) => progressBar.Progress = e.ProgressPercentage;
|
||||
|
||||
if (strProc is AudioDecodable audDec)
|
||||
{
|
||||
audDec.RequestCoverArt += (_,_) =>
|
||||
|
||||
@@ -342,7 +342,7 @@ namespace LibationFileManager
|
||||
[Description("Automatically run periodic scans in the background?")]
|
||||
public bool AutoScan { get => GetNonString(defaultValue: true); set => SetNonString(value); }
|
||||
|
||||
[Description("Use Libation's buit-in web broswer to log into Audible?")]
|
||||
[Description("Use Libation's built-in web browser to log into Audible?")]
|
||||
public bool UseWebView { get => GetNonString(defaultValue: true); set => SetNonString(value); }
|
||||
|
||||
[Description("Auto download books? After scan, download new books in 'checked' accounts.")]
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<data name="label1.Text" xml:space="preserve">
|
||||
<value>If you'd like to report this error to an advinistrator:
|
||||
<value>If you'd like to report this error to an administrator:
|
||||
|
||||
Step 1: Go to Libation's "issues" page on github
|
||||
Step 2: Find your log files
|
||||
|
||||
@@ -57,7 +57,23 @@ namespace LibationWinForms
|
||||
private void productsDisplay_InitialLoaded(object sender, EventArgs e)
|
||||
{
|
||||
if (QuickFilters.UseDefault)
|
||||
performFilter(QuickFilters.Filters.FirstOrDefault()?.Filter);
|
||||
{
|
||||
// begin verbose null checking. shouldn't be possible, yet NRE in #1578
|
||||
var f = QuickFilters.Filters;
|
||||
if (f is null)
|
||||
Serilog.Log.Logger.Error("Unexpected exception. QuickFilters.Filters is null");
|
||||
|
||||
var first = f.FirstOrDefault();
|
||||
if (first is null)
|
||||
Serilog.Log.Logger.Information("QuickFilters.Filters.FirstOrDefault() is null");
|
||||
|
||||
var filter = first?.Filter;
|
||||
if (filter is null)
|
||||
Serilog.Log.Logger.Information("QuickFilters.Filters.FirstOrDefault()?.Filter is null");
|
||||
// end verbose null checking
|
||||
|
||||
performFilter(filter);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user