4 Commits

Author SHA1 Message Date
BlossomiShymae
e0a2685dcf Increment version for fix 2024-08-13 02:44:49 -05:00
BlossomiShymae
ca2f8c4852 Fix events processing too quickly 2024-08-13 02:43:47 -05:00
BlossomiShymae
8f81aa526e Add update checker 2024-08-13 02:41:02 -05:00
BlossomiShymae
360a0f28c7 Fix responses not being set to empty on oopsies 2024-08-10 06:09:48 -05:00
5 changed files with 64 additions and 10 deletions

View File

@@ -0,0 +1,12 @@
using System.Text.Json.Serialization;
namespace Needlework.Net.Desktop
{
public class GithubRelease
{
[JsonPropertyName("tag_name")]
public string TagName { get; set; } = string.Empty;
public bool IsLatest(int version) => int.Parse(TagName.Replace(".", "")) > version;
}
}

View File

@@ -11,8 +11,8 @@
<AvaloniaXamlIlDebuggerLaunch>False</AvaloniaXamlIlDebuggerLaunch> <AvaloniaXamlIlDebuggerLaunch>False</AvaloniaXamlIlDebuggerLaunch>
<ApplicationIcon>app.ico</ApplicationIcon> <ApplicationIcon>app.ico</ApplicationIcon>
<AssemblyName>NeedleworkDotNet</AssemblyName> <AssemblyName>NeedleworkDotNet</AssemblyName>
<AssemblyVersion>0.2.2.0</AssemblyVersion> <AssemblyVersion>0.3.1.0</AssemblyVersion>
<FileVersion>0.2.2.0</FileVersion> <FileVersion>0.3.1.0</FileVersion>
<AvaloniaXamlVerboseExceptions>False</AvaloniaXamlVerboseExceptions> <AvaloniaXamlVerboseExceptions>False</AvaloniaXamlVerboseExceptions>
</PropertyGroup> </PropertyGroup>

View File

@@ -66,7 +66,11 @@ namespace Needlework.Net.Desktop.ViewModels
var body = await response.Content.ReadAsStringAsync(); var body = await response.Content.ReadAsStringAsync();
body = !string.IsNullOrEmpty(body) ? JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(body), App.JsonSerializerOptions) : string.Empty; body = !string.IsNullOrEmpty(body) ? JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(body), App.JsonSerializerOptions) : string.Empty;
if (body.Length >= App.MaxCharacters) WindowService.ShowOopsiesWindow(body); if (body.Length >= App.MaxCharacters)
{
WindowService.ShowOopsiesWindow(body);
WeakReferenceMessenger.Default.Send(new ResponseUpdatedMessage(string.Empty), nameof(ConsoleViewModel));
}
else WeakReferenceMessenger.Default.Send(new ResponseUpdatedMessage(body), nameof(ConsoleViewModel)); else WeakReferenceMessenger.Default.Send(new ResponseUpdatedMessage(body), nameof(ConsoleViewModel));
ResponseStatus = $"{(int)response.StatusCode} {response.StatusCode.ToString()}"; ResponseStatus = $"{(int)response.StatusCode} {response.StatusCode.ToString()}";

View File

@@ -12,7 +12,9 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Net.Http;
using System.Net.Http.Json;
using System.Reflection; using System.Reflection;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Needlework.Net.Desktop.ViewModels namespace Needlework.Net.Desktop.ViewModels
@@ -28,6 +30,7 @@ namespace Needlework.Net.Desktop.ViewModels
public OpenApiDocument? HostDocument { get; set; } public OpenApiDocument? HostDocument { get; set; }
[ObservableProperty] private bool _isBusy = true; [ObservableProperty] private bool _isBusy = true;
[ObservableProperty] private bool _isUpdateShown = false;
public MainWindowViewModel(IEnumerable<PageBase> pages, HttpClient httpClient, WindowService windowService) public MainWindowViewModel(IEnumerable<PageBase> pages, HttpClient httpClient, WindowService windowService)
{ {
@@ -36,7 +39,44 @@ namespace Needlework.Net.Desktop.ViewModels
WindowService = windowService; WindowService = windowService;
WeakReferenceMessenger.Default.RegisterAll(this); WeakReferenceMessenger.Default.RegisterAll(this);
Task.Run(FetchDataAsync); Task.Run(FetchDataAsync);
new Thread(ProcessEvents) { IsBackground = true }.Start();
}
private void ProcessEvents(object? obj)
{
while (true)
{
Task.Run(CheckLatestVersionAsync);
Thread.Sleep(TimeSpan.FromSeconds(60));
}
}
private async Task CheckLatestVersionAsync()
{
try
{
var request = new HttpRequestMessage(HttpMethod.Get, "https://api.github.com/repos/BlossomiShymae/Needlework.Net/releases/latest");
request.Headers.UserAgent.Add(new System.Net.Http.Headers.ProductInfoHeaderValue("Needlework.Net", Version));
var response = await HttpClient.SendAsync(request);
var release = await response.Content.ReadFromJsonAsync<GithubRelease>();
if (release == null) return;
var currentVersion = int.Parse(Version.Replace(".", ""));
if (release.IsLatest(currentVersion) && !IsUpdateShown)
{
await Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(async () =>
{
await SukiHost.ShowToast("Needlework.Net Update", $"There is a new version available: {release.TagName}.", SukiUI.Enums.NotificationType.Info, TimeSpan.FromSeconds(10), () => OpenUrl("https://github.com/BlossomiShymae/Needlework.Net/releases"));
IsUpdateShown = true;
});
}
}
catch (Exception) { }
} }
private async Task FetchDataAsync() private async Task FetchDataAsync()
@@ -74,12 +114,6 @@ namespace Needlework.Net.Desktop.ViewModels
process.Start(); process.Start();
} }
[RelayCommand]
private void OpenConsole()
{
}
public void Receive(OopsiesWindowRequestedMessage message) public void Receive(OopsiesWindowRequestedMessage message)
{ {
WindowService.ShowOopsiesWindow(message.Value); WindowService.ShowOopsiesWindow(message.Value);

View File

@@ -99,7 +99,11 @@ namespace Needlework.Net.Desktop.ViewModels
var responseBody = await response.Content.ReadAsStringAsync(); var responseBody = await response.Content.ReadAsStringAsync();
responseBody = !string.IsNullOrEmpty(responseBody) ? JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(responseBody), App.JsonSerializerOptions) : string.Empty; responseBody = !string.IsNullOrEmpty(responseBody) ? JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(responseBody), App.JsonSerializerOptions) : string.Empty;
if (responseBody.Length >= App.MaxCharacters) WeakReferenceMessenger.Default.Send(new OopsiesWindowRequestedMessage(responseBody)); if (responseBody.Length >= App.MaxCharacters)
{
WeakReferenceMessenger.Default.Send(new OopsiesWindowRequestedMessage(responseBody));
WeakReferenceMessenger.Default.Send(new EditorUpdateMessage(new(string.Empty, "EndpointResponseEditor")));
}
else WeakReferenceMessenger.Default.Send(new EditorUpdateMessage(new(responseBody, "EndpointResponseEditor"))); else WeakReferenceMessenger.Default.Send(new EditorUpdateMessage(new(responseBody, "EndpointResponseEditor")));
ResponseStatus = $"{(int)response.StatusCode} {response.StatusCode}"; ResponseStatus = $"{(int)response.StatusCode} {response.StatusCode}";