javier/Wino-Mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removal of background task service from core.

Browse Source
This commit is contained in:
Burak Kaan Köse
2024-07-18 15:07:17 +02:00
parent a9a9907bc6
commit 7ef045a0ad
7 changed files with 63 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Wino.Server/App.xaml.cs
View File

@@ -1,6 +1,9 @@
using System.Threading;
using System;
using System.Threading;
using System.Windows;
using H.NotifyIcon;
using Microsoft.Extensions.DependencyInjection;
using Wino.Core;
namespace Wino.Server
{
@@ -16,11 +19,27 @@ namespace Wino.Server
private const string WinoServerAppName = "Wino.Server";
private const string WinoServerActiatedName = "Wino.Server.Activated";
public new static App Current => (App)Application.Current;
private TaskbarIcon? notifyIcon;
private static Mutex _mutex = null;
private EventWaitHandle _eventWaitHandle;
protected override void OnStartup(StartupEventArgs e)
public IServiceProvider Services { get; private set; }
private IServiceProvider ConfigureServices()
{
var services = new ServiceCollection();
services.AddTransient<ServerContext>();
services.AddTransient<TrayIconViewModel>();
services.RegisterCoreServices();
return services.BuildServiceProvider();
}
protected override async void OnStartup(StartupEventArgs e)
{
bool isCreatedNew;
@@ -36,11 +55,11 @@ namespace Wino.Server
{
if (notifyIcon == null) return;
Current.Dispatcher.BeginInvoke(() =>
Current.Dispatcher.BeginInvoke(async () =>
{
if (notifyIcon.DataContext is TrayIconViewModel trayIconViewModel)
{
trayIconViewModel.Reconnect();
await trayIconViewModel.ReconnectAsync();
}
});
}
@@ -48,13 +67,19 @@ namespace Wino.Server
// It is important mark it as background otherwise it will prevent app from exiting.
thread.IsBackground = true;
thread.Start();
Services = ConfigureServices();
base.OnStartup(e);
// Create taskbar icon for the new server.
notifyIcon = (TaskbarIcon)FindResource("NotifyIcon");
var viewModel = Services.GetRequiredService<TrayIconViewModel>();
await viewModel.Context.InitializeAsync();
notifyIcon.DataContext = viewModel;
notifyIcon.ForceCreate(enablesEfficiencyMode: true);
}
else

24
Wino.Server/ServerContext.cs
View File

@@ -4,23 +4,23 @@ using System.Threading.Tasks;
using Windows.ApplicationModel;
using Windows.ApplicationModel.AppService;
using Windows.Foundation.Collections;
using Wino.Core.Domain.Entities;
using Wino.Core.Domain.Interfaces;
using Wino.Core.Services;
using Wino.Messaging;
using Wino.Messaging.Enums;
using Wino.Messaging.Server;
namespace Wino.Server
{
public class ServerContext
public class ServerContext : IInitializeAsync
{
private static object connectionLock = new object();
private AppServiceConnection connection = null;
private readonly IDatabaseService _databaseService;
public ServerContext()
public ServerContext(IDatabaseService databaseService)
{
InitializeAppServiceConnection();
_databaseService = databaseService;
}
private string GetAppPackagFamilyName()
@@ -42,7 +42,7 @@ namespace Wino.Server
/// <summary>
/// Open connection to UWP app service
/// </summary>
public async void InitializeAppServiceConnection()
public async Task InitializeAppServiceConnectionAsync()
{
if (connection != null) DisposeConnection();
@@ -65,12 +65,6 @@ namespace Wino.Server
}
}
public Task SendTestMessageAsync()
{
var message = new MailAddedMessage(new MailCopy());
return SendMessageAsync(MessageType.UIMessage, message);
}
private async Task SendMessageAsync(MessageType messageType, object message)
{
if (connection == null) return;
@@ -119,5 +113,11 @@ namespace Wino.Server
connection = null;
}
}
public async Task InitializeAsync()
{
await InitializeAppServiceConnectionAsync();
await _databaseService.InitializeAsync();
}
}
}

6
Wino.Server/TrayIconResources.xaml
View File

@@ -16,10 +16,6 @@
ToolTipText="Wino Mail"
LeftClickCommand="{Binding LaunchWinoCommand}"
NoLeftClickDelay="True"
ContextMenu="{StaticResource SysTrayMenu}">
ContextMenu="{StaticResource SysTrayMenu}" />
<tb:TaskbarIcon.DataContext>
<server:TrayIconViewModel />
</tb:TaskbarIcon.DataContext>
</tb:TaskbarIcon>
</ResourceDictionary>

15
Wino.Server/TrayIconViewModel.cs
View File

@@ -1,4 +1,5 @@
using System.Windows;
using System.Threading.Tasks;
using System.Windows;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
@@ -6,12 +7,18 @@ namespace Wino.Server
{
public partial class TrayIconViewModel : ObservableObject
{
private readonly ServerContext _context = new ServerContext();
public ServerContext Context { get; }
public TrayIconViewModel(ServerContext serverContext)
{
Context = serverContext;
}
[RelayCommand]
public void LaunchWino()
{
_context.SendTestMessageAsync();
// ServerContext.SendTestMessageAsync();
}
/// <summary>
@@ -25,6 +32,6 @@ namespace Wino.Server
Application.Current.Shutdown();
}
public void Reconnect() => _context.InitializeAppServiceConnection();
public async Task ReconnectAsync() => await Context.InitializeAppServiceConnectionAsync();
}
}

7
Wino.Server/Wino.Server.csproj
View File

@@ -1,11 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<OutputType>WinExe</OutputType>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<UseWPF>true</UseWPF>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
<CsWinRTComponent>true</CsWinRTComponent>
<CsWinRTWindowsMetadata>10.0.22621.0</CsWinRTWindowsMetadata>
</PropertyGroup>
<PropertyGroup>
<StartupObject>Wino.Server.App</StartupObject>