Add option to use a separate database for downloads when creating a new database

app/.editorconfig

@@ -1,2 +0,0 @@
-[*.cs]
-propertychanged.auto_notify = false

app/Desktop/Desktop.csproj

@@ -23,10 +23,7 @@
     <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.3" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.3" />
-    <PackageReference Include="PropertyChanged.SourceGenerator" Version="1.1.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="999.0.0-build.0.g0d941a6a62" />
   </ItemGroup>
   
   <ItemGroup>

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using PropertyChanged.SourceGenerator;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace DHT.Desktop.Dialogs.CheckBox;
 
-partial class CheckBoxDialogModel {
+class CheckBoxDialogModel : ObservableObject {
 	public string Title { get; init; } = "";
 	
 	private IReadOnlyList<CheckBoxItem> items = [];
@@ -28,10 +28,7 @@ partial class CheckBoxDialogModel {
 	
 	private bool pauseCheckEvents = false;
 	
-	[DependsOn(nameof(Items))]
 	public bool AreAllSelected => Items.All(static item => item.IsChecked);
-	
-	[DependsOn(nameof(Items))]
 	public bool AreNoneSelected => Items.All(static item => !item.IsChecked);
 	
 	public void SelectAll() => SetAllChecked(true);
@@ -49,7 +46,8 @@ partial class CheckBoxDialogModel {
 	}
 	
 	private void UpdateBulkButtons() {
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(Items)));
+		OnPropertyChanged(nameof(AreAllSelected));
+		OnPropertyChanged(nameof(AreNoneSelected));
 	}
 	
 	private void OnItemPropertyChanged(object? sender, PropertyChangedEventArgs e) {

app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs

@@ -1,12 +1,12 @@
-using PropertyChanged.SourceGenerator;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace DHT.Desktop.Dialogs.CheckBox;
 
-partial class CheckBoxItem {
+partial class CheckBoxItem : ObservableObject {
 	public string Title { get; init; } = "";
 	public object? Item { get; init; } = null;
 	
-	[Notify]
+	[ObservableProperty]
 	private bool isChecked = false;
 }
 

app/Desktop/Dialogs/File/FileDialogs.cs

@@ -8,10 +8,6 @@ using Avalonia.Platform.Storage;
 namespace DHT.Desktop.Dialogs.File;
 
 static class FileDialogs {
-	public static async Task<string[]> OpenFolders(this IStorageProvider storageProvider, FolderPickerOpenOptions options) {
-		return (await storageProvider.OpenFolderPickerAsync(options)).ToLocalPaths();
-	}
-	
 	public static async Task<string[]> OpenFiles(this IStorageProvider storageProvider, FilePickerOpenOptions options) {
 		return (await storageProvider.OpenFilePickerAsync(options)).ToLocalPaths();
 	}
@@ -30,11 +26,11 @@ static class FileDialogs {
 		return suggestedDirectory == null ? Task.FromResult<IStorageFolder?>(null) : window.StorageProvider.TryGetFolderFromPathAsync(suggestedDirectory);
 	}
 	
-	private static string ToLocalPath(this IStorageItem itme) {
-		return itme.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
+	private static string ToLocalPath(this IStorageFile file) {
+		return file.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
 	}
 	
-	private static string[] ToLocalPaths(this IReadOnlyList<IStorageItem> items) {
-		return items.Select(ToLocalPath).ToArray();
+	private static string[] ToLocalPaths(this IReadOnlyList<IStorageFile> files) {
+		return files.Select(ToLocalPath).ToArray();
 	}
 }

app/Desktop/Dialogs/Progress/IProgressCallback.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 namespace DHT.Desktop.Dialogs.Progress;
 
 interface IProgressCallback {
-	Task Update(string message, long finishedItems, long totalItems);
+	Task Update(string message, int finishedItems, int totalItems);
 	Task UpdateIndeterminate(string message);
 	Task Hide();
 }

app/Desktop/Dialogs/Progress/ProgressDialog.axaml.cs

@@ -2,6 +2,7 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using DHT.Desktop.Dialogs.Message;
 using DHT.Utils.Logging;
 
 namespace DHT.Desktop.Dialogs.Progress;
@@ -11,37 +12,57 @@ public sealed partial class ProgressDialog : Window {
 	private static readonly Log Log = Log.ForType<ProgressDialog>();
 	
 	internal static async Task Show(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task> action) {
+		var taskCompletionSource = new TaskCompletionSource();
 		var dialog = new ProgressDialog();
-		dialog.DataContext = new ProgressDialogModel(title, async callbacks => await action(dialog, callbacks[0]));
+		
+		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
+			try {
+				await action(dialog, callbacks[0]);
+				taskCompletionSource.SetResult();
+			} catch (Exception e) {
+				taskCompletionSource.SetException(e);
+			}
+		});
+		
 		await dialog.ShowProgressDialog(owner);
+		await taskCompletionSource.Task;
 	}
 	
-	internal static async Task<T> Show<T>(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task<T>> action) {
+	internal static async Task ShowIndeterminate(Window owner, string title, string message, Func<ProgressDialog, Task> action) {
+		var taskCompletionSource = new TaskCompletionSource();
+		var dialog = new ProgressDialog();
+		
+		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
+			await callbacks[0].UpdateIndeterminate(message);
+			try {
+				await action(dialog);
+				taskCompletionSource.SetResult();
+			} catch (Exception e) {
+				taskCompletionSource.SetException(e);
+			}
+		});
+		
+		await dialog.ShowProgressDialog(owner);
+		await taskCompletionSource.Task;
+	}
+	
+	internal static async Task<T> ShowIndeterminate<T>(Window owner, string title, string message, Func<ProgressDialog, Task<T>> action) {
 		var taskCompletionSource = new TaskCompletionSource<T>();
 		var dialog = new ProgressDialog();
 		
 		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-			taskCompletionSource.SetResult(await action(dialog, callbacks[0]));
+			await callbacks[0].UpdateIndeterminate(message);
+			try {
+				taskCompletionSource.SetResult(await action(dialog));
+			} catch (Exception e) {
+				taskCompletionSource.SetException(e);
+			}
 		});
 		
 		await dialog.ShowProgressDialog(owner);
 		return await taskCompletionSource.Task;
 	}
 	
-	internal static Task ShowIndeterminate(Window owner, string title, string message, Func<ProgressDialog, Task> action) {
-		return Show(owner, title, async (dialog, callback) => {
-			await callback.UpdateIndeterminate(message);
-			await action(dialog);
-		});
-	}
-	
-	internal static Task<T> ShowIndeterminate<T>(Window owner, string title, string message, Func<ProgressDialog, Task<T>> action) {
-		return Show<T>(owner, title, async (dialog, callback) => {
-			await callback.UpdateIndeterminate(message);
-			return await action(dialog);
-		});
-	}
-	
 	private bool isFinished = false;
 	private Task progressTask = Task.CompletedTask;
 	
@@ -67,6 +88,11 @@ public sealed partial class ProgressDialog : Window {
 	
 	public async Task ShowProgressDialog(Window owner) {
 		await ShowDialog(owner);
-		await progressTask;
+		try {
+			await progressTask;
+		} catch (Exception e) {
+			Log.Error(e);
+			await Dialog.ShowOk(owner, "Unexpected Error", e.Message);
+		}
 	}
 }

app/Desktop/Dialogs/Progress/ProgressDialogModel.cs

@@ -38,7 +38,7 @@ sealed class ProgressDialogModel {
 			this.item = item;
 		}
 		
-		public async Task Update(string message, long finishedItems, long totalItems) {
+		public async Task Update(string message, int finishedItems, int totalItems) {
 			await Dispatcher.UIThread.InvokeAsync(() => {
 				item.Message = message;
 				item.Items = totalItems == 0 ? string.Empty : finishedItems.Format() + " / " + totalItems.Format();

app/Desktop/Dialogs/Progress/ProgressItem.cs

@@ -1,23 +1,30 @@
-using PropertyChanged.SourceGenerator;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace DHT.Desktop.Dialogs.Progress;
 
-sealed partial class ProgressItem {
-	[Notify]
+sealed partial class ProgressItem : ObservableObject {
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(Opacity))]
+	private bool isVisible = false;
+	
+	public double Opacity => IsVisible ? 1.0 : 0.0;
+	
 	private string message = "";
 	
-	[Notify]
+	public string Message {
+		get => message;
+		set {
+			SetProperty(ref message, value);
+			IsVisible = !string.IsNullOrEmpty(value);
+		}
+	}
+	
+	[ObservableProperty]
 	private string items = "";
 	
-	[Notify]
-	private long progress = 0L;
+	[ObservableProperty]
+	private int progress = 0;
 	
-	[Notify]
+	[ObservableProperty]
 	private bool isIndeterminate;
-	
-	[DependsOn(nameof(Message))]
-	public bool IsVisible => !string.IsNullOrEmpty(Message);
-	
-	[DependsOn(nameof(IsVisible))]
-	public double Opacity => IsVisible ? 1.0 : 0.0;
 }

app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using PropertyChanged.SourceGenerator;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace DHT.Desktop.Dialogs.TextBox;
 
-partial class TextBoxDialogModel {
+class TextBoxDialogModel : ObservableObject {
 	public string Title { get; init; } = "";
 	public string Description { get; init; } = "";
 	
@@ -27,11 +27,10 @@ partial class TextBoxDialogModel {
 		}
 	}
 	
-	[DependsOn(nameof(Items))]
 	public bool HasErrors => Items.Any(static item => !item.IsValid);
 	
 	private void OnItemErrorsChanged(object? sender, DataErrorsChangedEventArgs e) {
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(Items)));
+		OnPropertyChanged(nameof(HasErrors));
 	}
 }
 

app/Desktop/Dialogs/TextBox/TextBoxItem.cs

@@ -1,22 +1,25 @@
 using System;
 using System.Collections;
 using System.ComponentModel;
-using PropertyChanged.SourceGenerator;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace DHT.Desktop.Dialogs.TextBox;
 
-partial class TextBoxItem : INotifyDataErrorInfo {
+class TextBoxItem : ObservableObject, INotifyDataErrorInfo {
 	public string Title { get; init; } = "";
 	public object? Item { get; init; } = null;
 	
 	public Func<string, bool> ValidityCheck { get; init; } = static _ => true;
 	public bool IsValid => ValidityCheck(Value);
 	
-	[Notify]
 	private string value = string.Empty;
 	
-	private void OnValueChanged() {
-		ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Value)));
+	public string Value {
+		get => value;
+		set {
+			SetProperty(ref this.value, value);
+			ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Value)));
+		}
 	}
 	
 	public IEnumerable GetErrors(string? propertyName) {

app/Desktop/Main/AboutWindow.axaml

@@ -3,12 +3,12 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:main="clr-namespace:DHT.Desktop.Main"
-        mc:Ignorable="d" d:DesignWidth="510" d:DesignHeight="375"
+        mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="360"
         x:Class="DHT.Desktop.Main.AboutWindow"
         x:DataType="main:AboutWindowModel"
         Title="About Discord History Tracker"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Width="510" Height="375" CanResize="False"
+        Width="480" Height="360" CanResize="False"
         WindowStartupLocation="CenterOwner">
 
     <Design.DataContext>
@@ -16,6 +16,10 @@
     </Design.DataContext>
 
     <Window.Styles>
+        <Style Selector="StackPanel">
+            <Setter Property="Orientation" Value="Horizontal" />
+            <Setter Property="Spacing" Value="5" />
+        </Style>
         <Style Selector="TextBlock">
             <Setter Property="TextWrapping" Value="Wrap" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -29,45 +33,44 @@
 
     <StackPanel Orientation="Vertical" Margin="20" Spacing="12">
 
-        <StackPanel Orientation="Vertical" Spacing="3">
-            <TextBlock TextWrapping="Wrap">Discord History Tracker was created by chylex.</TextBlock>
-            <TextBlock>It is available under the MIT license.</TextBlock>
-        </StackPanel>
+        <TextBlock VerticalAlignment="Center">
+            Discord History Tracker was created by chylex and released under the MIT license.
+        </TextBlock>
 
-        <StackPanel Orientation="Horizontal" Spacing="8">
+        <StackPanel>
             <Button Command="{Binding ShowOfficialWebsite}">Official Website</Button>
             <Button Command="{Binding ShowIssueTracker}">Issue Tracker</Button>
             <Button Command="{Binding ShowSourceCode}">Source Code</Button>
         </StackPanel>
 
-        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="*,115,95" Margin="0 10 0 0">
+        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="175,125,*" Margin="0 10 0 0">
             <TextBlock Grid.Row="0" Grid.Column="0" FontWeight="Bold">Third-Party Software</TextBlock>
             <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold">License</TextBlock>
             <TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold">Link</TextBlock>
 
-            <TextBlock Grid.Row="2" Grid.Column="0">.NET</TextBlock>
+            <TextBlock Grid.Row="2" Grid.Column="0">.NET 8</TextBlock>
             <TextBlock Grid.Row="2" Grid.Column="1">MIT</TextBlock>
             <Button Grid.Row="2" Grid.Column="2" Command="{Binding ShowLibraryNetCore}">GitHub</Button>
 
             <TextBlock Grid.Row="3" Grid.Column="0">Avalonia</TextBlock>
             <TextBlock Grid.Row="3" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="3" Grid.Column="2" Command="{Binding ShowLibraryAvalonia}">GitHub</Button>
+            <Button Grid.Row="3" Grid.Column="2" Command="{Binding ShowLibraryAvalonia}">NuGet</Button>
 
-            <TextBlock Grid.Row="4" Grid.Column="0">Rx.NET</TextBlock>
+            <TextBlock Grid.Row="4" Grid.Column="0">MVVM Toolkit</TextBlock>
             <TextBlock Grid.Row="4" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibraryRxNet}">GitHub</Button>
+            <Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibraryCommunityToolkit}">GitHub</Button>
 
             <TextBlock Grid.Row="5" Grid.Column="0">SQLite</TextBlock>
             <TextBlock Grid.Row="5" Grid.Column="1">Public Domain</TextBlock>
-            <Button Grid.Row="5" Grid.Column="2" Command="{Binding ShowLibrarySqlite}">Website</Button>
+            <Button Grid.Row="5" Grid.Column="2" Command="{Binding ShowLibrarySqlite}">Official Website</Button>
 
             <TextBlock Grid.Row="6" Grid.Column="0">Microsoft.Data.Sqlite</TextBlock>
             <TextBlock Grid.Row="6" Grid.Column="1">Apache-2.0</TextBlock>
             <Button Grid.Row="6" Grid.Column="2" Command="{Binding ShowLibrarySqliteAdoNet}">NuGet</Button>
 
-            <TextBlock Grid.Row="7" Grid.Column="0">PropertyChanged.SourceGenerator</TextBlock>
+            <TextBlock Grid.Row="7" Grid.Column="0">Rx.NET</TextBlock>
             <TextBlock Grid.Row="7" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="7" Grid.Column="2" Command="{Binding ShowLibraryPropertyChangedSourceGenerator}">GitHub</Button>
+            <Button Grid.Row="7" Grid.Column="2" Command="{Binding ShowLibraryRxNet}">GitHub</Button>
         </Grid>
 
     </StackPanel>

app/Desktop/Main/AboutWindowModel.cs

@@ -20,11 +20,11 @@ sealed class AboutWindowModel {
 	}
 	
 	public void ShowLibraryAvalonia() {
-		SystemUtils.OpenUrl("https://github.com/AvaloniaUI/Avalonia");
+		SystemUtils.OpenUrl("https://www.nuget.org/packages/Avalonia");
 	}
 	
-	public void ShowLibraryPropertyChangedSourceGenerator() {
-		SystemUtils.OpenUrl("https://github.com/canton7/PropertyChanged.SourceGenerator");
+	public void ShowLibraryCommunityToolkit() {
+		SystemUtils.OpenUrl("https://github.com/CommunityToolkit/dotnet");
 	}
 	
 	public void ShowLibrarySqlite() {

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

@@ -5,17 +5,17 @@ using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.ReactiveUI;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Server;
 using DHT.Server.Data.Filters;
 using DHT.Server.Data.Settings;
 using DHT.Utils.Logging;
 using DHT.Utils.Tasks;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
+sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisposable {
 	private static readonly Log Log = Log.ForType<DownloadItemFilterPanelModel>();
 	
 	public sealed record Unit(string Name, uint Scale);
@@ -32,16 +32,15 @@ sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
 		nameof(MaximumSizeUnit),
 	];
 	
-	[Notify(Setter.Private)]
-	private string filterStatisticsText = "";
+	public string FilterStatisticsText { get; private set; } = "";
 	
-	[Notify]
+	[ObservableProperty]
 	private bool limitSize = false;
 	
-	[Notify]
+	[ObservableProperty]
 	private ulong maximumSize = 0UL;
 	
-	[Notify]
+	[ObservableProperty]
 	private Unit maximumSizeUnit = AllUnits[0];
 	
 	public IEnumerable<Unit> Units => AllUnits;
@@ -152,7 +151,9 @@ sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
 	private void UpdateFilterStatisticsText() {
 		string matchingItemCountStr = matchingItemCount?.Format() ?? "(...)";
 		string totalItemCountStr = totalItemCount?.Format() ?? "(...)";
+		
 		FilterStatisticsText = verb + " " + matchingItemCountStr + " out of " + totalItemCountStr + " file" + (totalItemCount is null or 1 ? "." : "s.");
+		OnPropertyChanged(nameof(FilterStatisticsText));
 	}
 	
 	public DownloadItemFilter CreateFilter() {

app/Desktop/Main/Controls/MessageFilterPanelModel.cs

@@ -7,6 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.ReactiveUI;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.CheckBox;
 using DHT.Desktop.Dialogs.Message;
@@ -15,11 +16,10 @@ using DHT.Server;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
 using DHT.Utils.Tasks;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class MessageFilterPanelModel : IDisposable {
+sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 	private static readonly HashSet<string> FilterProperties = [
 		nameof(FilterByDate),
 		nameof(StartDate),
@@ -30,38 +30,37 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 		nameof(IncludedUsers),
 	];
 	
+	public string FilterStatisticsText { get; private set; } = "";
+	
 	public event PropertyChangedEventHandler? FilterPropertyChanged;
 	
 	public bool HasAnyFilters => FilterByDate || FilterByChannel || FilterByUser;
 	
-	[Notify]
-	private string filterStatisticsText = "";
-	
-	[Notify]
+	[ObservableProperty]
 	private bool filterByDate = false;
 	
-	[Notify]
+	[ObservableProperty]
 	private DateTime? startDate = null;
 	
-	[Notify]
+	[ObservableProperty]
 	private DateTime? endDate = null;
 	
-	[Notify]
+	[ObservableProperty]
 	private bool filterByChannel = false;
 	
-	[Notify]
+	[ObservableProperty]
 	private HashSet<ulong>? includedChannels = null;
 	
-	[Notify]
+	[ObservableProperty]
 	private bool filterByUser = false;
 	
-	[Notify]
+	[ObservableProperty]
 	private HashSet<ulong>? includedUsers = null;
 	
-	[Notify]
+	[ObservableProperty]
 	private string channelFilterLabel = "";
 	
-	[Notify]
+	[ObservableProperty]
 	private string userFilterLabel = "";
 	
 	private readonly Window window;
@@ -182,7 +181,9 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 	private void UpdateFilterStatisticsText() {
 		string exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
 		string totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
+		
 		FilterStatisticsText = verb + " " + exportedMessageCountStr + " out of " + totalMessageCountStr + " message" + (totalMessageCount is null or 1 ? "." : "s.");
+		OnPropertyChanged(nameof(FilterStatisticsText));
 	}
 	
 	public async Task OpenChannelFilterDialog() {

app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs

@@ -1,30 +1,30 @@
 using System;
-using System.ComponentModel;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Server;
 using DHT.Server;
 using DHT.Server.Service;
 using DHT.Utils.Logging;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class ServerConfigurationPanelModel : IDisposable {
+sealed partial class ServerConfigurationPanelModel : ObservableObject, IDisposable {
 	private static readonly Log Log = Log.ForType<ServerConfigurationPanelModel>();
 	
-	[Notify]
+	[ObservableProperty]
+	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
 	private string inputPort;
 	
-	[Notify]
+	[ObservableProperty]
+	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
 	private string inputToken;
 	
-	[DependsOn(nameof(InputPort), nameof(InputToken))]
 	public bool HasMadeChanges => ServerConfiguration.Port.ToString() != InputPort || ServerConfiguration.Token != InputToken;
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private bool isToggleServerButtonEnabled = true;
 	
 	public string ToggleServerButtonText => server.IsRunning ? "Stop Server" : "Start Server";
@@ -53,7 +53,7 @@ sealed partial class ServerConfigurationPanelModel : IDisposable {
 	}
 	
 	private void UpdateServerStatus() {
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(ToggleServerButtonText)));
+		OnPropertyChanged(nameof(ToggleServerButtonText));
 	}
 	
 	private async Task StartServer() {
@@ -106,7 +106,7 @@ sealed partial class ServerConfigurationPanelModel : IDisposable {
 		ServerConfiguration.Port = port;
 		ServerConfiguration.Token = inputToken;
 		
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(HasMadeChanges)));
+		OnPropertyChanged(nameof(HasMadeChanges));
 		
 		await StartServer();
 	}

app/Desktop/Main/Controls/StatusBarModel.cs

@@ -2,27 +2,27 @@ using System;
 using System.Reactive.Linq;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Server;
 using DHT.Server.Service;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class StatusBarModel : IDisposable {
-	[Notify(Setter.Private)]
+sealed partial class StatusBarModel : ObservableObject, IDisposable {
+	[ObservableProperty(Setter = Access.Private)]
 	private long? serverCount;
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private long? channelCount;
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private long? messageCount;
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(ServerStatusText))]
 	private ServerManager.Status serverStatus;
 	
-	[DependsOn(nameof(ServerStatus))]
-	public string ServerStatusText => ServerStatus switch {
+	public string ServerStatusText => serverStatus switch {
 		ServerManager.Status.Starting => "STARTING",
 		ServerManager.Status.Started  => "READY",
 		ServerManager.Status.Stopping => "STOPPING",
@@ -45,7 +45,7 @@ sealed partial class StatusBarModel : IDisposable {
 		channelCountSubscription = state.Db.Channels.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(newChannelCount => ChannelCount = newChannelCount);
 		messageCountSubscription = state.Db.Messages.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(newMessageCount => MessageCount = newMessageCount);
 		
-		state.Server.StatusChanged += OnStateServerStatusChanged;
+		state.Server.StatusChanged += OnServerStatusChanged;
 		serverStatus = state.Server.IsRunning ? ServerManager.Status.Started : ServerManager.Status.Stopped;
 	}
 	
@@ -54,10 +54,10 @@ sealed partial class StatusBarModel : IDisposable {
 		channelCountSubscription.Dispose();
 		messageCountSubscription.Dispose();
 		
-		state.Server.StatusChanged -= OnStateServerStatusChanged;
+		state.Server.StatusChanged -= OnServerStatusChanged;
 	}
 	
-	private void OnStateServerStatusChanged(object? sender, ServerManager.Status e) {
+	private void OnServerStatusChanged(object? sender, ServerManager.Status e) {
 		Dispatcher.UIThread.InvokeAsync(() => ServerStatus = e);
 	}
 }

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml.cs

@@ -11,9 +11,7 @@ public sealed partial class NewDatabaseSettingsDialog : Window {
 	}
 	
 	private void OnClosing(object? sender, WindowClosingEventArgs e) {
-		if (!e.IsProgrammatic) {
-			e.Cancel = true;
-		}
+		e.Cancel = true;
 	}
 	
 	private void ClickOk(object? sender, RoutedEventArgs e) {

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialogModel.cs

@@ -1,11 +1,11 @@
-using PropertyChanged.SourceGenerator;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace DHT.Desktop.Main.Dialogs;
 
-sealed partial class NewDatabaseSettingsDialogModel {
-	[Notify]
+sealed partial class NewDatabaseSettingsDialogModel : ObservableObject {
+	[ObservableProperty]
 	private bool separateFileForDownloads = true;
 	
-	[Notify]
+	[ObservableProperty]
 	private bool downloadsAutoStart = true;
 }

app/Desktop/Main/MainWindowModel.cs

@@ -3,25 +3,25 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Main.Screens;
 using DHT.Desktop.Server;
 using DHT.Server;
 using DHT.Server.Database;
 using DHT.Utils.Logging;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main;
 
-sealed partial class MainWindowModel : IAsyncDisposable {
+sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 	private const string DefaultTitle = "Discord History Tracker";
 	
 	private static readonly Log Log = Log.ForType<MainWindowModel>();
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private string title = DefaultTitle;
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private UserControl currentScreen;
 	
 	private readonly WelcomeScreen welcomeScreen;

app/Desktop/Main/Pages/DatabasePage.axaml

@@ -27,7 +27,7 @@
             <Button Command="{Binding MergeWithDatabase}">Merge with Database(s)...</Button>
             <Button Command="{Binding ImportLegacyArchive}">Import Legacy Archive(s)...</Button>
         </WrapPanel>
-        <Expander Header="Advanced Tools" Margin="0 15 0 0">
+        <Expander Header="Advanced Tools" IsExpanded="True" Margin="0 15 0 0">
             <StackPanel Orientation="Vertical" Spacing="10">
                 <TextBlock TextWrapping="Wrap">Recreate the database to free up space after deleting data.</TextBlock>
                 <Button Command="{Binding VacuumDatabase}">Vacuum Database</Button>

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -74,28 +74,15 @@ sealed class DatabasePageModel {
 	
 	public async Task MergeWithDatabase() {
 		string[] paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
-		if (paths.Length == 0) {
-			return;
+		if (paths.Length > 0) {
+			await ProgressDialog.Show(window, "Database Merge", async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
 		}
-		
-		const string Title = "Database Merge";
-		
-		ImportResult? result;
-		try {
-			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, Title, "Could not merge databases: " + e.Message);
-			return;
-		}
-		
-		await Dialog.ShowOk(window, Title, GetImportDialogMessage(result, "database file"));
 	}
 	
-	private static async Task<ImportResult?> MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
+	private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
 		var schemaUpgradeCallbacks = new SchemaUpgradeCallbacks(dialog, paths.Length);
 		
-		return await PerformImport(target, paths, dialog, callback, "Database Merge", async path => {
+		await PerformImport(target, paths, dialog, callback, "Database Merge", "Database Error", "database file", async path => {
 			IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, schemaUpgradeCallbacks);
 			
 			if (db == null) {
@@ -150,28 +137,15 @@ sealed class DatabasePageModel {
 			AllowMultiple = true,
 		});
 		
-		if (paths.Length == 0) {
-			return;
+		if (paths.Length > 0) {
+			await ProgressDialog.Show(window, "Legacy Archive Import", async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
 		}
-		
-		const string Title = "Legacy Archive Import";
-		
-		ImportResult? result;
-		try {
-			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, Title, "Could not import legacy archives: " + e.Message);
-			return;
-		}
-		
-		await Dialog.ShowOk(window, Title, GetImportDialogMessage(result, "archive file"));
 	}
 	
-	private static async Task<ImportResult?> ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
+	private static async Task ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
 		var fakeSnowflake = new FakeSnowflake();
 		
-		return await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", async path => {
+		await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", "Legacy Archive Error", "archive file", async path => {
 			await using var jsonStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
 			
 			return await LegacyArchiveImport.Read(jsonStream, target, fakeSnowflake, async servers => {
@@ -215,7 +189,7 @@ sealed class DatabasePageModel {
 		            .ToDictionary(static item => item.Item, static item => ulong.Parse(item.Value));
 	}
 	
-	private static async Task<ImportResult?> PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string dialogTitle, Func<string, Task<bool>> performImport) {
+	private static async Task PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string neutralDialogTitle, string errorDialogTitle, string itemName, Func<string, Task<bool>> performImport) {
 		int total = paths.Length;
 		DatabaseStatistics oldStatistics = await DatabaseStatistics.Take(target);
 		
@@ -227,7 +201,7 @@ sealed class DatabasePageModel {
 			++finished;
 			
 			if (!File.Exists(path)) {
-				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
+				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
 				continue;
 			}
 			
@@ -237,18 +211,19 @@ sealed class DatabasePageModel {
 				}
 			} catch (Exception ex) {
 				Log.Error(ex);
-				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
+				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
 			}
 		}
 		
 		await callback.Update("Done", finished, total);
 		
 		if (successful == 0) {
-			return null;
+			await Dialog.ShowOk(dialog, neutralDialogTitle, "Nothing was imported.");
+			return;
 		}
 		
 		DatabaseStatistics newStatistics = await DatabaseStatistics.Take(target);
-		return new ImportResult(oldStatistics, newStatistics, successful, total);
+		await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, newStatistics, successful, total, itemName));
 	}
 	
 	private sealed record DatabaseStatistics(long ServerCount, long ChannelCount, long UserCount, long MessageCount) {
@@ -262,16 +237,7 @@ sealed class DatabasePageModel {
 		}
 	}
 	
-	private sealed record ImportResult(DatabaseStatistics OldStatistics, DatabaseStatistics NewStatistics, int SuccessfulItems, int TotalItems);
-	
-	private static string GetImportDialogMessage(ImportResult? result, string itemName) {
-		if (result == null) {
-			return "Nothing was imported.";
-		}
-		
-		var oldStatistics = result.OldStatistics;
-		var newStatistics = result.NewStatistics;
-		
+	private static string GetImportDialogMessage(DatabaseStatistics oldStatistics, DatabaseStatistics newStatistics, int successfulItems, int totalItems, string itemName) {
 		long newServers = newStatistics.ServerCount - oldStatistics.ServerCount;
 		long newChannels = newStatistics.ChannelCount - oldStatistics.ChannelCount;
 		long newUsers = newStatistics.UserCount - oldStatistics.UserCount;
@@ -280,11 +246,11 @@ sealed class DatabasePageModel {
 		var message = new StringBuilder();
 		message.Append("Processed ");
 		
-		if (result.SuccessfulItems == result.TotalItems) {
-			message.Append(result.SuccessfulItems.Pluralize(itemName));
+		if (successfulItems == totalItems) {
+			message.Append(successfulItems.Pluralize(itemName));
 		}
 		else {
-			message.Append(result.SuccessfulItems.Format()).Append(" out of ").Append(result.TotalItems.Pluralize(itemName));
+			message.Append(successfulItems.Format()).Append(" out of ").Append(totalItems.Pluralize(itemName));
 		}
 		
 		message.Append(" and added:\n\n  \u2022 ");
@@ -298,15 +264,7 @@ sealed class DatabasePageModel {
 	
 	public async Task VacuumDatabase() {
 		const string Title = "Vacuum Database";
-		
-		try {
-			await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => Db.Vacuum());
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, Title, "Could not vacuum database: " + e.Message);
-			return;
-		}
-		
+		await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => Db.Vacuum());
 		await Dialog.ShowOk(window, Title, "Done.");
 	}
 }

app/Desktop/Main/Pages/DebugPageModel.cs

@@ -51,7 +51,7 @@ sealed class DebugPageModel {
 	
 	private async Task GenerateRandomData(int channelCount, int userCount, int messageCount, IProgressCallback callback) {
 		int batchCount = (messageCount + BatchSize - 1) / BatchSize;
-		await callback.Update("Adding messages in batches of " + BatchSize, finishedItems: 0, totalItems: batchCount);
+		await callback.Update("Adding messages in batches of " + BatchSize, finishedItems: 0, batchCount);
 		
 		var rand = new Random();
 		var server = new DHT.Server.Data.Server {

app/Desktop/Main/Pages/DownloadsPage.axaml

@@ -33,9 +33,8 @@
     <StackPanel Orientation="Vertical">
         <WrapPanel Orientation="Horizontal">
             <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
-            <Button Command="{Binding OnClickRetryFailed}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed</Button>
-            <Button Command="{Binding OnClickDeleteOrphaned}">Delete Orphaned</Button>
-            <Button Command="{Binding OnClickExportAll}" IsEnabled="{Binding HasSuccessfulDownloads}">Export All...</Button>
+            <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
+            <Button Command="{Binding OnClickDeleteOrphanedDownloads}">Delete Orphaned Downloads</Button>
         </WrapPanel>
         <StackPanel Orientation="Vertical" Spacing="20" Margin="0 10 0 0">
             <controls:DownloadItemFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !$parent[UserControl].((pages:DownloadsPageModel)DataContext).IsDownloading}" />

app/Desktop/Main/Pages/DownloadsPageModel.cs

@@ -1,14 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.Platform.Storage;
 using Avalonia.ReactiveUI;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
-using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Controls;
@@ -20,32 +18,28 @@ using DHT.Server.Data.Settings;
 using DHT.Server.Download;
 using DHT.Utils.Logging;
 using DHT.Utils.Tasks;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class DownloadsPageModel : IAsyncDisposable {
+sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
 	private static readonly Log Log = Log.ForType<DownloadsPageModel>();
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private bool isToggleDownloadButtonEnabled = true;
 	
-	[DependsOn(nameof(IsDownloading))]
 	public string ToggleDownloadButtonText => IsDownloading ? "Stop Downloading" : "Start Downloading";
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
 	private bool isRetryingFailedDownloads = false;
 	
-	[Notify(Setter.Private)]
-	private bool hasSuccessfulDownloads;
-	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
 	private bool hasFailedDownloads;
 	
-	[DependsOn(nameof(IsRetryingFailedDownloads), nameof(HasFailedDownloads))]
 	public bool IsRetryFailedOnDownloadsButtonEnabled => !IsRetryingFailedDownloads && HasFailedDownloads;
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private string downloadMessage = "";
 	
 	public DownloadItemFilterPanelModel FilterModel { get; }
@@ -146,14 +140,15 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 	private void OnDownloadStateChanged() {
 		RecomputeDownloadStatistics();
 		
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsDownloading)));
+		OnPropertyChanged(nameof(ToggleDownloadButtonText));
+		OnPropertyChanged(nameof(IsDownloading));
 	}
 	
 	private void OnItemFinished(DownloadItem item) {
 		RecomputeDownloadStatistics();
 	}
 	
-	public async Task OnClickRetryFailed() {
+	public async Task OnClickRetryFailedDownloads() {
 		IsRetryingFailedDownloads = true;
 		
 		try {
@@ -170,94 +165,46 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 		downloadStatisticsTask.Post(cancellationToken => state.Db.Downloads.GetStatistics(currentDownloadFilter ?? new DownloadItemFilter(), cancellationToken));
 	}
 	
-	public async Task OnClickDeleteOrphaned() {
+	public async Task OnClickDeleteOrphanedDownloads() {
 		const string Title = "Delete Orphaned Downloads";
 		
-		try {
-			await ProgressDialog.Show(window, Title, async (_, callback) => {
-				await callback.UpdateIndeterminate("Searching for orphaned downloads...");
-				
-				HashSet<string> reachableNormalizedUrls = [];
-				HashSet<string> orphanedNormalizedUrls = [];
-				
-				await foreach (Download download in state.Db.Downloads.FindAllDownloadableUrls()) {
-					reachableNormalizedUrls.Add(download.NormalizedUrl);
+		await ProgressDialog.Show(window, Title, async (_, callback) => {
+			await callback.UpdateIndeterminate("Searching for orphaned downloads...");
+			
+			HashSet<string> reachableNormalizedUrls = [];
+			HashSet<string> orphanedNormalizedUrls = [];
+			
+			await foreach (Download download in state.Db.Downloads.FindAllDownloadableUrls()) {
+				reachableNormalizedUrls.Add(download.NormalizedUrl);
+			}
+			
+			await foreach (Download download in state.Db.Downloads.Get()) {
+				string normalizedUrl = download.NormalizedUrl;
+				if (!reachableNormalizedUrls.Contains(normalizedUrl)) {
+					orphanedNormalizedUrls.Add(normalizedUrl);
 				}
-				
-				await foreach (Download download in state.Db.Downloads.Get()) {
-					string normalizedUrl = download.NormalizedUrl;
-					if (!reachableNormalizedUrls.Contains(normalizedUrl)) {
-						orphanedNormalizedUrls.Add(normalizedUrl);
-					}
-				}
-				
-				if (orphanedNormalizedUrls.Count == 0) {
-					await Dialog.ShowOk(window, Title, "No orphaned downloads found.");
-					return;
-				}
-				
-				if (await Dialog.ShowYesNo(window, Title, orphanedNormalizedUrls.Count + " orphaned download(s) will be removed from this database. This action cannot be undone. Proceed?") != DialogResult.YesNo.Yes) {
-					return;
-				}
-				
-				await callback.UpdateIndeterminate("Deleting orphaned downloads...");
-				await state.Db.Downloads.Remove(orphanedNormalizedUrls);
-				RecomputeDownloadStatistics();
-				
-				if (await Dialog.ShowYesNo(window, Title, "Orphaned downloads deleted. Vacuum database now to reclaim space?") != DialogResult.YesNo.Yes) {
-					return;
-				}
-				
-				await callback.UpdateIndeterminate("Vacuuming database...");
-				await state.Db.Vacuum();
-			});
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, Title, "Could not delete orphaned downloads: " + e.Message);
-		}
-	}
-	
-	public async Task OnClickExportAll() {
-		const string Title = "Export Downloaded Files";
-		
-		string[] folders = await window.StorageProvider.OpenFolders(new FolderPickerOpenOptions {
-			Title = Title,
-			AllowMultiple = false,
+			}
+			
+			if (orphanedNormalizedUrls.Count == 0) {
+				await Dialog.ShowOk(window, Title, "No orphaned downloads found.");
+				return;
+			}
+			
+			if (await Dialog.ShowYesNo(window, Title, orphanedNormalizedUrls.Count + " orphaned download(s) will be removed from this database. This action cannot be undone. Proceed?") != DialogResult.YesNo.Yes) {
+				return;
+			}
+			
+			await callback.UpdateIndeterminate("Deleting orphaned downloads...");
+			await state.Db.Downloads.Remove(orphanedNormalizedUrls);
+			RecomputeDownloadStatistics();
+			
+			if (await Dialog.ShowYesNo(window, Title, "Orphaned downloads deleted. Vacuum database now to reclaim space?") != DialogResult.YesNo.Yes) {
+				return;
+			}
+			
+			await callback.UpdateIndeterminate("Vacuuming database...");
+			await state.Db.Vacuum();
 		});
-		
-		if (folders.Length != 1) {
-			return;
-		}
-		
-		string folderPath = folders[0];
-		
-		DownloadExporter exporter = new DownloadExporter(state.Db, folderPath);
-		DownloadExporter.Result result;
-		try {
-			result = await ProgressDialog.Show(window, Title, async (_, callback) => {
-				await callback.UpdateIndeterminate("Exporting downloaded files...");
-				return await exporter.Export(new ExportProgressReporter(callback));
-			});
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, Title, "Could not export downloaded files: " + e.Message);
-			return;
-		}
-		
-		string messageStart = "Exported " + result.SuccessfulCount.Pluralize("file");
-		
-		if (result.FailedCount > 0L) {
-			await Dialog.ShowOk(window, Title, messageStart + " (" + result.FailedCount.Format() + " failed).");
-		}
-		else {
-			await Dialog.ShowOk(window, Title, messageStart + ".");
-		}
-	}
-	
-	private sealed class ExportProgressReporter(IProgressCallback callback) : DownloadExporter.IProgressReporter {
-		public Task ReportProgress(long processedCount, long totalCount) {
-			return callback.Update("Exporting downloaded files...", processedCount, totalCount);
-		}
 	}
 	
 	private void UpdateStatistics(DownloadStatusStatistics statusStatistics) {
@@ -277,23 +224,24 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 		statisticsSkipped.Size = statusStatistics.SkippedTotalSize;
 		statisticsSkipped.HasFilesWithUnknownSize = statusStatistics.SkippedWithUnknownSizeCount > 0;
 		
-		HasSuccessfulDownloads = statusStatistics.SuccessfulCount > 0;
 		HasFailedDownloads = statusStatistics.FailedCount > 0;
 	}
 	
+	[ObservableObject]
 	public sealed partial class StatisticsRow(string state) {
 		public string State { get; } = state;
 		
-		[Notify]
+		[ObservableProperty]
 		private int items;
 		
-		[Notify]
+		[ObservableProperty]
+		[NotifyPropertyChangedFor(nameof(SizeText))]
 		private ulong? size;
 		
-		[Notify]
+		[ObservableProperty]
+		[NotifyPropertyChangedFor(nameof(SizeText))]
 		private bool hasFilesWithUnknownSize;
 		
-		[DependsOn(nameof(Size), nameof(HasFilesWithUnknownSize))]
 		public string SizeText {
 			get {
 				if (size == null) {

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -4,27 +4,28 @@ using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
 using Avalonia.Input.Platform;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Discord;
 using DHT.Desktop.Server;
-using PropertyChanged.SourceGenerator;
 using static DHT.Desktop.Program;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class TrackingPageModel {
-	[Notify(Setter.Private)]
+sealed partial class TrackingPageModel : ObservableObject {
+	[ObservableProperty(Setter = Access.Private)]
 	private bool isCopyTrackingScriptButtonEnabled = true;
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
 	private bool? areDevToolsEnabled = null;
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
 	private bool isToggleAppDevToolsButtonEnabled = false;
 	
 	public string OpenDevToolsShortcutText { get; } = OperatingSystem.IsMacOS() ? "Cmd+Shift+I" : "Ctrl+Shift+I";
 	
-	[DependsOn(nameof(AreDevToolsEnabled), nameof(IsToggleAppDevToolsButtonEnabled))]
 	public string ToggleAppDevToolsButtonText {
 		get {
 			if (!AreDevToolsEnabled.HasValue) {

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -3,6 +3,7 @@ using System.ComponentModel;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
@@ -12,17 +13,16 @@ using DHT.Server;
 using DHT.Server.Data.Filters;
 using DHT.Server.Service.Viewer;
 using DHT.Utils.Logging;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class ViewerPageModel : IDisposable {
+sealed partial class ViewerPageModel : ObservableObject, IDisposable {
 	private static readonly Log Log = Log.ForType<ViewerPageModel>();
 	
 	public bool DatabaseToolFilterModeKeep { get; set; } = true;
 	public bool DatabaseToolFilterModeRemove { get; set; } = false;
 	
-	[Notify]
+	[ObservableProperty]
 	private bool hasFilters = false;
 	
 	public MessageFilterPanelModel FilterModel { get; }
@@ -61,23 +61,18 @@ sealed partial class ViewerPageModel : IDisposable {
 	}
 	
 	public async Task OnClickApplyFiltersToDatabase() {
-		try {
-			MessageFilter filter = FilterModel.CreateFilter();
-			long messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
-			
-			if (DatabaseToolFilterModeKeep) {
-				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", messageCount.Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
-					await ApplyFilterToDatabase(filter, FilterRemovalMode.KeepMatching);
-				}
+		MessageFilter filter = FilterModel.CreateFilter();
+		long messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
+		
+		if (DatabaseToolFilterModeKeep) {
+			if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", messageCount.Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
+				await ApplyFilterToDatabase(filter, FilterRemovalMode.KeepMatching);
 			}
-			else if (DatabaseToolFilterModeRemove) {
-				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", messageCount.Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
-					await ApplyFilterToDatabase(filter, FilterRemovalMode.RemoveMatching);
-				}
+		}
+		else if (DatabaseToolFilterModeRemove) {
+			if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", messageCount.Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
+				await ApplyFilterToDatabase(filter, FilterRemovalMode.RemoveMatching);
 			}
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, "Apply Filters", "Could not apply filters: " + e.Message);
 		}
 	}
 	

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -5,6 +5,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
@@ -13,16 +14,15 @@ using DHT.Server.Database;
 using DHT.Server.Database.Sqlite.Schema;
 using DHT.Server.Database.Sqlite.Utils;
 using DHT.Utils.Logging;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Screens;
 
-sealed partial class WelcomeScreenModel {
+sealed partial class WelcomeScreenModel : ObservableObject {
 	private static readonly Log Log = Log.ForType<WelcomeScreenModel>();
 	
 	public string Version => Program.Version;
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private bool isOpenOrCreateDatabaseButtonEnabled = true;
 	
 	public event EventHandler<IDatabaseFile>? DatabaseSelected;
@@ -112,32 +112,38 @@ sealed partial class WelcomeScreenModel {
 	}
 	
 	public async Task CheckUpdates() {
-		string response;
-		try {
-			response = await ProgressDialog.ShowIndeterminate<string>(window, "Check Updates", "Checking for updates...", static async _ => {
-				var client = new HttpClient(new SocketsHttpHandler {
-					AutomaticDecompression = DecompressionMethods.None,
-					AllowAutoRedirect = false,
-					UseCookies = false,
-				});
-				
-				client.Timeout = TimeSpan.FromSeconds(30);
-				client.MaxResponseContentBufferSize = 1024;
-				client.DefaultRequestHeaders.UserAgent.ParseAdd("DiscordHistoryTracker/" + Program.Version);
-				
-				return await client.GetStringAsync(Program.Website + "/version");
+		var latestVersion = await ProgressDialog.ShowIndeterminate<Version?>(window, "Check Updates", "Checking for updates...", async _ => {
+			var client = new HttpClient(new SocketsHttpHandler {
+				AutomaticDecompression = DecompressionMethods.None,
+				AllowAutoRedirect = false,
+				UseCookies = false,
 			});
-		} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
-			await Dialog.ShowOk(window, "Check Updates", "Request timed out.");
-			return;
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, "Check Updates", "Error checking for updates: " + e.Message);
-			return;
-		}
+			
+			client.Timeout = TimeSpan.FromSeconds(30);
+			client.MaxResponseContentBufferSize = 1024;
+			client.DefaultRequestHeaders.UserAgent.ParseAdd("DiscordHistoryTracker/" + Program.Version);
+			
+			string response;
+			try {
+				response = await client.GetStringAsync(Program.Website + "/version");
+			} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
+				await Dialog.ShowOk(window, "Check Updates", "Request timed out.");
+				return null;
+			} catch (Exception e) {
+				Log.Error(e);
+				await Dialog.ShowOk(window, "Check Updates", "Error checking for updates: " + e.Message);
+				return null;
+			}
+			
+			if (!System.Version.TryParse(response, out Version? latestVersion)) {
+				await Dialog.ShowOk(window, "Check Updates", "Server returned an invalid response.");
+				return null;
+			}
+			
+			return latestVersion;
+		});
 		
-		if (!System.Version.TryParse(response, out Version? latestVersion)) {
-			await Dialog.ShowOk(window, "Check Updates", "Server returned an invalid response.");
+		if (latestVersion == null) {
 			return;
 		}
 		

app/Directory.Build.props

@@ -21,13 +21,12 @@
   <PropertyGroup>
     <SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
     <PublishTrimmed>true</PublishTrimmed>
-    <TrimMode>full</TrimMode>
+    <TrimMode>partial</TrimMode>
     <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
     <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
     <EventSourceSupport>false</EventSourceSupport>
     <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
     <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
-    <XmlResolverIsNetworkingEnabledByDefault>false</XmlResolverIsNetworkingEnabledByDefault>
   </PropertyGroup>
   
   <PropertyGroup>

app/Server/Database/Export/SnowflakeJsonSerializer.cs

@@ -1,20 +1,16 @@
 using System;
-using System.Buffers.Text;
-using System.Diagnostics;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace DHT.Server.Database.Export;
 
 sealed class SnowflakeJsonSerializer : JsonConverter<Snowflake> {
-	private const int MaxUlongStringLength = 20;
-	
 	public override Snowflake Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
 		return new Snowflake(ulong.Parse(reader.GetString()!));
 	}
 	
 	public override void Write(Utf8JsonWriter writer, Snowflake value, JsonSerializerOptions options) {
-		writer.WriteStringValue(Format(value, stackalloc byte[MaxUlongStringLength]));
+		writer.WriteStringValue(value.Id.ToString());
 	}
 	
 	public override Snowflake ReadAsPropertyName(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
@@ -22,14 +18,6 @@ sealed class SnowflakeJsonSerializer : JsonConverter<Snowflake> {
 	}
 	
 	public override void WriteAsPropertyName(Utf8JsonWriter writer, Snowflake value, JsonSerializerOptions options) {
-		writer.WritePropertyName(Format(value, stackalloc byte[MaxUlongStringLength]));
-	}
-	
-	private static ReadOnlySpan<byte> Format(Snowflake value, Span<byte> destination) {
-		if (!Utf8Formatter.TryFormat(value.Id, destination, out int bytesWritten)) {
-			Debug.Fail("Failed to format Snowflake value.");
-		}
-		
-		return destination[..bytesWritten];
+		writer.WritePropertyName(value.Id.ToString());
 	}
 }

app/Server/Database/Export/ViewerJson.cs

@@ -30,7 +30,7 @@ static class ViewerJson {
 		public required string Name { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-		public Snowflake? Parent { get; init; }
+		public string? Parent { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
 		public int? Position { get; init; }
@@ -55,7 +55,7 @@ static class ViewerJson {
 		public long? Te { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-		public Snowflake? R { get; init; }
+		public string? R { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
 		public JsonMessageAttachment[]? A { get; init; }
@@ -80,7 +80,7 @@ static class ViewerJson {
 	
 	public sealed class JsonMessageReaction {
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-		public Snowflake? Id { get; init; }
+		public string? Id { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
 		public string? N { get; init; }

app/Server/Database/Export/ViewerJsonExport.cs

@@ -2,15 +2,13 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Threading;
-using System.Threading.Channels;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
 using DHT.Utils.Logging;
-using Channel = System.Threading.Channels.Channel;
-using DiscordChannel = DHT.Server.Data.Channel;
 
 namespace DHT.Server.Database.Export;
 
@@ -20,12 +18,12 @@ static class ViewerJsonExport {
 	public static async Task GetMetadata(Stream stream, IDatabaseFile db, MessageFilter? filter = null, CancellationToken cancellationToken = default) {
 		Perf perf = Log.Start();
 		
-		var includedChannels = new List<DiscordChannel>();
+		var includedChannels = new List<Channel>();
 		var includedServerIds = new HashSet<ulong>();
 		
 		HashSet<ulong>? channelIdFilter = filter?.ChannelIds;
 		
-		await foreach (DiscordChannel channel in db.Channels.Get(cancellationToken)) {
+		await foreach (Channel channel in db.Channels.Get(cancellationToken)) {
 			if (channelIdFilter == null || channelIdFilter.Contains(channel.Id)) {
 				includedChannels.Add(channel);
 				includedServerIds.Add(channel.Server);
@@ -55,30 +53,11 @@ static class ViewerJsonExport {
 		
 		ReadOnlyMemory<byte> newLine = "\n"u8.ToArray();
 		
-		Channel<Message> channel = Channel.CreateBounded<Message>(new BoundedChannelOptions(32) {
-			SingleWriter = true,
-			SingleReader = true,
-			AllowSynchronousContinuations = true,
-			FullMode = BoundedChannelFullMode.Wait,
-		});
-		
-		Task writerTask = Task.Run(async () => {
-			try {
-				await foreach (Message message in db.Messages.Get(filter, cancellationToken)) {
-					await channel.Writer.WriteAsync(message, cancellationToken);
-				}
-			} finally {
-				channel.Writer.Complete();
-			}
-		}, cancellationToken);
-		
-		await foreach (Message message in channel.Reader.ReadAllAsync(cancellationToken)) {
-			await JsonSerializer.SerializeAsync(stream, ToJsonMessage(message), ViewerJsonMessageContext.Default.JsonMessage, cancellationToken);
+		await foreach (ViewerJson.JsonMessage message in GenerateMessageList(db, filter, cancellationToken)) {
+			await JsonSerializer.SerializeAsync(stream, message, ViewerJsonMessageContext.Default.JsonMessage, cancellationToken);
 			await stream.WriteAsync(newLine, cancellationToken);
 		}
 		
-		await writerTask;
-		
 		perf.Step("Generate and serialize messages to JSON");
 		perf.End();
 	}
@@ -114,14 +93,14 @@ static class ViewerJsonExport {
 		return servers;
 	}
 	
-	private static Dictionary<Snowflake, ViewerJson.JsonChannel> GenerateChannelList(List<DiscordChannel> includedChannels) {
+	private static Dictionary<Snowflake, ViewerJson.JsonChannel> GenerateChannelList(List<Channel> includedChannels) {
 		var channels = new Dictionary<Snowflake, ViewerJson.JsonChannel>();
 		
-		foreach (DiscordChannel channel in includedChannels) {
+		foreach (Channel channel in includedChannels) {
 			channels[channel.Id] = new ViewerJson.JsonChannel {
 				Server = channel.Server,
 				Name = channel.Name,
-				Parent = channel.ParentId,
+				Parent = channel.ParentId?.ToString(),
 				Position = channel.Position,
 				Topic = channel.Topic,
 				Nsfw = channel.Nsfw,
@@ -131,38 +110,40 @@ static class ViewerJsonExport {
 		return channels;
 	}
 	
-	private static ViewerJson.JsonMessage ToJsonMessage(Message message) {
-		return new ViewerJson.JsonMessage {
-			Id = message.Id,
-			C = message.Channel,
-			U = message.Sender,
-			T = message.Timestamp,
-			M = string.IsNullOrEmpty(message.Text) ? null : message.Text,
-			Te = message.EditTimestamp,
-			R = message.RepliedToId,
-			
-			A = message.Attachments.IsEmpty ? null : message.Attachments.Select(static attachment => {
-				var a = new ViewerJson.JsonMessageAttachment {
-					Url = attachment.DownloadUrl,
-					Name = Uri.TryCreate(attachment.NormalizedUrl, UriKind.Absolute, out Uri? uri) ? Path.GetFileName(uri.LocalPath) : attachment.NormalizedUrl,
-				};
+	private static async IAsyncEnumerable<ViewerJson.JsonMessage> GenerateMessageList(IDatabaseFile db, MessageFilter? filter, [EnumeratorCancellation] CancellationToken cancellationToken) {
+		await foreach (Message message in db.Messages.Get(filter, cancellationToken)) {
+			yield return new ViewerJson.JsonMessage {
+				Id = message.Id,
+				C = message.Channel,
+				U = message.Sender,
+				T = message.Timestamp,
+				M = string.IsNullOrEmpty(message.Text) ? null : message.Text,
+				Te = message.EditTimestamp,
+				R = message.RepliedToId?.ToString(),
 				
-				if (attachment is { Width: not null, Height: not null }) {
-					a.Width = attachment.Width;
-					a.Height = attachment.Height;
-				}
+				A = message.Attachments.IsEmpty ? null : message.Attachments.Select(static attachment => {
+					var a = new ViewerJson.JsonMessageAttachment {
+						Url = attachment.DownloadUrl,
+						Name = Uri.TryCreate(attachment.NormalizedUrl, UriKind.Absolute, out Uri? uri) ? Path.GetFileName(uri.LocalPath) : attachment.NormalizedUrl,
+					};
+					
+					if (attachment is { Width: not null, Height: not null }) {
+						a.Width = attachment.Width;
+						a.Height = attachment.Height;
+					}
+					
+					return a;
+				}).ToArray(),
 				
-				return a;
-			}).ToArray(),
-			
-			E = message.Embeds.IsEmpty ? null : message.Embeds.Select(static embed => embed.Json).ToArray(),
-			
-			Re = message.Reactions.IsEmpty ? null : message.Reactions.Select(static reaction => new ViewerJson.JsonMessageReaction {
-				Id = reaction.EmojiId,
-				N = reaction.EmojiName,
-				A = reaction.EmojiFlags.HasFlag(EmojiFlags.Animated),
-				C = reaction.Count,
-			}).ToArray(),
-		};
+				E = message.Embeds.IsEmpty ? null : message.Embeds.Select(static embed => embed.Json).ToArray(),
+				
+				Re = message.Reactions.IsEmpty ? null : message.Reactions.Select(static reaction => new ViewerJson.JsonMessageReaction {
+					Id = reaction.EmojiId?.ToString(),
+					N = reaction.EmojiName,
+					A = reaction.EmojiFlags.HasFlag(EmojiFlags.Animated),
+					C = reaction.Count,
+				}).ToArray(),
+			};
+		}
 	}
 }

app/Server/Database/Repositories/IDownloadRepository.cs

@@ -20,7 +20,7 @@ public interface IDownloadRepository {
 	
 	Task<DownloadStatusStatistics> GetStatistics(DownloadItemFilter nonSkippedFilter, CancellationToken cancellationToken = default);
 	
-	IAsyncEnumerable<Data.Download> Get(DownloadItemFilter? filter = null);
+	IAsyncEnumerable<Data.Download> Get();
 	
 	Task<bool> GetDownloadData(string normalizedUrl, Func<Stream, Task> dataProcessor);
 	
@@ -51,7 +51,7 @@ public interface IDownloadRepository {
 			return Task.FromResult(new DownloadStatusStatistics());
 		}
 		
-		public IAsyncEnumerable<Data.Download> Get(DownloadItemFilter? filter) {
+		public IAsyncEnumerable<Data.Download> Get() {
 			return AsyncEnumerable.Empty<Data.Download>();
 		}
 		

app/Server/Database/Sqlite/Repositories/SqliteDownloadRepository.cs

@@ -73,26 +73,10 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		}
 	}
 	
-	private static SqliteBlob BlobReference(ISqliteConnection conn, long rowid, bool readOnly) {
-		string schema = conn.HasAttachedDatabase(Schema) ? Schema : "main";
-		return new SqliteBlob(conn.InnerConnection, databaseName: schema, tableName: "download_blobs", columnName: "blob", rowid, readOnly);
-	}
-	
 	public async Task AddDownload(Data.Download item, Stream? stream) {
-		ulong? actualSize;
-		
-		if (stream is not null) {
-			actualSize = (ulong) stream.Length;
-			
-			if (actualSize != item.Size) {
-				Log.Warn("Download size differs from its metadata - metadata size: " + item.Size + " B, actual size: " + actualSize + " B, url: " + item.NormalizedUrl);
-			}
-		}
-		else {
-			actualSize = item.Size;
-		}
-		
 		await using (var conn = await pool.Take()) {
+			string schema = conn.HasAttachedDatabase(Schema) ? Schema : "main";
+			
 			await conn.BeginTransactionAsync();
 			
 			await using var metadataCmd = conn.Upsert("download_metadata", [
@@ -107,7 +91,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			metadataCmd.Set(":download_url", item.DownloadUrl);
 			metadataCmd.Set(":status", (int) item.Status);
 			metadataCmd.Set(":type", item.Type);
-			metadataCmd.Set(":size", actualSize);
+			metadataCmd.Set(":size", item.Size);
 			await metadataCmd.ExecuteNonQueryAsync();
 			
 			if (stream == null) {
@@ -127,10 +111,10 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 				);
 				
 				upsertBlobCmd.AddAndSet(":normalized_url", SqliteType.Text, item.NormalizedUrl);
-				upsertBlobCmd.AddAndSet(":blob_length", SqliteType.Integer, actualSize);
+				upsertBlobCmd.AddAndSet(":blob_length", SqliteType.Integer, item.Size);
 				long rowid = await upsertBlobCmd.ExecuteLongScalarAsync();
 				
-				await using var blob = BlobReference(conn, rowid, readOnly: false);
+				await using var blob = new SqliteBlob(conn.InnerConnection, databaseName: schema, tableName: "download_blobs", columnName: "blob", rowid);
 				await stream.CopyToAsync(blob);
 			}
 			
@@ -201,10 +185,10 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		};
 	}
 	
-	public async IAsyncEnumerable<Data.Download> Get(DownloadItemFilter? filter) {
+	public async IAsyncEnumerable<Data.Download> Get() {
 		await using var conn = await pool.Take();
 		
-		await using var cmd = conn.Command("SELECT normalized_url, download_url, status, type, size FROM download_metadata" + filter.GenerateConditions().BuildWhereClause());
+		await using var cmd = conn.Command("SELECT normalized_url, download_url, status, type, size FROM download_metadata");
 		await using var reader = await cmd.ExecuteReaderAsync();
 		
 		while (await reader.ReadAsync()) {
@@ -234,7 +218,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			rowid = reader.GetInt64(0);
 		}
 		
-		await using (var blob = BlobReference(conn, rowid, readOnly: true)) {
+		await using (var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid, readOnly: true)) {
 			await dataProcessor(blob);
 		}
 		
@@ -269,7 +253,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			rowid = reader.GetInt64(2);
 		}
 		
-		await using (var blob = BlobReference(conn, rowid, readOnly: true)) {
+		await using (var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid, readOnly: true)) {
 			await dataProcessor(new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Success, type, (ulong) blob.Length), blob, cancellationToken);
 		}
 		

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -5,13 +5,10 @@ using DHT.Server.Database.Repositories;
 using DHT.Server.Database.Sqlite.Repositories;
 using DHT.Server.Database.Sqlite.Schema;
 using DHT.Server.Database.Sqlite.Utils;
-using DHT.Utils.Logging;
 
 namespace DHT.Server.Database.Sqlite;
 
 public sealed class SqliteDatabaseFile : IDatabaseFile {
-	private static readonly Log Log = Log.ForType<SqliteDatabaseFile>();
-	
 	private const int DefaultPoolSize = 5;
 	
 	public static async Task<SqliteDatabaseFile?> OpenOrCreate(string path, ISchemaUpgradeCallbacks schemaUpgradeCallbacks) {
@@ -83,20 +80,10 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 	public async Task Vacuum() {
 		await using var conn = await pool.Take();
 		
-		Perf perf = Log.Start();
 		await conn.ExecuteAsync("VACUUM");
-		perf.Step("Vacuum main schema");
 		
-		await VacuumAttachedDatabase(conn, perf, SqliteDownloadRepository.Schema);
-		
-		perf.End();
-		return;
-		
-		static async Task VacuumAttachedDatabase(ISqliteConnection conn, Perf perf, string schema) {
-			if (conn.HasAttachedDatabase(schema)) {
-				await conn.ExecuteAsync("VACUUM " + schema);
-				perf.Step("Vacuum " + schema + " schema");
-			}
+		if (conn.HasAttachedDatabase(SqliteDownloadRepository.Schema)) {
+			await conn.ExecuteAsync("VACUUM " + SqliteDownloadRepository.Schema);
 		}
 	}
 }

app/Server/Download/DownloadExporter.cs

@@ -1,152 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using DHT.Server.Data;
-using DHT.Server.Data.Filters;
-using DHT.Server.Database;
-using DHT.Utils.Logging;
-using DHT.Utils.Tasks;
-using Channel = System.Threading.Channels.Channel;
-
-namespace DHT.Server.Download;
-
-public sealed partial class DownloadExporter(IDatabaseFile db, string folderPath) {
-	private static readonly Log Log = Log.ForType<DownloadExporter>();
-	
-	private const int Concurrency = 3;
-	
-	private static Channel<Data.Download> CreateExportChannel() {
-		return Channel.CreateBounded<Data.Download>(new BoundedChannelOptions(Concurrency * 4) {
-			SingleWriter = true,
-			SingleReader = false,
-			AllowSynchronousContinuations = true,
-			FullMode = BoundedChannelFullMode.Wait,
-		});
-	}
-	
-	public interface IProgressReporter {
-		Task ReportProgress(long processedCount, long totalCount);
-	}
-	
-	public readonly record struct Result(long SuccessfulCount, long FailedCount) {
-		internal static Result Combine(Result left, Result right) {
-			return new Result(left.SuccessfulCount + right.SuccessfulCount, left.FailedCount + right.FailedCount);
-		}
-	}
-	
-	public async Task<Result> Export(IProgressReporter reporter) {
-		DownloadItemFilter filter = new DownloadItemFilter {
-			IncludeStatuses = [DownloadStatus.Success]
-		};
-		
-		long totalCount = await db.Downloads.Count(filter);
-		
-		Channel<Data.Download> channel = CreateExportChannel();
-		ExportRunner exportRunner = new ExportRunner(db, folderPath, channel.Reader, reporter, totalCount);
-		
-		using CancellableTask progressTask = CancellableTask.Run(exportRunner.RunReportTask);
-		
-		List<Task<Result>> readerTasks = [];
-		for (int reader = 0; reader < Concurrency; reader++) {
-			readerTasks.Add(Task.Run(exportRunner.RunExportTask, CancellationToken.None));
-		}
-		
-		await foreach (Data.Download download in db.Downloads.Get(filter).WithCancellation(CancellationToken.None)) {
-			await channel.Writer.WriteAsync(download, CancellationToken.None);
-		}
-		
-		channel.Writer.Complete();
-		
-		Result result = (await Task.WhenAll(readerTasks)).Aggregate(Result.Combine);
-		
-		progressTask.Cancel();
-		await progressTask.Task;
-		
-		return result;
-	}
-	
-	private sealed partial class ExportRunner(IDatabaseFile db, string folderPath, ChannelReader<Data.Download> reader, IProgressReporter reporter, long totalCount) {
-		private long processedCount;
-		
-		public async Task RunReportTask(CancellationToken cancellationToken) {
-			try {
-				while (true) {
-					await reporter.ReportProgress(processedCount, totalCount);
-					await Task.Delay(TimeSpan.FromMilliseconds(25), cancellationToken);
-				}
-			} catch (OperationCanceledException) {
-				await reporter.ReportProgress(processedCount, totalCount);
-			}
-		}
-		
-		public async Task<Result> RunExportTask() {
-			long successfulCount = 0L;
-			long failedCount = 0L;
-			
-			await foreach (Data.Download download in reader.ReadAllAsync()) {
-				bool success;
-				try {
-					success = await db.Downloads.GetDownloadData(download.NormalizedUrl, stream => CopyToFile(download.NormalizedUrl, stream));
-				} catch (FileAlreadyExistsException) {
-					success = false;
-				} catch (Exception e) {
-					Log.Error(e);
-					success = false;
-				}
-				
-				if (success) {
-					++successfulCount;
-				}
-				else {
-					++failedCount;
-				}
-				
-				Interlocked.Increment(ref processedCount);
-			}
-			
-			return new Result(successfulCount, failedCount);
-		}
-		
-		private async Task CopyToFile(string normalizedUrl, Stream blobStream) {
-			string fileName = UrlToFileName(normalizedUrl);
-			string filePath = Path.Combine(folderPath, fileName);
-			
-			if (File.Exists(filePath)) {
-				Log.Error("Skipping existing file: " + fileName);
-				throw FileAlreadyExistsException.Instance;
-			}
-			
-			await using var fileStream = new FileStream(filePath, FileMode.CreateNew, FileAccess.Write, FileShare.Read);
-			await blobStream.CopyToAsync(fileStream);
-		}
-		
-		[GeneratedRegex("[^a-zA-Z0-9_.-]")]
-		private static partial Regex DisallowedFileNameCharactersRegex();
-		
-		private static string UrlToFileName(string url) {
-			static string UriToFileName(Uri uri) {
-				string fileName = uri.AbsolutePath.TrimStart('/');
-				
-				if (uri.Query.Length > 0) {
-					int periodIndex = fileName.LastIndexOf('.');
-					return fileName.Insert(periodIndex == -1 ? fileName.Length : periodIndex, uri.Query.TrimEnd('&'));
-				}
-				else {
-					return fileName;
-				}
-			}
-			
-			string fileName = Uri.TryCreate(url, UriKind.Absolute, out var uri) ? UriToFileName(uri) : url;
-			return DisallowedFileNameCharactersRegex().Replace(fileName, "_");
-		}
-	}
-	
-	private sealed class FileAlreadyExistsException : Exception {
-		public static FileAlreadyExistsException Instance { get; } = new ();
-	}
-}

app/Utils/Tasks/CancellableTask.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace DHT.Utils.Tasks;
-
-public sealed class CancellableTask : IDisposable {
-	public static CancellableTask Run(Func<CancellationToken, Task> action) {
-		return new CancellableTask(action);
-	}
-	
-	public Task Task { get; }
-	
-	private readonly CancellationTokenSource cancellationTokenSource = new ();
-	
-	private CancellableTask(Func<CancellationToken, Task> action) {
-		CancellationToken cancellationToken = cancellationTokenSource.Token;
-		Task = Task.Run(() => action(cancellationToken));
-	}
-	
-	public void Cancel() {
-		cancellationTokenSource.Cancel();
-	}
-	
-	public void Dispose() {
-		cancellationTokenSource.Dispose();
-	}
-}

app/Utils/Tasks/DelayedThrottledTask.cs

@@ -55,10 +55,7 @@ public sealed class DelayedThrottledTask<T> : IDisposable {
 	}
 	
 	public void Dispose() {
-		try {
-			cancellationTokenSource.Cancel();
-		} catch (ObjectDisposedException) {}
-		
 		taskChannel.Writer.Complete();
+		cancellationTokenSource.Cancel();
 	}
 }

app/Version.cs

@@ -8,5 +8,5 @@ using DHT.Utils;
 namespace DHT.Utils;
 
 static class Version {
-	public const string Tag = "46.0.0.0";
+	public const string Tag = "45.0.0.0";
 }