From f9dd654b6aa496aee1510cfc41e376ed8ab8b583 Mon Sep 17 00:00:00 2001 From: estrogen elf <87099578+BlossomiShymae@users.noreply.github.com> Date: Fri, 30 May 2025 12:43:55 -0500 Subject: [PATCH] fix: lcu schema update --- .../ViewModels/MainWindow/MainWindowViewModel.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Needlework.Net/ViewModels/MainWindow/MainWindowViewModel.cs b/Needlework.Net/ViewModels/MainWindow/MainWindowViewModel.cs index a1f334f..51e775b 100644 --- a/Needlework.Net/ViewModels/MainWindow/MainWindowViewModel.cs +++ b/Needlework.Net/ViewModels/MainWindow/MainWindowViewModel.cs @@ -5,7 +5,6 @@ using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Messaging; using FluentAvalonia.UI.Controls; using Microsoft.Extensions.Logging; -using Microsoft.OpenApi.Models; using Needlework.Net.Messages; using Needlework.Net.Models; using Needlework.Net.Services; @@ -39,8 +38,8 @@ public partial class MainWindowViewModel public HttpClient HttpClient { get; } public DialogService DialogService { get; } - public Document? OpenApiDocumentWrapper { get; set; } - public OpenApiDocument? HostDocument { get; set; } + + private readonly DataSource _dataSource; [ObservableProperty] private bool _isBusy = true; @@ -61,9 +60,10 @@ public partial class MainWindowViewModel }; private bool _isSchemaVersionChecked = false; - public MainWindowViewModel(IEnumerable pages, HttpClient httpClient, DialogService dialogService, ILogger logger) + public MainWindowViewModel(IEnumerable pages, HttpClient httpClient, DialogService dialogService, ILogger logger, DataSource dataSource) { _logger = logger; + _dataSource = dataSource; MenuItems = new AvaloniaList(pages .OrderBy(p => p.Index) @@ -105,20 +105,20 @@ public partial class MainWindowViewModel private async void OnSchemaVersionTimerElapsed(object? sender, ElapsedEventArgs? e) { - if (OpenApiDocumentWrapper == null) return; if (!ProcessFinder.IsPortOpen()) return; + var lcuSchemaDocument = await _dataSource.GetLcuSchemaDocumentAsync(); try { var client = Connector.GetLcuHttpClientInstance(); - var currentSemVer = OpenApiDocumentWrapper.Info.Version.Split('.'); + var currentSemVer = lcuSchemaDocument.Info.Version.Split('.'); var systemBuild = await client.GetFromJsonAsync("/system/v1/builds") ?? throw new NullReferenceException(); var latestSemVer = systemBuild.Version.Split('.'); if (!_isSchemaVersionChecked) { - _logger.LogInformation("LCU Schema (current): {Version}", OpenApiDocumentWrapper.Info.Version); + _logger.LogInformation("LCU Schema (current): {Version}", lcuSchemaDocument.Info.Version); _logger.LogInformation("LCU Schema (latest): {Version}", systemBuild.Version); _isSchemaVersionChecked = true; }