Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 justin
|
d534209092 | ||
|
justin
|
6f9cb5646f | ||
|
justin
|
b6e642da04 | ||
|
justin
|
e65527f316 | ||
|
justin
|
c49a2a12cb |
@@ -1,102 +0,0 @@
|
||||
name: Release (Gitea)
|
||||
|
||||
# Lives in .gitea/workflows/ so it runs on Gitea Actions only. The GitHub-side
|
||||
# release lives in .github/workflows/release.yml.
|
||||
#
|
||||
# Triggered automatically on v* tag pushes; can also be invoked manually via
|
||||
# workflow_dispatch with a version override (useful for testing the runner
|
||||
# without bumping the project version).
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: 'Version to build (e.g. 0.1.4). Defaults to Directory.Build.props.'
|
||||
required: false
|
||||
|
||||
jobs:
|
||||
build-installer:
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: '8.0.x'
|
||||
|
||||
- name: Resolve version
|
||||
id: ver
|
||||
shell: pwsh
|
||||
run: |
|
||||
if ('${{ github.event_name }}' -eq 'push') {
|
||||
$v = '${{ github.ref_name }}'.TrimStart('v')
|
||||
} elseif ('${{ inputs.version }}') {
|
||||
$v = '${{ inputs.version }}'
|
||||
} else {
|
||||
[xml]$p = Get-Content Directory.Build.props
|
||||
$v = $p.Project.PropertyGroup.Version
|
||||
}
|
||||
"version=$v" | Out-File $env:GITHUB_OUTPUT -Append
|
||||
Write-Host "Building version $v"
|
||||
|
||||
- name: Restore + test
|
||||
shell: pwsh
|
||||
run: |
|
||||
dotnet restore WebhookServer.sln
|
||||
dotnet test WebhookServer.sln -c Release
|
||||
|
||||
- name: Ensure Inno Setup is installed
|
||||
shell: pwsh
|
||||
run: |
|
||||
if (-not (Get-Command iscc -ErrorAction SilentlyContinue) -and `
|
||||
-not (Test-Path 'C:\Program Files (x86)\Inno Setup 6\ISCC.exe') -and `
|
||||
-not (Test-Path 'C:\Program Files\Inno Setup 6\ISCC.exe')) {
|
||||
choco install innosetup --no-progress -y
|
||||
}
|
||||
|
||||
- name: Build installer
|
||||
shell: pwsh
|
||||
run: ./scripts/build-installer.ps1 -VersionOverride ${{ steps.ver.outputs.version }}
|
||||
|
||||
- name: Upload installer artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: WebhookServer-Setup-${{ steps.ver.outputs.version }}
|
||||
path: dist/WebhookServer-Setup-*.exe
|
||||
|
||||
- name: Create Gitea release with installer attached
|
||||
if: startsWith(github.ref, 'refs/tags/v')
|
||||
shell: pwsh
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
$version = '${{ steps.ver.outputs.version }}'
|
||||
$tag = '${{ github.ref_name }}'
|
||||
$repo = '${{ github.repository }}'
|
||||
$serverUrl = '${{ github.server_url }}'
|
||||
$apiBase = "$serverUrl/api/v1/repos/$repo"
|
||||
$headers = @{ Authorization = "token $env:GITEA_TOKEN" }
|
||||
|
||||
# 1. Create the release.
|
||||
$isPre = $version.StartsWith('0.')
|
||||
$createBody = @{
|
||||
tag_name = $tag
|
||||
name = "Webhook Server $version"
|
||||
body = "Automated build via Gitea Actions runner."
|
||||
draft = $false
|
||||
prerelease = $isPre
|
||||
} | ConvertTo-Json
|
||||
$rel = Invoke-RestMethod -Uri "$apiBase/releases" -Method Post `
|
||||
-Headers $headers -ContentType 'application/json' -Body $createBody
|
||||
Write-Host "Created release id=$($rel.id) tag=$tag"
|
||||
|
||||
# 2. Attach the installer.
|
||||
$file = Get-Item "dist/WebhookServer-Setup-$version.exe"
|
||||
$uploadUri = "$apiBase/releases/$($rel.id)/assets?name=$($file.Name)"
|
||||
Invoke-RestMethod -Uri $uploadUri -Method Post -Headers $headers `
|
||||
-ContentType 'application/octet-stream' -InFile $file.FullName | Out-Null
|
||||
Write-Host "Uploaded $($file.Name) ($([math]::Round($file.Length / 1MB, 2)) MB) to $tag"
|
||||
@@ -5,7 +5,6 @@ on:
|
||||
branches: [main]
|
||||
pull_request:
|
||||
branches: [main]
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
@@ -12,9 +12,6 @@ on:
|
||||
|
||||
jobs:
|
||||
build-installer:
|
||||
# Gitea reads .github/workflows/ for compatibility, but the create-release
|
||||
# step uses a GitHub-only action. Skip the whole job on non-GitHub runners.
|
||||
if: github.server_url == 'https://github.com'
|
||||
runs-on: windows-latest
|
||||
permissions:
|
||||
contents: write # needed to create releases / upload assets
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
name: Sync Wiki
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
paths:
|
||||
- 'docs/**'
|
||||
- 'scripts/sync-wiki.ps1'
|
||||
- '.github/workflows/wiki-sync.yml'
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
sync:
|
||||
# Gitea reads .github/workflows/ for compatibility, but this workflow
|
||||
# pushes to a GitHub-hosted wiki. Skip on non-GitHub runners; the Gitea
|
||||
# wiki is synced separately via scripts/sync-wiki.ps1.
|
||||
if: github.server_url == 'https://github.com'
|
||||
runs-on: windows-latest
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Sync docs/ to GitHub wiki
|
||||
shell: pwsh
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
$repo = '${{ github.repository }}'
|
||||
$wikiUrl = "https://x-access-token:$env:GH_TOKEN@github.com/$repo.wiki.git"
|
||||
./scripts/sync-wiki.ps1 -WikiUrl $wikiUrl
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project>
|
||||
|
||||
<PropertyGroup>
|
||||
<Version>0.1.4</Version>
|
||||
<Version>0.1.2</Version>
|
||||
<Authors>Justin Paul</Authors>
|
||||
<Company>Justin Paul</Company>
|
||||
<Product>Webhook Server</Product>
|
||||
|
||||
@@ -1,159 +0,0 @@
|
||||
<#
|
||||
.SYNOPSIS
|
||||
Mirrors the in-repo docs/ folder to a GitHub or Gitea wiki repo.
|
||||
|
||||
.DESCRIPTION
|
||||
Wikis are separate git repositories (e.g. <repo>.wiki.git) with a flat URL
|
||||
structure. This script:
|
||||
|
||||
1. Clones the wiki repo into a temp directory.
|
||||
2. Wipes its existing .md content.
|
||||
3. Copies each docs/*.md to a flattened wiki-style page name.
|
||||
4. Rewrites in-repo markdown links so they point at the wiki page slugs.
|
||||
5. Generates a _Sidebar.md so every wiki page has a navigation sidebar.
|
||||
6. Commits and pushes back if anything changed.
|
||||
|
||||
Idempotent. Safe to re-run.
|
||||
|
||||
.PARAMETER WikiUrl
|
||||
Full HTTPS URL to the wiki repo, including any embedded credentials. Examples:
|
||||
https://github.com/recklessop/webhook-server.wiki.git
|
||||
https://x-access-token:$TOKEN@github.com/recklessop/webhook-server.wiki.git
|
||||
https://justin:$GITEA_TOKEN@git.jpaul.io/justin/webhook-server.wiki.git
|
||||
|
||||
.PARAMETER AuthorName
|
||||
git committer name. Defaults to "Webhook Server Wiki Sync".
|
||||
|
||||
.PARAMETER AuthorEmail
|
||||
git committer email. Defaults to "noreply@jpaul.me".
|
||||
|
||||
.EXAMPLE
|
||||
# Manual sync to Gitea (token in env)
|
||||
$env:GITEA_TOKEN = '...'
|
||||
./scripts/sync-wiki.ps1 -WikiUrl "https://justin:$env:GITEA_TOKEN@git.jpaul.io/justin/webhook-server.wiki.git"
|
||||
|
||||
.EXAMPLE
|
||||
# Manual sync to GitHub (gh-issued token)
|
||||
$token = & gh auth token
|
||||
./scripts/sync-wiki.ps1 -WikiUrl "https://x-access-token:$token@github.com/recklessop/webhook-server.wiki.git"
|
||||
#>
|
||||
[CmdletBinding()]
|
||||
param(
|
||||
[Parameter(Mandatory)][string]$WikiUrl,
|
||||
[string]$AuthorName = 'Webhook Server Wiki Sync',
|
||||
[string]$AuthorEmail = 'noreply@jpaul.me'
|
||||
)
|
||||
|
||||
# Continue (not Stop) because git writes informational messages to stderr
|
||||
# (CRLF warnings, "remote: Processed N references" etc.) which PowerShell 5.1
|
||||
# escalates to a script-fatal error under Stop. We check $LASTEXITCODE
|
||||
# manually after each git call instead.
|
||||
$ErrorActionPreference = 'Continue'
|
||||
|
||||
$repoRoot = Split-Path -Parent $PSScriptRoot
|
||||
$docsDir = Join-Path $repoRoot 'docs'
|
||||
$workDir = Join-Path $env:TEMP ("webhook-wiki-{0}" -f ([guid]::NewGuid().ToString('N').Substring(0, 8)))
|
||||
|
||||
# Source path (relative to docs/) -> wiki page slug. Order matters for the sidebar.
|
||||
$mapping = [ordered]@{}
|
||||
$mapping.Add('README.md', 'Home')
|
||||
$mapping.Add('concepts.md', 'Concepts')
|
||||
$mapping.Add('installation.md', 'Installation')
|
||||
$mapping.Add('upgrading.md', 'Upgrading')
|
||||
$mapping.Add('uninstalling.md', 'Uninstalling')
|
||||
$mapping.Add('runas-modes.md', 'Run-As-Modes')
|
||||
$mapping.Add('service-account-and-ad.md', 'Service-Account-and-AD')
|
||||
$mapping.Add('network-and-security.md', 'Network-and-Security')
|
||||
$mapping.Add('troubleshooting.md', 'Troubleshooting')
|
||||
$mapping.Add('recipes/zerto-pre-post-scripts.md', 'Recipe-Zerto-Failover')
|
||||
$mapping.Add('recipes/github-style-hmac.md', 'Recipe-GitHub-HMAC')
|
||||
$mapping.Add('recipes/ui-on-desktop.md', 'Recipe-UI-on-Desktop')
|
||||
|
||||
function Rewrite-Links([string]$content) {
|
||||
foreach ($m in $mapping.GetEnumerator()) {
|
||||
# Match (path/to/file.md) and (path/to/file.md#anchor) inside markdown
|
||||
# link parens. The lookbehind ensures we're consuming a real link target.
|
||||
$escaped = [regex]::Escape($m.Key)
|
||||
$content = [regex]::Replace($content,
|
||||
"\(\.?\.?/?$escaped(\#[^)\s]*)?\)",
|
||||
"($($m.Value)`$1)")
|
||||
}
|
||||
# Also clean up doubled prefixes like "../../docs/" or "../" pointers that
|
||||
# sometimes appear in cross-folder relative links from docs/recipes/.
|
||||
return $content
|
||||
}
|
||||
|
||||
function New-Sidebar() {
|
||||
$lines = @()
|
||||
$lines += "[Home](Home)"
|
||||
$lines += ""
|
||||
$lines += "## Topical"
|
||||
foreach ($key in @('concepts.md','installation.md','upgrading.md','uninstalling.md','runas-modes.md','service-account-and-ad.md','network-and-security.md','troubleshooting.md')) {
|
||||
$slug = $mapping[$key]
|
||||
$lines += "- [$($slug -replace '-', ' ')]($slug)"
|
||||
}
|
||||
$lines += ""
|
||||
$lines += "## Recipes"
|
||||
foreach ($key in @('recipes/zerto-pre-post-scripts.md','recipes/github-style-hmac.md','recipes/ui-on-desktop.md')) {
|
||||
$slug = $mapping[$key]
|
||||
$lines += "- [$($slug -replace '^Recipe-' -replace '-', ' ')]($slug)"
|
||||
}
|
||||
return ($lines -join "`n")
|
||||
}
|
||||
|
||||
# 1. Clone the wiki.
|
||||
Write-Host "Cloning wiki to $workDir..."
|
||||
& git clone --quiet $WikiUrl $workDir 2>&1 | Out-Null
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
throw "git clone failed. Has the wiki been initialized? Visit the repo's Wiki tab and create the first page via the UI before running this script."
|
||||
}
|
||||
# Suppress git's CRLF nags for this throwaway clone so they don't become
|
||||
# "errors" via PowerShell's native-command stderr handling.
|
||||
& git -C $workDir config core.autocrlf false 2>&1 | Out-Null
|
||||
& git -C $workDir config core.safecrlf false 2>&1 | Out-Null
|
||||
|
||||
try {
|
||||
Push-Location $workDir
|
||||
try {
|
||||
# 2. Wipe existing markdown so removed source files vanish from the wiki.
|
||||
Get-ChildItem -Filter "*.md" -Force | Remove-Item -Force
|
||||
|
||||
# 3. Copy + transform each source file.
|
||||
$written = 0
|
||||
foreach ($entry in $mapping.GetEnumerator()) {
|
||||
$src = Join-Path $docsDir $entry.Key
|
||||
$dst = Join-Path $workDir "$($entry.Value).md"
|
||||
if (-not (Test-Path $src)) {
|
||||
Write-Warning "Source missing, skipping: $src"
|
||||
continue
|
||||
}
|
||||
$content = Get-Content -LiteralPath $src -Raw
|
||||
$content = Rewrite-Links $content
|
||||
Set-Content -LiteralPath $dst -Value $content -Encoding utf8 -NoNewline
|
||||
$written++
|
||||
}
|
||||
Write-Host "Wrote $written markdown pages."
|
||||
|
||||
# 4. Sidebar
|
||||
Set-Content -LiteralPath (Join-Path $workDir '_Sidebar.md') -Value (New-Sidebar) -Encoding utf8 -NoNewline
|
||||
|
||||
# 5. Commit + push if anything actually changed. Drain stderr from each
|
||||
# git invocation so PowerShell doesn't treat warnings as errors.
|
||||
& git add -A 2>&1 | Out-Null
|
||||
$changes = & git status --porcelain 2>&1
|
||||
if (-not $changes) {
|
||||
Write-Host "Wiki already up to date."
|
||||
return
|
||||
}
|
||||
$sha = & git -C $repoRoot rev-parse --short HEAD 2>&1
|
||||
& git -c "user.name=$AuthorName" -c "user.email=$AuthorEmail" commit -q -m "Sync from docs/ at $sha" 2>&1 | Out-Null
|
||||
if ($LASTEXITCODE -ne 0) { throw "git commit failed (exit $LASTEXITCODE)" }
|
||||
& git push --quiet 2>&1 | Out-Null
|
||||
if ($LASTEXITCODE -ne 0) { throw "git push failed (exit $LASTEXITCODE)" }
|
||||
Write-Host "Pushed updated wiki."
|
||||
}
|
||||
finally { Pop-Location }
|
||||
}
|
||||
finally {
|
||||
Remove-Item -Recurse -Force $workDir -ErrorAction SilentlyContinue
|
||||
}
|
||||
@@ -31,11 +31,6 @@
|
||||
<MenuItem Header="_Export config…" Command="{Binding ExportConfigCommand}"/>
|
||||
<MenuItem Header="Config _Checkpoints…" Command="{Binding ShowConfigCheckpointsCommand}"/>
|
||||
<Separator/>
|
||||
<MenuItem Header="_Minimize to tray"
|
||||
IsCheckable="True"
|
||||
IsChecked="{Binding MinimizeToTrayEnabled, Mode=TwoWay}"
|
||||
ToolTip="When ticked, closing or minimizing the window hides it to the tray and keeps the GUI process alive. Untick to make the X button quit the app."/>
|
||||
<Separator/>
|
||||
<MenuItem Header="E_xit" Command="{Binding ExitCommand}"/>
|
||||
</MenuItem>
|
||||
<MenuItem Header="_Server">
|
||||
@@ -68,26 +63,17 @@
|
||||
<DataGrid.RowStyle>
|
||||
<Style TargetType="DataGridRow">
|
||||
<EventSetter Event="MouseDoubleClick" Handler="OnRowDoubleClick"/>
|
||||
<!-- The ContextMenu lives in its own visual tree (a popup), so
|
||||
AncestorType=Window doesn't resolve from inside menu items.
|
||||
Stash MainViewModel on the row's Tag here (still in the
|
||||
Window's tree), then reach it from the menu via
|
||||
PlacementTarget.Tag. -->
|
||||
<Setter Property="Tag" Value="{Binding DataContext, RelativeSource={RelativeSource AncestorType=Window}}"/>
|
||||
<Setter Property="ContextMenu">
|
||||
<Setter.Value>
|
||||
<ContextMenu>
|
||||
<MenuItem Header="_Edit…"
|
||||
Command="{Binding PlacementTarget.Tag.EditEndpointCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
|
||||
<MenuItem Header="_Copy URL"
|
||||
Command="{Binding PlacementTarget.Tag.CopyEndpointUrlCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
|
||||
<MenuItem Header="_Edit…" Command="{Binding DataContext.EditEndpointCommand, RelativeSource={RelativeSource AncestorType=Window}}"/>
|
||||
<MenuItem Header="_Copy URL" Command="{Binding DataContext.CopyEndpointUrlCommand, RelativeSource={RelativeSource AncestorType=Window}}"/>
|
||||
<Separator/>
|
||||
<MenuItem Header="Toggle _enabled"
|
||||
Command="{Binding PlacementTarget.Tag.ToggleEnabledCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"
|
||||
CommandParameter="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
|
||||
Command="{Binding DataContext.ToggleEnabledCommand, RelativeSource={RelativeSource AncestorType=Window}}"
|
||||
CommandParameter="{Binding}"/>
|
||||
<Separator/>
|
||||
<MenuItem Header="_Delete…"
|
||||
Command="{Binding PlacementTarget.Tag.DeleteEndpointCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"/>
|
||||
<MenuItem Header="_Delete…" Command="{Binding DataContext.DeleteEndpointCommand, RelativeSource={RelativeSource AncestorType=Window}}"/>
|
||||
</ContextMenu>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
using System.ComponentModel;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Input;
|
||||
@@ -12,56 +11,26 @@ public partial class MainWindow : Window
|
||||
private readonly TrayIcon _tray;
|
||||
private readonly MainViewModel _vm;
|
||||
|
||||
/// <summary>
|
||||
/// Set to true when the user has explicitly asked to quit (File -> Exit or
|
||||
/// Tray -> Exit). The OnClosing handler reads this to decide whether to
|
||||
/// actually let the window close or hide it to the tray.
|
||||
/// </summary>
|
||||
public bool ExitForReal { get; set; }
|
||||
|
||||
public MainWindow()
|
||||
{
|
||||
InitializeComponent();
|
||||
_vm = new MainViewModel(new AdminPipeClient());
|
||||
DataContext = _vm;
|
||||
_vm.RealExitRequested += OnRealExitRequested;
|
||||
|
||||
_tray = new TrayIcon(
|
||||
resolveMainWindow: () => Application.Current.MainWindow,
|
||||
restartServiceAsync: async () => await new AdminPipeClient().RestartListenerAsync(),
|
||||
onExit: OnRealExitRequested);
|
||||
restartServiceAsync: async () => await new AdminPipeClient().RestartListenerAsync());
|
||||
|
||||
Loaded += async (_, _) => await _vm.RefreshCommand.ExecuteAsync(null);
|
||||
StateChanged += OnStateChanged;
|
||||
Closing += OnClosing;
|
||||
}
|
||||
|
||||
private void OnClosing(object? sender, CancelEventArgs e)
|
||||
{
|
||||
if (ExitForReal || !_vm.MinimizeToTrayEnabled)
|
||||
{
|
||||
_tray.Dispose();
|
||||
return;
|
||||
}
|
||||
// Treat the X button / Alt+F4 like a minimize: hide to tray, keep the
|
||||
// process alive so the tray icon persists.
|
||||
e.Cancel = true;
|
||||
Hide();
|
||||
ShowInTaskbar = false;
|
||||
}
|
||||
|
||||
private void OnRealExitRequested()
|
||||
{
|
||||
ExitForReal = true;
|
||||
Application.Current.Shutdown();
|
||||
Closed += (_, _) => _tray.Dispose();
|
||||
}
|
||||
|
||||
private void OnStateChanged(object? sender, EventArgs e)
|
||||
{
|
||||
// Minimize-to-tray: hide the window when the user minimizes IF they've
|
||||
// opted in via File -> Minimize to tray. Otherwise behave like a normal
|
||||
// Windows minimize.
|
||||
if (WindowState == WindowState.Minimized && _vm.MinimizeToTrayEnabled)
|
||||
// Minimize-to-tray: hide the window when the user minimizes; restoring is
|
||||
// via the tray icon's double-click or context menu.
|
||||
if (WindowState == WindowState.Minimized)
|
||||
{
|
||||
Hide();
|
||||
ShowInTaskbar = false;
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
using System.IO;
|
||||
using System.Text.Json;
|
||||
|
||||
namespace WebhookServer.Gui.Services;
|
||||
|
||||
/// <summary>
|
||||
/// Per-user GUI preferences that don't belong in the service-side ServerConfig.
|
||||
/// Persisted to %APPDATA%\WebhookServer\gui.json. Best-effort: failures to read
|
||||
/// or write fall back silently to defaults.
|
||||
/// </summary>
|
||||
public sealed class GuiSettings
|
||||
{
|
||||
/// <summary>
|
||||
/// When true, the X / Alt+F4 / minimize buttons hide the window to the tray
|
||||
/// and keep the GUI process alive. When false, X exits the app and minimize
|
||||
/// behaves like a normal Windows minimize.
|
||||
/// </summary>
|
||||
public bool MinimizeToTrayEnabled { get; set; } = true;
|
||||
|
||||
private static string FilePath => Path.Combine(
|
||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||
"WebhookServer",
|
||||
"gui.json");
|
||||
|
||||
public static GuiSettings Load()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (File.Exists(FilePath))
|
||||
{
|
||||
var json = File.ReadAllText(FilePath);
|
||||
if (!string.IsNullOrWhiteSpace(json))
|
||||
return JsonSerializer.Deserialize<GuiSettings>(json) ?? new GuiSettings();
|
||||
}
|
||||
}
|
||||
catch { /* fall through to defaults */ }
|
||||
return new GuiSettings();
|
||||
}
|
||||
|
||||
public void Save()
|
||||
{
|
||||
try
|
||||
{
|
||||
var dir = Path.GetDirectoryName(FilePath);
|
||||
if (!string.IsNullOrEmpty(dir)) Directory.CreateDirectory(dir);
|
||||
File.WriteAllText(FilePath, JsonSerializer.Serialize(this, new JsonSerializerOptions { WriteIndented = true }));
|
||||
}
|
||||
catch { /* best effort */ }
|
||||
}
|
||||
}
|
||||
@@ -16,13 +16,11 @@ public sealed class TrayIcon : IDisposable
|
||||
private readonly NotifyIcon _icon;
|
||||
private readonly Func<Window?> _resolveMainWindow;
|
||||
private readonly Func<Task> _restartServiceAsync;
|
||||
private readonly Action _onExit;
|
||||
|
||||
public TrayIcon(Func<Window?> resolveMainWindow, Func<Task> restartServiceAsync, Action onExit)
|
||||
public TrayIcon(Func<Window?> resolveMainWindow, Func<Task> restartServiceAsync)
|
||||
{
|
||||
_resolveMainWindow = resolveMainWindow;
|
||||
_restartServiceAsync = restartServiceAsync;
|
||||
_onExit = onExit;
|
||||
|
||||
_icon = new NotifyIcon
|
||||
{
|
||||
@@ -41,7 +39,7 @@ public sealed class TrayIcon : IDisposable
|
||||
menu.Items.Add(new ToolStripSeparator());
|
||||
menu.Items.Add("&Restart service", null, async (_, _) => await _restartServiceAsync().ConfigureAwait(false));
|
||||
menu.Items.Add(new ToolStripSeparator());
|
||||
menu.Items.Add("E&xit", null, (_, _) => _onExit());
|
||||
menu.Items.Add("E&xit", null, (_, _) => Application.Current.Shutdown());
|
||||
return menu;
|
||||
}
|
||||
|
||||
|
||||
@@ -82,14 +82,8 @@ public sealed partial class ConfigCheckpointsViewModel : ObservableObject
|
||||
{
|
||||
if (Selected is null) return;
|
||||
|
||||
// Capture before the refresh; the ObservableCollection.Clear() in
|
||||
// RefreshAsync nulls Selected (the original instance is gone from the
|
||||
// collection so the SelectedItem binding clears).
|
||||
var fileName = Selected.FileName;
|
||||
var savedAt = Selected.SavedAt;
|
||||
|
||||
var ok = MessageBox.Show(
|
||||
$"Roll the configuration back to the checkpoint from {savedAt.ToLocalTime():yyyy-MM-dd HH:mm:ss}?\n\nThe current configuration is automatically saved as a new checkpoint first, so you can roll forward again.",
|
||||
$"Roll the configuration back to the checkpoint from {Selected.SavedAt.ToLocalTime():yyyy-MM-dd HH:mm:ss}?\n\nThe current configuration is automatically saved as a new checkpoint first, so you can roll forward again.",
|
||||
"Confirm rollback",
|
||||
MessageBoxButton.OKCancel,
|
||||
MessageBoxImage.Warning);
|
||||
@@ -97,10 +91,10 @@ public sealed partial class ConfigCheckpointsViewModel : ObservableObject
|
||||
|
||||
try
|
||||
{
|
||||
await _client.RestoreBackupAsync(fileName).ConfigureAwait(false);
|
||||
await _client.RestoreBackupAsync(Selected.FileName).ConfigureAwait(false);
|
||||
await RefreshAsync().ConfigureAwait(false);
|
||||
Application.Current.Dispatcher.Invoke(() =>
|
||||
StatusMessage = $"Rolled back to {fileName}.");
|
||||
StatusMessage = $"Rolled back to {Selected!.FileName}.");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
@@ -29,28 +29,17 @@ public sealed partial class MainViewModel : ObservableObject
|
||||
[ObservableProperty] private ServerConfig _serverConfig = new();
|
||||
[ObservableProperty] private string _httpBaseUrl = "http://localhost:8080";
|
||||
[ObservableProperty] private string? _httpsBaseUrl;
|
||||
[ObservableProperty] private bool _minimizeToTrayEnabled;
|
||||
|
||||
private readonly DispatcherTimer _logTimer;
|
||||
private readonly GuiSettings _settings;
|
||||
|
||||
public MainViewModel(AdminPipeClient client)
|
||||
{
|
||||
_client = client;
|
||||
_settings = GuiSettings.Load();
|
||||
_minimizeToTrayEnabled = _settings.MinimizeToTrayEnabled;
|
||||
|
||||
_logTimer = new DispatcherTimer(DispatcherPriority.Background) { Interval = TimeSpan.FromSeconds(3) };
|
||||
_logTimer.Tick += async (_, _) => await RefreshLogTailAsync();
|
||||
_logTimer.Start();
|
||||
}
|
||||
|
||||
partial void OnMinimizeToTrayEnabledChanged(bool value)
|
||||
{
|
||||
_settings.MinimizeToTrayEnabled = value;
|
||||
_settings.Save();
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
private async Task RefreshAsync()
|
||||
{
|
||||
@@ -297,14 +286,10 @@ public sealed partial class MainViewModel : ObservableObject
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Raised when the user picks File -> Exit. MainWindow flips its
|
||||
/// ExitForReal flag and shuts down, bypassing the X-hides-to-tray logic.</summary>
|
||||
public event Action? RealExitRequested;
|
||||
|
||||
[RelayCommand]
|
||||
private void Exit()
|
||||
{
|
||||
RealExitRequested?.Invoke();
|
||||
Application.Current.Shutdown();
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
|
||||
Reference in New Issue
Block a user