diff --git a/PcgsInvUi/App.axaml.cs b/PcgsInvUi/App.axaml.cs index 5caf5d2..ed78335 100644 --- a/PcgsInvUi/App.axaml.cs +++ b/PcgsInvUi/App.axaml.cs @@ -17,7 +17,7 @@ public partial class App : Application { base.OnFrameworkInitializationCompleted(); if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) { - var coins = new Database(); + var coins = new CoinDatabase(); desktop.MainWindow = new MainWindow { DataContext = new MainWindowViewModel(coins), diff --git a/PcgsInvUi/Services/Database.cs b/PcgsInvUi/Services/CoinDatabase.cs similarity index 99% rename from PcgsInvUi/Services/Database.cs rename to PcgsInvUi/Services/CoinDatabase.cs index 5e8d3eb..cdee8f5 100644 --- a/PcgsInvUi/Services/Database.cs +++ b/PcgsInvUi/Services/CoinDatabase.cs @@ -5,11 +5,11 @@ using PcgsInvUi.Models; namespace PcgsInvUi.Services; -public class Database { +public class CoinDatabase { public SQLiteConnection Connection { get; set; } private Boolean IsConnected { get; set; } - public Database() { + public CoinDatabase() { // Create a connection to SQLite Connection = CreateConnection(); // Create a base table. diff --git a/PcgsInvUi/ViewModels/MainWindowViewModel.cs b/PcgsInvUi/ViewModels/MainWindowViewModel.cs index 2b02464..a13914c 100644 --- a/PcgsInvUi/ViewModels/MainWindowViewModel.cs +++ b/PcgsInvUi/ViewModels/MainWindowViewModel.cs @@ -13,7 +13,7 @@ namespace PcgsInvUi.ViewModels; // TODO Error handling. // TODO Manual handling of API key. // TODO Use CoinFacts link. -// TODO Splash screen that loads. +// TODO Splash screen during startup. // TODO Take giant sheet of coins to integrate into the application. // TODO Update all coins. Choose those that are older first. // TODO API request tracker (1000 per day) @@ -28,7 +28,7 @@ public class MainWindowViewModel : ViewModelBase { } public ObservableCollection CoinCollection { get; set; } public ObservableCollection DisplayedList { get; set; } - public Database ConnectedDatabase { get; set; } + public CoinDatabase ConnectedCoinDatabase { get; set; } public Coin? SelectedCoin { get => _selectedCoin; set => this.RaiseAndSetIfChanged(ref _selectedCoin, value); @@ -43,21 +43,21 @@ public class MainWindowViewModel : ViewModelBase { public ReactiveCommand FindCommand { get; } public Interaction ShowFindWindow { get; } public ReactiveCommand ExportCommand { get; } - public Interaction ShowExportWindow { get; } + public Interaction ShowExportWindow { get; } private ViewModelBase _sideContent; private Coin? _selectedCoin; private double _totalValue; private PcgsClient _pcgsClient; - - // public MainWindowViewModel(CoinCollection coins) { - public MainWindowViewModel(Database coins) { - ConnectedDatabase = coins; + + public MainWindowViewModel(CoinDatabase coins) { + ConnectedCoinDatabase = coins; var newViewModel = new NewViewModel(); _sideContent = newViewModel; // DisplayedList = CoinCollection = new ObservableCollection(coins.GetItems()); DisplayedList = CoinCollection = new ObservableCollection(coins.GetCollection("CollectionTable")); + TotalValue = DisplayedList.Sum(x => x.TotalPrice); _pcgsClient = new PcgsClient( "eAb8gS0I2XAvT_5gJeiGJaglMia1Tk-oB4kJUK6kuafyrny_S61vIJY-Ikl4nCQM67wrdxzUqLVWTV2kBSxD3d5XNBHxHnYBhcSS6dOPug0hZaF3qAv56df3gYSzOGh9Tif5y0eP3Iw0LrqKDr1Hj-dk6SV6GKog2IIqCPQhhHH8FMTWBTYO-_O8cx7qLdM5GM8KlTsic6g3VRUhM8EA_4OO04dCfmNLGhqINRl3jGZ0Q4ziI8fng2bVWsIyteqiPzUn10rIQ3-OPpqVZG_DxeOmOejj4GzbUNyqUOajy-nr5rYY"); @@ -69,26 +69,26 @@ public class MainWindowViewModel : ViewModelBase { var deleteViewModel = new DeleteWindowViewModel(); var result = await ShowDeleteWindow.Handle(deleteViewModel); if (result && SelectedCoin is not null) { - ConnectedDatabase.DeleteCoin(SelectedCoin); + ConnectedCoinDatabase.DeleteCoin(SelectedCoin); CoinCollection.Remove(SelectedCoin); // possible null deref - ignored due to button being disabled. } }, deleteEnabled); - ShowExportWindow = new Interaction(); + ShowExportWindow = new Interaction(); ExportCommand = ReactiveCommand.CreateFromTask(async () => { - var stream = await ShowExportWindow.Handle(Unit.Default); - var writer = new StreamWriter(stream); try { - await writer.WriteAsync(ConnectedDatabase.CollectionToCSV("CollectionTable")); + var filePath = await ShowExportWindow.Handle(Unit.Default); + var stream = File.Open(filePath.AbsolutePath, FileMode.OpenOrCreate); + var writer = new StreamWriter(stream); + await writer.WriteAsync(ConnectedCoinDatabase.CollectionToCSV("CollectionTable")); await writer.FlushAsync(); } catch (IOException e) { // Something is wrong with the file after it's been created. Console.WriteLine(e.Message); + } catch (Exception e) { + Console.WriteLine(e.Message); } - - writer.Close(); - stream.Close(); }); // Set up the ability to open the find window. diff --git a/PcgsInvUi/Views/MainWindow.axaml.cs b/PcgsInvUi/Views/MainWindow.axaml.cs index 69c3549..7f80fb8 100644 --- a/PcgsInvUi/Views/MainWindow.axaml.cs +++ b/PcgsInvUi/Views/MainWindow.axaml.cs @@ -33,7 +33,7 @@ public partial class MainWindow : ReactiveWindow { interaction.SetOutput(result); } - public async Task ShowFilePickerAsync(InteractionContext interationContext) { + public async Task ShowFilePickerAsync(InteractionContext interationContext) { var topLevel = GetTopLevel(this); var file = await topLevel.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions { Title = "Save CSV...", @@ -44,10 +44,13 @@ public partial class MainWindow : ReactiveWindow { }); Stream stream; - + if (file is not null) { - stream = await file.OpenWriteAsync(); - interationContext.SetOutput(stream); + interationContext.SetOutput(file.Path); + } + else { + // TODO Handle user closing the dialog. + throw new Exception("User cancelled the file picker."); } } } \ No newline at end of file