Compare commits

..

5 Commits

Author SHA1 Message Date
Robert McRackan
012d94a146 incr ver 2023-03-29 18:02:33 -04:00
Mbucari
22bd1ed121 Fix autoscan bug 2023-03-29 15:54:46 -06:00
Mbucari
c832f26b08 Merge pull request #561 from Mbucari/master
Try fix #560
2023-03-29 15:40:52 -06:00
Mbucari
efd73d334e inv ver 2023-03-29 15:39:25 -06:00
Mbucari
0db3ee6fd7 Fix library scan bug 2023-03-29 15:38:57 -06:00
4 changed files with 20 additions and 4 deletions

View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Version>10.0.0.1</Version>
<Version>10.0.2.1</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Octokit" Version="5.0.2" />

View File

@@ -54,7 +54,7 @@ namespace DtoImporterService
foreach (var item in uniqueImportItems.Values)
{
if (qtyNew == 0 && existingEntries.TryGetValue(item.DtoItem.ProductId, out LibraryBook existing))
if (existingEntries.TryGetValue(item.DtoItem.ProductId, out LibraryBook existing))
{
if (existing.Account != item.AccountId)
{

View File

@@ -9,6 +9,7 @@ using Avalonia.Styling;
using Dinah.Core.StepRunner;
using LibationAvalonia.Dialogs;
using LibationAvalonia.Views;
using LibationFileManager;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@@ -29,8 +30,11 @@ namespace LibationAvalonia
private static readonly IBrush FlashColor = Brushes.DodgerBlue;
private readonly MainWindow MainForm;
private readonly AsyncStepSequence sequence = new();
private readonly bool AutoScan;
public Walkthrough(MainWindow mainForm)
{
AutoScan = Configuration.Instance.AutoScan;
Configuration.Instance.AutoScan = false;
MainForm = mainForm;
sequence[nameof(ShowAccountDialog)] = () => UIThread.InvokeAsync(ShowAccountDialog);
sequence[nameof(ShowSettingsDialog)] = () => UIThread.InvokeAsync(ShowSettingsDialog);
@@ -40,7 +44,11 @@ namespace LibationAvalonia
sequence[nameof(ShowTourComplete)] = () => UIThread.InvokeAsync(ShowTourComplete);
}
public async Task RunAsync() => await sequence.RunAsync();
public async Task RunAsync()
{
await sequence.RunAsync();
Configuration.Instance.AutoScan = AutoScan;
}
private async Task<bool> ShowAccountDialog()
{

View File

@@ -1,6 +1,7 @@
using ApplicationServices;
using AudibleUtilities;
using Dinah.Core.StepRunner;
using LibationFileManager;
using LibationWinForms.Dialogs;
using System;
using System.Collections.Generic;
@@ -24,8 +25,11 @@ namespace LibationWinForms
private static readonly Color FlashColor = Color.DodgerBlue;
private readonly Form1 MainForm;
private readonly AsyncStepSequence sequence = new();
private readonly bool AutoScan;
public Walkthrough(Form1 form1)
{
AutoScan = Configuration.Instance.AutoScan;
Configuration.Instance.AutoScan = false;
MainForm = form1;
sequence[nameof(ShowAccountDialog)] = ShowAccountDialog;
sequence[nameof(ShowSettingsDialog)] = ShowSettingsDialog;
@@ -35,7 +39,11 @@ namespace LibationWinForms
sequence[nameof(ShowTourComplete)] = ShowTourComplete;
}
public async Task RunAsync() => await sequence.RunAsync();
public async Task RunAsync()
{
await sequence.RunAsync();
Configuration.Instance.AutoScan = AutoScan;
}
private async Task<bool> ShowAccountDialog()
{