Merge c52572b387 into b2276600c7

Closes #277

app/.editorconfig

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

app/.idea/.idea.DiscordHistoryTracker/.idea/avalonia.xml

@@ -13,6 +13,7 @@
         <entry key="Desktop/Main/Controls/MessageFilterPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/ServerConfigurationPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/StatusBar.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/MainWindow.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/AdvancedPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/DatabasePage.axaml" value="Desktop/Desktop.csproj" />

app/Desktop/App.axaml

@@ -54,6 +54,22 @@
             <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
 
+        <Style Selector="Panel.buttons">
+            <Setter Property="Margin" Value="0 20 0 0" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.right">
+            <Setter Property="HorizontalAlignment" Value="Right" />
+        </Style>
+        <Style Selector="Panel.buttons Button">
+            <Setter Property="MinWidth" Value="80" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.left Button">
+            <Setter Property="Margin" Value="0 0 8 0" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.right Button">
+            <Setter Property="Margin" Value="8 0 0 0" />
+        </Style>
+
     </Application.Styles>
 
     <Application.Resources>

app/Desktop/Desktop.csproj

@@ -23,7 +23,10 @@
     <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="CommunityToolkit.Mvvm" Version="999.0.0-build.0.g0d941a6a62" />
+    <PackageReference Include="PropertyChanged.SourceGenerator" Version="1.1.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   
   <ItemGroup>

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml

@@ -15,24 +15,6 @@
         <namespace:CheckBoxDialogModel />
     </Window.DataContext>
 
-    <Window.Styles>
-        <Style Selector="Panel.buttons">
-            <Setter Property="Margin" Value="0 20 0 0" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel.right">
-            <Setter Property="HorizontalAlignment" Value="Right" />
-        </Style>
-        <Style Selector="Panel.buttons Button">
-            <Setter Property="MinWidth" Value="80" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel.left Button">
-            <Setter Property="Margin" Value="0 0 8 0" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel.right Button">
-            <Setter Property="Margin" Value="8 0 0 0" />
-        </Style>
-    </Window.Styles>
-
     <StackPanel Margin="20">
         <ScrollViewer MaxHeight="400">
             <ItemsRepeater ItemsSource="{Binding Items}">

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

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

app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs

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

app/Desktop/Dialogs/File/FileDialogs.cs

@@ -8,6 +8,10 @@ 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();
 	}
@@ -26,11 +30,11 @@ static class FileDialogs {
 		return suggestedDirectory == null ? Task.FromResult<IStorageFolder?>(null) : window.StorageProvider.TryGetFolderFromPathAsync(suggestedDirectory);
 	}
 	
-	private static string ToLocalPath(this IStorageFile file) {
-		return file.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
+	private static string ToLocalPath(this IStorageItem itme) {
+		return itme.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
 	}
 	
-	private static string[] ToLocalPaths(this IReadOnlyList<IStorageFile> files) {
-		return files.Select(ToLocalPath).ToArray();
+	private static string[] ToLocalPaths(this IReadOnlyList<IStorageItem> items) {
+		return items.Select(ToLocalPath).ToArray();
 	}
 }

app/Desktop/Dialogs/Message/MessageDialog.axaml

@@ -20,24 +20,18 @@
             <Setter Property="FontSize" Value="15" />
             <Setter Property="TextWrapping" Value="Wrap" />
         </Style>
-        <Style Selector="WrapPanel">
-            <Setter Property="HorizontalAlignment" Value="Right" />
-            <Setter Property="Margin" Value="0 8 0 0" />
-        </Style>
-        <Style Selector="Button">
-            <Setter Property="Margin" Value="8 0 0 0" />
-            <Setter Property="MinWidth" Value="80" />
-        </Style>
     </Window.Styles>
 
     <StackPanel Margin="20">
         <TextBlock Text="{Binding Message}" />
-        <WrapPanel>
+        <Panel Classes="buttons">
+            <WrapPanel Classes="right">
                 <Button Click="ClickOk" IsVisible="{Binding IsOkVisible}">OK</Button>
                 <Button Click="ClickYes" IsVisible="{Binding IsYesVisible}">Yes</Button>
                 <Button Click="ClickNo" IsVisible="{Binding IsNoVisible}">No</Button>
                 <Button Click="ClickCancel" IsVisible="{Binding IsCancelVisible}">Cancel</Button>
             </WrapPanel>
+        </Panel>
     </StackPanel>
 
 </Window>

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, int finishedItems, int totalItems);
+	Task Update(string message, long finishedItems, long totalItems);
 	Task UpdateIndeterminate(string message);
 	Task Hide();
 }

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

@@ -2,7 +2,6 @@ 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;
@@ -12,57 +11,37 @@ 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 => {
-			try {
-				await action(dialog, callbacks[0]);
-				taskCompletionSource.SetResult();
-			} catch (Exception e) {
-				taskCompletionSource.SetException(e);
-			}
-		});
-		
+		dialog.DataContext = new ProgressDialogModel(title, async callbacks => await action(dialog, callbacks[0]));
 		await dialog.ShowProgressDialog(owner);
-		await taskCompletionSource.Task;
 	}
 	
-	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) {
+	internal static async Task<T> Show<T>(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task<T>> action) {
 		var taskCompletionSource = new TaskCompletionSource<T>();
 		var dialog = new ProgressDialog();
 		
 		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-			await callbacks[0].UpdateIndeterminate(message);
-			try {
-				taskCompletionSource.SetResult(await action(dialog));
-			} catch (Exception e) {
-				taskCompletionSource.SetException(e);
-			}
+			taskCompletionSource.SetResult(await action(dialog, callbacks[0]));
 		});
 		
 		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;
 	
@@ -88,11 +67,6 @@ public sealed partial class ProgressDialog : Window {
 	
 	public async Task ShowProgressDialog(Window owner) {
 		await ShowDialog(owner);
-		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, int finishedItems, int totalItems) {
+		public async Task Update(string message, long finishedItems, long 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,30 +1,23 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Dialogs.Progress;
 
-sealed partial class ProgressItem : ObservableObject {
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(Opacity))]
-	private bool isVisible = false;
-	
-	public double Opacity => IsVisible ? 1.0 : 0.0;
-	
+sealed partial class ProgressItem {
+	[Notify]
 	private string message = "";
 	
-	public string Message {
-		get => message;
-		set {
-			SetProperty(ref message, value);
-			IsVisible = !string.IsNullOrEmpty(value);
-		}
-	}
-	
-	[ObservableProperty]
+	[Notify]
 	private string items = "";
 	
-	[ObservableProperty]
-	private int progress = 0;
+	[Notify]
+	private long progress = 0L;
 	
-	[ObservableProperty]
+	[Notify]
 	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/TextBoxDialog.axaml

@@ -15,19 +15,6 @@
         <namespace:TextBoxDialogModel />
     </Window.DataContext>
 
-    <Window.Styles>
-        <Style Selector="Panel.buttons">
-            <Setter Property="Margin" Value="0 20 0 0" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel.right">
-            <Setter Property="HorizontalAlignment" Value="Right" />
-        </Style>
-        <Style Selector="Panel.buttons Button">
-            <Setter Property="MinWidth" Value="80" />
-            <Setter Property="Margin" Value="8 0 0 0" />
-        </Style>
-    </Window.Styles>
-
     <StackPanel Margin="20">
         <ScrollViewer MaxHeight="400">
             <StackPanel Spacing="10">

app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs

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

app/Desktop/Dialogs/TextBox/TextBoxItem.cs

@@ -1,26 +1,23 @@
 using System;
 using System.Collections;
 using System.ComponentModel;
-using CommunityToolkit.Mvvm.ComponentModel;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Dialogs.TextBox;
 
-class TextBoxItem : ObservableObject, INotifyDataErrorInfo {
+partial class TextBoxItem : 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;
 	
-	public string Value {
-		get => value;
-		set {
-			SetProperty(ref this.value, value);
+	private void OnValueChanged() {
 		ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Value)));
 	}
-	}
 	
 	public IEnumerable GetErrors(string? propertyName) {
 		if (propertyName == nameof(Value) && !IsValid) {

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="480" d:DesignHeight="360"
+        mc:Ignorable="d" d:DesignWidth="510" d:DesignHeight="375"
         x:Class="DHT.Desktop.Main.AboutWindow"
         x:DataType="main:AboutWindowModel"
         Title="About Discord History Tracker"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Width="480" Height="360" CanResize="False"
+        Width="510" Height="375" CanResize="False"
         WindowStartupLocation="CenterOwner">
 
     <Design.DataContext>
@@ -16,10 +16,6 @@
     </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" />
@@ -33,44 +29,45 @@
 
     <StackPanel Orientation="Vertical" Margin="20" Spacing="12">
 
-        <TextBlock VerticalAlignment="Center">
-            Discord History Tracker was created by chylex and released under the MIT license.
-        </TextBlock>
+        <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>
 
-        <StackPanel>
+        <StackPanel Orientation="Horizontal" Spacing="8">
             <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="175,125,*" Margin="0 10 0 0">
+        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="*,115,95" 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 8</TextBlock>
+            <TextBlock Grid.Row="2" Grid.Column="0">.NET</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}">NuGet</Button>
+            <Button Grid.Row="3" Grid.Column="2" Command="{Binding ShowLibraryAvalonia}">GitHub</Button>
 
-            <TextBlock Grid.Row="4" Grid.Column="0">MVVM Toolkit</TextBlock>
+            <TextBlock Grid.Row="4" Grid.Column="0">Rx.NET</TextBlock>
             <TextBlock Grid.Row="4" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibraryCommunityToolkit}">GitHub</Button>
+            <Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibraryRxNet}">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}">Official Website</Button>
+            <Button Grid.Row="5" Grid.Column="2" Command="{Binding ShowLibrarySqlite}">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">Rx.NET</TextBlock>
+            <TextBlock Grid.Row="7" Grid.Column="0">PropertyChanged.SourceGenerator</TextBlock>
             <TextBlock Grid.Row="7" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="7" Grid.Column="2" Command="{Binding ShowLibraryRxNet}">GitHub</Button>
+            <Button Grid.Row="7" Grid.Column="2" Command="{Binding ShowLibraryPropertyChangedSourceGenerator}">GitHub</Button>
         </Grid>
 
     </StackPanel>

app/Desktop/Main/AboutWindowModel.cs

@@ -20,11 +20,11 @@ sealed class AboutWindowModel {
 	}
 	
 	public void ShowLibraryAvalonia() {
-		SystemUtils.OpenUrl("https://www.nuget.org/packages/Avalonia");
+		SystemUtils.OpenUrl("https://github.com/AvaloniaUI/Avalonia");
 	}
 	
-	public void ShowLibraryCommunityToolkit() {
-		SystemUtils.OpenUrl("https://github.com/CommunityToolkit/dotnet");
+	public void ShowLibraryPropertyChangedSourceGenerator() {
+		SystemUtils.OpenUrl("https://github.com/canton7/PropertyChanged.SourceGenerator");
 	}
 	
 	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 : ObservableObject, IAsyncDisposable {
+sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
 	private static readonly Log Log = Log.ForType<DownloadItemFilterPanelModel>();
 	
 	public sealed record Unit(string Name, uint Scale);
@@ -32,15 +32,16 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisp
 		nameof(MaximumSizeUnit),
 	];
 	
-	public string FilterStatisticsText { get; private set; } = "";
+	[Notify(Setter.Private)]
+	private string filterStatisticsText = "";
 	
-	[ObservableProperty]
+	[Notify]
 	private bool limitSize = false;
 	
-	[ObservableProperty]
+	[Notify]
 	private ulong maximumSize = 0UL;
 	
-	[ObservableProperty]
+	[Notify]
 	private Unit maximumSizeUnit = AllUnits[0];
 	
 	public IEnumerable<Unit> Units => AllUnits;
@@ -151,9 +152,7 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisp
 	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,7 +7,6 @@ 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;
@@ -16,10 +15,11 @@ 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 : ObservableObject, IDisposable {
+sealed partial class MessageFilterPanelModel : IDisposable {
 	private static readonly HashSet<string> FilterProperties = [
 		nameof(FilterByDate),
 		nameof(StartDate),
@@ -30,37 +30,38 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 		nameof(IncludedUsers),
 	];
 	
-	public string FilterStatisticsText { get; private set; } = "";
-	
 	public event PropertyChangedEventHandler? FilterPropertyChanged;
 	
 	public bool HasAnyFilters => FilterByDate || FilterByChannel || FilterByUser;
 	
-	[ObservableProperty]
+	[Notify]
+	private string filterStatisticsText = "";
+	
+	[Notify]
 	private bool filterByDate = false;
 	
-	[ObservableProperty]
+	[Notify]
 	private DateTime? startDate = null;
 	
-	[ObservableProperty]
+	[Notify]
 	private DateTime? endDate = null;
 	
-	[ObservableProperty]
+	[Notify]
 	private bool filterByChannel = false;
 	
-	[ObservableProperty]
+	[Notify]
 	private HashSet<ulong>? includedChannels = null;
 	
-	[ObservableProperty]
+	[Notify]
 	private bool filterByUser = false;
 	
-	[ObservableProperty]
+	[Notify]
 	private HashSet<ulong>? includedUsers = null;
 	
-	[ObservableProperty]
+	[Notify]
 	private string channelFilterLabel = "";
 	
-	[ObservableProperty]
+	[Notify]
 	private string userFilterLabel = "";
 	
 	private readonly Window window;
@@ -181,9 +182,7 @@ sealed partial class MessageFilterPanelModel : ObservableObject, 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 : ObservableObject, IDisposable {
+sealed partial class ServerConfigurationPanelModel : IDisposable {
 	private static readonly Log Log = Log.ForType<ServerConfigurationPanelModel>();
 	
-	[ObservableProperty]
-	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
+	[Notify]
 	private string inputPort;
 	
-	[ObservableProperty]
-	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
+	[Notify]
 	private string inputToken;
 	
+	[DependsOn(nameof(InputPort), nameof(InputToken))]
 	public bool HasMadeChanges => ServerConfiguration.Port.ToString() != InputPort || ServerConfiguration.Token != InputToken;
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private bool isToggleServerButtonEnabled = true;
 	
 	public string ToggleServerButtonText => server.IsRunning ? "Stop Server" : "Start Server";
@@ -53,7 +53,7 @@ sealed partial class ServerConfigurationPanelModel : ObservableObject, IDisposab
 	}
 	
 	private void UpdateServerStatus() {
-		OnPropertyChanged(nameof(ToggleServerButtonText));
+		OnPropertyChanged(new PropertyChangedEventArgs(nameof(ToggleServerButtonText)));
 	}
 	
 	private async Task StartServer() {
@@ -106,7 +106,7 @@ sealed partial class ServerConfigurationPanelModel : ObservableObject, IDisposab
 		ServerConfiguration.Port = port;
 		ServerConfiguration.Token = inputToken;
 		
-		OnPropertyChanged(nameof(HasMadeChanges));
+		OnPropertyChanged(new PropertyChangedEventArgs(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 : ObservableObject, IDisposable {
-	[ObservableProperty(Setter = Access.Private)]
+sealed partial class StatusBarModel : IDisposable {
+	[Notify(Setter.Private)]
 	private long? serverCount;
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private long? channelCount;
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private long? messageCount;
 	
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(ServerStatusText))]
+	[Notify(Setter.Private)]
 	private ServerManager.Status serverStatus;
 	
-	public string ServerStatusText => serverStatus switch {
+	[DependsOn(nameof(ServerStatus))]
+	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 : ObservableObject, 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 += OnServerStatusChanged;
+		state.Server.StatusChanged += OnStateServerStatusChanged;
 		serverStatus = state.Server.IsRunning ? ServerManager.Status.Started : ServerManager.Status.Stopped;
 	}
 	
@@ -54,10 +54,10 @@ sealed partial class StatusBarModel : ObservableObject, IDisposable {
 		channelCountSubscription.Dispose();
 		messageCountSubscription.Dispose();
 		
-		state.Server.StatusChanged -= OnServerStatusChanged;
+		state.Server.StatusChanged -= OnStateServerStatusChanged;
 	}
 	
-	private void OnServerStatusChanged(object? sender, ServerManager.Status e) {
+	private void OnStateServerStatusChanged(object? sender, ServerManager.Status e) {
 		Dispatcher.UIThread.InvokeAsync(() => ServerStatus = e);
 	}
 }

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml

@@ -0,0 +1,57 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:namespace="clr-namespace:DHT.Desktop.Main.Dialogs"
+        mc:Ignorable="d" d:DesignWidth="450"
+        x:Class="DHT.Desktop.Main.Dialogs.NewDatabaseSettingsDialog"
+        x:DataType="namespace:NewDatabaseSettingsDialogModel"
+        Title="New Database Settings"
+        Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
+        Closing="OnClosing"
+        Width="450" SizeToContent="Height" CanResize="False"
+        WindowStartupLocation="CenterOwner">
+
+    <Window.DataContext>
+        <namespace:NewDatabaseSettingsDialogModel />
+    </Window.DataContext>
+
+    <Window.Styles>
+        <Style Selector="Label > StackPanel">
+            <Setter Property="Margin" Value="0 4 0 0" />
+            <Setter Property="Orientation" Value="Vertical" />
+            <Setter Property="Spacing" Value="5" />
+        </Style>
+        <Style Selector="TextBlock.dim">
+            <Setter Property="Foreground" Value="DimGray" />
+            <Setter Property="FontSize" Value="13" />
+        </Style>
+    </Window.Styles>
+
+    <StackPanel Orientation="Vertical" Margin="20">
+        <StackPanel Orientation="Vertical" Spacing="15">
+            <CheckBox IsChecked="{Binding SeparateFileForDownloads}">
+                <Label>
+                    <StackPanel>
+                        <TextBlock>Use a Separate Database File for Downloads</TextBlock>
+                        <TextBlock Classes="dim">Downloaded files will be stored separately from messages. This cannot be changed later.</TextBlock>
+                    </StackPanel>
+                </Label>
+            </CheckBox>
+            <CheckBox IsChecked="{Binding DownloadsAutoStart}">
+                <Label>
+                    <StackPanel>
+                        <TextBlock>Download Files Automatically</TextBlock>
+                        <TextBlock Classes="dim">Enables automatic downloads of files hosted on Discord. This can be changed later in the Downloads tab.</TextBlock>
+                    </StackPanel>
+                </Label>
+            </CheckBox>
+        </StackPanel>
+        <Panel Classes="buttons">
+            <WrapPanel Classes="right">
+                <Button Click="ClickOk">OK</Button>
+            </WrapPanel>
+        </Panel>
+    </StackPanel>
+
+</Window>

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

@@ -0,0 +1,22 @@
+using System.Diagnostics.CodeAnalysis;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace DHT.Desktop.Main.Dialogs;
+
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+public sealed partial class NewDatabaseSettingsDialog : Window {
+	public NewDatabaseSettingsDialog() {
+		InitializeComponent();
+	}
+	
+	private void OnClosing(object? sender, WindowClosingEventArgs e) {
+		if (!e.IsProgrammatic) {
+			e.Cancel = true;
+		}
+	}
+	
+	private void ClickOk(object? sender, RoutedEventArgs e) {
+		Close();
+	}
+}

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialogModel.cs

@@ -0,0 +1,11 @@
+using PropertyChanged.SourceGenerator;
+
+namespace DHT.Desktop.Main.Dialogs;
+
+sealed partial class NewDatabaseSettingsDialogModel {
+	[Notify]
+	private bool separateFileForDownloads = true;
+	
+	[Notify]
+	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 : ObservableObject, IAsyncDisposable {
+sealed partial class MainWindowModel : IAsyncDisposable {
 	private const string DefaultTitle = "Discord History Tracker";
 	
 	private static readonly Log Log = Log.ForType<MainWindowModel>();
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private string title = DefaultTitle;
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private UserControl currentScreen;
 	
 	private readonly WelcomeScreen welcomeScreen;

app/Desktop/Main/Pages/AdvancedPage.axaml

@@ -16,11 +16,5 @@
         <Expander Header="Internal Server Configuration" IsExpanded="True">
             <controls:ServerConfigurationPanel DataContext="{Binding ServerConfigurationModel}" />
         </Expander>
-        <Expander Header="Database Tools" IsExpanded="True">
-            <StackPanel Orientation="Vertical" Spacing="10">
-                <TextBlock TextWrapping="Wrap">Recreates the database to remove any traces of deleted data, which frees up space and prevents forensic recovery.</TextBlock>
-                <Button Command="{Binding VacuumDatabase}">Vacuum Database</Button>
-            </StackPanel>
-        </Expander>
     </StackPanel>
 </UserControl>

app/Desktop/Main/Pages/AdvancedPageModel.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Threading.Tasks;
 using Avalonia.Controls;
-using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Controls;
 using DHT.Server;
 
@@ -11,26 +8,14 @@ namespace DHT.Desktop.Main.Pages;
 sealed class AdvancedPageModel : IDisposable {
 	public ServerConfigurationPanelModel ServerConfigurationModel { get; }
 	
-	private readonly Window window;
-	private readonly State state;
-	
 	[Obsolete("Designer")]
 	public AdvancedPageModel() : this(null!, State.Dummy) {}
 	
 	public AdvancedPageModel(Window window, State state) {
-		this.window = window;
-		this.state = state;
-		
 		ServerConfigurationModel = new ServerConfigurationPanelModel(window, state);
 	}
 	
 	public void Dispose() {
 		ServerConfigurationModel.Dispose();
 	}
-	
-	public async Task VacuumDatabase() {
-		const string Title = "Vacuum Database";
-		await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => state.Db.Vacuum());
-		await Dialog.ShowOk(window, Title, "Done.");
-	}
 }

app/Desktop/Main/Pages/DatabasePage.axaml

@@ -27,6 +27,12 @@
             <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">
+            <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>
+            </StackPanel>
+        </Expander>
     </StackPanel>
 
 </UserControl>

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -19,6 +19,7 @@ using DHT.Server.Data;
 using DHT.Server.Database;
 using DHT.Server.Database.Import;
 using DHT.Server.Database.Sqlite.Schema;
+using DHT.Server.Database.Sqlite.Utils;
 using DHT.Utils.Logging;
 
 namespace DHT.Desktop.Main.Pages;
@@ -54,11 +55,11 @@ sealed class DatabasePageModel {
 				break;
 			
 			case PlatformID.Unix:
-				Process.Start("xdg-open", new string[] { folder });
+				Process.Start("xdg-open", [ folder ]);
 				break;
 			
 			case PlatformID.MacOSX:
-				Process.Start("open", new string[] { folder });
+				Process.Start("open", [ folder ]);
 				break;
 			
 			default:
@@ -73,15 +74,28 @@ sealed class DatabasePageModel {
 	
 	public async Task MergeWithDatabase() {
 		string[] paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
-		if (paths.Length > 0) {
-			await ProgressDialog.Show(window, "Database Merge", async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
-		}
+		if (paths.Length == 0) {
+			return;
 		}
 		
-	private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback 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) {
 		var schemaUpgradeCallbacks = new SchemaUpgradeCallbacks(dialog, paths.Length);
 		
-		await PerformImport(target, paths, dialog, callback, "Database Merge", "Database Error", "database file", async path => {
+		return await PerformImport(target, paths, dialog, callback, "Database Merge", async path => {
 			IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, schemaUpgradeCallbacks);
 			
 			if (db == null) {
@@ -97,14 +111,11 @@ sealed class DatabasePageModel {
 		});
 	}
 	
-	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
-		private readonly ProgressDialog dialog;
-		private readonly int total;
+	private sealed class SchemaUpgradeCallbacks(ProgressDialog dialog, int total) : ISchemaUpgradeCallbacks {
 		private bool? decision;
 		
-		public SchemaUpgradeCallbacks(ProgressDialog dialog, int total) {
-			this.total = total;
-			this.dialog = dialog;
+		public Task<InitialDatabaseSettings?> GetInitialDatabaseSettings() {
+			return Task.FromResult<InitialDatabaseSettings?>(null);
 		}
 		
 		public async Task<bool> CanUpgrade() {
@@ -139,15 +150,28 @@ sealed class DatabasePageModel {
 			AllowMultiple = true,
 		});
 		
-		if (paths.Length > 0) {
-			await ProgressDialog.Show(window, "Legacy Archive Import", async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
-		}
+		if (paths.Length == 0) {
+			return;
 		}
 		
-	private static async Task ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback 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) {
 		var fakeSnowflake = new FakeSnowflake();
 		
-		await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", "Legacy Archive Error", "archive file", async path => {
+		return await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", async path => {
 			await using var jsonStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
 			
 			return await LegacyArchiveImport.Read(jsonStream, target, fakeSnowflake, async servers => {
@@ -191,7 +215,7 @@ sealed class DatabasePageModel {
 		            .ToDictionary(static item => item.Item, static item => ulong.Parse(item.Value));
 	}
 	
-	private static async Task PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string neutralDialogTitle, string errorDialogTitle, string itemName, Func<string, Task<bool>> performImport) {
+	private static async Task<ImportResult?> PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string dialogTitle, Func<string, Task<bool>> performImport) {
 		int total = paths.Length;
 		DatabaseStatistics oldStatistics = await DatabaseStatistics.Take(target);
 		
@@ -203,7 +227,7 @@ sealed class DatabasePageModel {
 			++finished;
 			
 			if (!File.Exists(path)) {
-				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
+				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
 				continue;
 			}
 			
@@ -213,19 +237,18 @@ sealed class DatabasePageModel {
 				}
 			} catch (Exception ex) {
 				Log.Error(ex);
-				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
+				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
 			}
 		}
 		
 		await callback.Update("Done", finished, total);
 		
 		if (successful == 0) {
-			await Dialog.ShowOk(dialog, neutralDialogTitle, "Nothing was imported.");
-			return;
+			return null;
 		}
 		
 		DatabaseStatistics newStatistics = await DatabaseStatistics.Take(target);
-		await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, newStatistics, successful, total, itemName));
+		return new ImportResult(oldStatistics, newStatistics, successful, total);
 	}
 	
 	private sealed record DatabaseStatistics(long ServerCount, long ChannelCount, long UserCount, long MessageCount) {
@@ -239,7 +262,16 @@ sealed class DatabasePageModel {
 		}
 	}
 	
-	private static string GetImportDialogMessage(DatabaseStatistics oldStatistics, DatabaseStatistics newStatistics, int successfulItems, int totalItems, string itemName) {
+	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;
+		
 		long newServers = newStatistics.ServerCount - oldStatistics.ServerCount;
 		long newChannels = newStatistics.ChannelCount - oldStatistics.ChannelCount;
 		long newUsers = newStatistics.UserCount - oldStatistics.UserCount;
@@ -248,11 +280,11 @@ sealed class DatabasePageModel {
 		var message = new StringBuilder();
 		message.Append("Processed ");
 		
-		if (successfulItems == totalItems) {
-			message.Append(successfulItems.Pluralize(itemName));
+		if (result.SuccessfulItems == result.TotalItems) {
+			message.Append(result.SuccessfulItems.Pluralize(itemName));
 		}
 		else {
-			message.Append(successfulItems.Format()).Append(" out of ").Append(totalItems.Pluralize(itemName));
+			message.Append(result.SuccessfulItems.Format()).Append(" out of ").Append(result.TotalItems.Pluralize(itemName));
 		}
 		
 		message.Append(" and added:\n\n  \u2022 ");
@@ -263,4 +295,18 @@ sealed class DatabasePageModel {
 		
 		return message.ToString();
 	}
+	
+	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 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, batchCount);
+		await callback.Update("Adding messages in batches of " + BatchSize, finishedItems: 0, totalItems: batchCount);
 		
 		var rand = new Random();
 		var server = new DHT.Server.Data.Server {

app/Desktop/Main/Pages/DownloadsPage.axaml

@@ -33,8 +33,9 @@
     <StackPanel Orientation="Vertical">
         <WrapPanel Orientation="Horizontal">
             <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
-            <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
-            <Button Command="{Binding OnClickDeleteOrphanedDownloads}">Delete Orphaned Downloads</Button>
+            <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>
         </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,12 +1,14 @@
 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;
@@ -18,28 +20,32 @@ 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 : ObservableObject, IAsyncDisposable {
+sealed partial class DownloadsPageModel : IAsyncDisposable {
 	private static readonly Log Log = Log.ForType<DownloadsPageModel>();
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private bool isToggleDownloadButtonEnabled = true;
 	
+	[DependsOn(nameof(IsDownloading))]
 	public string ToggleDownloadButtonText => IsDownloading ? "Stop Downloading" : "Start Downloading";
 	
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
+	[Notify(Setter.Private)]
 	private bool isRetryingFailedDownloads = false;
 	
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
+	[Notify(Setter.Private)]
+	private bool hasSuccessfulDownloads;
+	
+	[Notify(Setter.Private)]
 	private bool hasFailedDownloads;
 	
+	[DependsOn(nameof(IsRetryingFailedDownloads), nameof(HasFailedDownloads))]
 	public bool IsRetryFailedOnDownloadsButtonEnabled => !IsRetryingFailedDownloads && HasFailedDownloads;
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private string downloadMessage = "";
 	
 	public DownloadItemFilterPanelModel FilterModel { get; }
@@ -140,15 +146,14 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
 	private void OnDownloadStateChanged() {
 		RecomputeDownloadStatistics();
 		
-		OnPropertyChanged(nameof(ToggleDownloadButtonText));
-		OnPropertyChanged(nameof(IsDownloading));
+		OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsDownloading)));
 	}
 	
 	private void OnItemFinished(DownloadItem item) {
 		RecomputeDownloadStatistics();
 	}
 	
-	public async Task OnClickRetryFailedDownloads() {
+	public async Task OnClickRetryFailed() {
 		IsRetryingFailedDownloads = true;
 		
 		try {
@@ -165,13 +170,11 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
 		downloadStatisticsTask.Post(cancellationToken => state.Db.Downloads.GetStatistics(currentDownloadFilter ?? new DownloadItemFilter(), cancellationToken));
 	}
 	
-	private const string DeleteOrphanedDownloadsTitle = "Delete Orphaned Downloads";
+	public async Task OnClickDeleteOrphaned() {
+		const string Title = "Delete Orphaned Downloads";
 		
-	public async Task OnClickDeleteOrphanedDownloads() {
-		await ProgressDialog.Show(window, DeleteOrphanedDownloadsTitle, DeleteOrphanedDownloads);
-	}
-	
-	private async Task DeleteOrphanedDownloads(ProgressDialog dialog, IProgressCallback callback) {
+		try {
+			await ProgressDialog.Show(window, Title, async (_, callback) => {
 				await callback.UpdateIndeterminate("Searching for orphaned downloads...");
 				
 				HashSet<string> reachableNormalizedUrls = [];
@@ -189,11 +192,11 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
 				}
 				
 				if (orphanedNormalizedUrls.Count == 0) {
-			await Dialog.ShowOk(window, DeleteOrphanedDownloadsTitle, "No orphaned downloads found.");
+					await Dialog.ShowOk(window, Title, "No orphaned downloads found.");
 					return;
 				}
 				
-		if (await Dialog.ShowYesNo(window, DeleteOrphanedDownloadsTitle, orphanedNormalizedUrls.Count + " orphaned download(s) will be removed from this database. This action cannot be undone. Proceed?") != DialogResult.YesNo.Yes) {
+				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;
 				}
 				
@@ -201,12 +204,60 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
 				await state.Db.Downloads.Remove(orphanedNormalizedUrls);
 				RecomputeDownloadStatistics();
 				
-		if (await Dialog.ShowYesNo(window, DeleteOrphanedDownloadsTitle, "Orphaned downloads deleted. Vacuum database now to reclaim space?") != DialogResult.YesNo.Yes) {
+				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 (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) {
@@ -226,24 +277,23 @@ sealed partial class DownloadsPageModel : ObservableObject, 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;
 		
-		[ObservableProperty]
+		[Notify]
 		private int items;
 		
-		[ObservableProperty]
-		[NotifyPropertyChangedFor(nameof(SizeText))]
+		[Notify]
 		private ulong? size;
 		
-		[ObservableProperty]
-		[NotifyPropertyChangedFor(nameof(SizeText))]
+		[Notify]
 		private bool hasFilesWithUnknownSize;
 		
+		[DependsOn(nameof(Size), nameof(HasFilesWithUnknownSize))]
 		public string SizeText {
 			get {
 				if (size == null) {

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -4,28 +4,27 @@ 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 : ObservableObject {
-	[ObservableProperty(Setter = Access.Private)]
+sealed partial class TrackingPageModel {
+	[Notify(Setter.Private)]
 	private bool isCopyTrackingScriptButtonEnabled = true;
 	
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
+	[Notify(Setter.Private)]
 	private bool? areDevToolsEnabled = null;
 	
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
+	[Notify(Setter.Private)]
 	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,7 +3,6 @@ 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;
@@ -13,16 +12,17 @@ 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 : ObservableObject, IDisposable {
+sealed partial class ViewerPageModel : IDisposable {
 	private static readonly Log Log = Log.ForType<ViewerPageModel>();
 	
 	public bool DatabaseToolFilterModeKeep { get; set; } = true;
 	public bool DatabaseToolFilterModeRemove { get; set; } = false;
 	
-	[ObservableProperty]
+	[Notify]
 	private bool hasFilters = false;
 	
 	public MessageFilterPanelModel FilterModel { get; }
@@ -61,6 +61,7 @@ sealed partial class ViewerPageModel : ObservableObject, 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));
 			
@@ -74,6 +75,10 @@ sealed partial class ViewerPageModel : ObservableObject, IDisposable {
 					await ApplyFilterToDatabase(filter, FilterRemovalMode.RemoveMatching);
 				}
 			}
+		} catch (Exception e) {
+			Log.Error(e);
+			await Dialog.ShowOk(window, "Apply Filters", "Could not apply filters: " + e.Message);
+		}
 	}
 	
 	private async Task ApplyFilterToDatabase(MessageFilter filter, FilterRemovalMode removalMode) {

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -5,23 +5,24 @@ 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;
-using DHT.Server.Data.Settings;
+using DHT.Desktop.Main.Dialogs;
 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 : ObservableObject {
+sealed partial class WelcomeScreenModel {
 	private static readonly Log Log = Log.ForType<WelcomeScreenModel>();
 	
 	public string Version => Program.Version;
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private bool isOpenOrCreateDatabaseButtonEnabled = true;
 	
 	public event EventHandler<IDatabaseFile>? DatabaseSelected;
@@ -52,21 +53,22 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 	public async Task OpenOrCreateDatabaseFromPath(string path) {
 		dbFilePath = path;
 		
-		bool isNew = !File.Exists(path);
-		
 		IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
-		if (db == null) {
-			return;
-		}
-		
-		if (isNew && await Dialog.ShowYesNo(window, "Automatic Downloads", "Do you want to automatically download files hosted on Discord? You can change this later in the Downloads tab.") == DialogResult.YesNo.Yes) {
-			await db.Settings.Set(SettingsKey.DownloadsAutoStart, value: true);
-		}
-		
+		if (db != null) {
 			DatabaseSelected?.Invoke(this, db);
 		}
+	}
 	
 	private sealed class SchemaUpgradeCallbacks(Window window) : ISchemaUpgradeCallbacks {
+		public async Task<InitialDatabaseSettings?> GetInitialDatabaseSettings() {
+			var model = new NewDatabaseSettingsDialogModel();
+			
+			var dialog = new NewDatabaseSettingsDialog { DataContext = model };
+			await dialog.ShowDialog(window);
+			
+			return new InitialDatabaseSettings(model.SeparateFileForDownloads, model.DownloadsAutoStart);
+		}
+		
 		public async Task<bool> CanUpgrade() {
 			return DialogResult.YesNo.Yes == await DatabaseGui.ShowCanUpgradeDatabaseDialog(window);
 		}
@@ -110,7 +112,9 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 	}
 	
 	public async Task CheckUpdates() {
-		var latestVersion = await ProgressDialog.ShowIndeterminate<Version?>(window, "Check Updates", "Checking for updates...", async _ => {
+		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,
@@ -121,27 +125,19 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 				client.MaxResponseContentBufferSize = 1024;
 				client.DefaultRequestHeaders.UserAgent.ParseAdd("DiscordHistoryTracker/" + Program.Version);
 				
-			string response;
-			try {
-				response = await client.GetStringAsync(Program.Website + "/version");
+				return 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;
+			return;
 		} catch (Exception e) {
 			Log.Error(e);
 			await Dialog.ShowOk(window, "Check Updates", "Error checking for updates: " + e.Message);
-				return null;
+			return;
 		}
 		
 		if (!System.Version.TryParse(response, out Version? latestVersion)) {
 			await Dialog.ShowOk(window, "Check Updates", "Server returned an invalid response.");
-				return null;
-			}
-			
-			return latestVersion;
-		});
-		
-		if (latestVersion == null) {
 			return;
 		}
 		

app/Directory.Build.props

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

app/Resources/Viewer/index.html

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
   <meta charset="utf-8">
   <meta name="referrer" content="no-referrer">
@@ -11,6 +12,7 @@
   <link rel="stylesheet" href="styles/main.css">
   <link rel="stylesheet" href="styles/menu.css">
   <link rel="stylesheet" href="styles/channels.css">
+  <link rel="stylesheet" href="styles/servers.css">
   <link rel="stylesheet" href="styles/messages.css">
   <link rel="stylesheet" href="styles/modal.css">
 
@@ -21,6 +23,7 @@
   </script>
   <script type="module" src="scripts/bootstrap.mjs"></script>
 </head>
+
 <body>
   <div id="menu">
     <button id="btn-settings">Settings</button>
@@ -41,7 +44,8 @@
     <div class="nav">
       <button id="nav-first" data-nav="first" class="icon">&laquo;</button>
       <button id="nav-prev" data-nav="prev" class="icon">&lsaquo;</button>
-        <button id="nav-pick" data-nav="pick">Page <span id="nav-page-current">1</span>/<span id="nav-page-total">?</span></button>
+      <button id="nav-pick" data-nav="pick">Page <span id="nav-page-current">1</span>/<span
+          id="nav-page-total">?</span></button>
       <button id="nav-next" data-nav="next" class="icon">&rsaquo;</button>
       <button id="nav-last" data-nav="last" class="icon">&raquo;</button>
     </div>
@@ -75,6 +79,8 @@
   </div>
 
   <div id="app">
+    <div id="servers">
+    </div>
     <div id="channels">
       <div class="loading"></div>
     </div>
@@ -86,4 +92,5 @@
     <div id="dialog"></div>
   </div>
 </body>
+
 </html>

app/Resources/Viewer/scripts/bootstrap.mjs

@@ -2,6 +2,7 @@ import discord from "./discord.mjs";
 import gui from "./gui.mjs";
 import state from "./state.mjs";
 import "./polyfills.mjs";
+import servers from "./servers.mjs";
 
 window.DISCORD = discord;
 
@@ -25,10 +26,12 @@ document.addEventListener("DOMContentLoaded", () => {
 	
 	state.onUsersRefreshed(users => {
 		gui.updateUserList(users);
+		servers.update()
 	});
 	
 	state.onChannelsRefreshed((channels, selected) => {
 		gui.updateChannelList(channels, selected, state.selectChannel);
+		servers.update()
 	});
 	
 	state.onMessagesRefreshed(messages => {

app/Resources/Viewer/scripts/discord.mjs

@@ -113,16 +113,17 @@ export default (function() {
 	return {
 		setup() {
 			templateChannelServer = new template([
-				"<div class='channel' data-channel='{id}'>",
+				"<div class='channel ServerChannel' data-channel='{id}' server-id='{serverId}' server-name='{server.name}' server-type='{server.type}'>",
 				"<div class='info' title='{topic}'><strong class='name'>#{name}</strong>{nsfw}<span class='tag'>{msgcount}</span></div>",
-				"<span class='server'>{server.name} ({server.type})</span>",
+				"<!--<span class='server'>{server.name} ({server.type})</span>-->",
 				"</div>"
 			].join(""));
 			
 			templateChannelPrivate = new template([
-				"<div class='channel' data-channel='{id}'>",
+				"<div class='channel UserChannel' data-channel='{id}' server-id='0' server-name='{server.name}' server-type='{server.type}'>",
+				"<div class='avatar'>{icon}</div>",
 				"<div class='info'><strong class='name'>{name}</strong><span class='tag'>{msgcount}</span></div>",
-				"<span class='server'>({server.type})</span>",
+				"<!--<span class='server'>{server.name} ({server.type})</span>-->",
 				"</div>"
 			].join(""));
 			
@@ -166,7 +167,7 @@ export default (function() {
 			
 			// noinspection HtmlUnknownTarget
 			templateEmbedImageWithSize = new template([
-				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' width='{width}' height='{height}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
+				"<a href='{url}'  class='embed thumbnail loading'><img src='{src}' width='{width}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget

app/Resources/Viewer/scripts/servers.mjs

@@ -0,0 +1,109 @@
+import state from "./state.mjs";
+
+const servers = (() => {
+    let currentServerId = "0";
+
+    function getIcon(name) {
+        return name.split(" ").map(word => {
+            if (word.startsWith("[") && word.length > 1) return word[1];
+            return word[0] || "";
+        }).join("");
+    }
+
+    function update() {
+        const channels = document.querySelectorAll("#channels .channel");
+        const serversMap = new Map();
+
+        // Check if there are any channels with server-id 0 (DM)
+        const hasDMChannels = Array.from(channels).some(channel => {
+            return channel.getAttribute("server-id") === "0";
+        });
+
+        if (hasDMChannels) {
+            serversMap.set("0", {
+                id: "0",
+                name: "DM",
+                icon: "DM",
+            });
+        }
+
+        channels.forEach(channel => {
+            const serverId = channel.getAttribute("server-id") || "0";
+            const serverType = channel.getAttribute("server-type");
+            const serverName = channel.getAttribute("server-name");
+
+            if (serverType === "server" && !serversMap.has(serverId)) {
+                serversMap.set(serverId, {
+                    id: serverId,
+                    name: serverName,
+                    icon: getIcon(serverName),
+                });
+            }
+        });
+
+        const serversDiv = document.getElementById("servers");
+        serversDiv.innerHTML = "";
+
+        if (hasDMChannels) {
+            const dmServer = serversMap.get("0");
+            const dmElement = document.createElement("div");
+            dmElement.className = `Server${dmServer.id === currentServerId ? " active" : ""}`;
+            dmElement.id = "DM";
+            dmElement.dataset.serverId = dmServer.id;
+            dmElement.innerHTML = `
+                <div class="icon">DM</div>
+                <div class="name" title="Direct Messages">Direct Messages</div>
+            `;
+            dmElement.addEventListener("click", () => selectServer(dmServer.id));
+            serversDiv.appendChild(dmElement);
+        }
+
+        serversMap.forEach(server => {
+            if (server.id === "0") return; // Skip DM since it's already added
+
+            const serverElement = document.createElement("div");
+            serverElement.className = `Server${server.id === currentServerId ? " active" : ""}`;
+            serverElement.dataset.serverId = server.id;
+            serverElement.innerHTML = `
+                <div class="icon">${server.icon}</div>
+                <div class="name" title="${server.name}">${server.name}</div>
+            `;
+            serverElement.addEventListener("click", () => selectServer(server.id));
+            serversDiv.appendChild(serverElement);
+        });
+
+        if (!serversMap.has(currentServerId)) {
+            currentServerId = "0";
+        }
+
+        updateChannelVisibility();
+    }
+
+    function selectServer(serverId) {
+        // Remove active class from all servers
+        document.querySelectorAll("#servers .Server").forEach(server => {
+            server.classList.remove("active");
+        });
+
+        // Add active class to the selected server
+        const selectedServer = document.querySelector(`#servers .Server[data-server-id="${serverId}"]`);
+        if (selectedServer) {
+            selectedServer.classList.add("active");
+        }
+
+        currentServerId = serverId;
+        updateChannelVisibility();
+        state.selectChannel(null);
+    }
+
+    function updateChannelVisibility() {
+        document.querySelectorAll("#channels .channel").forEach(channel => {
+            const channelServerId = channel.getAttribute("server-id") || "0";
+            channel.classList.toggle("visible", channelServerId === currentServerId);
+        });
+    }
+
+    return { update };
+})();
+
+export default servers;

app/Resources/Viewer/scripts/state.mjs

@@ -9,6 +9,18 @@ export default (function() {
 	 * @property {{}} servers
 	 * @property {{}} channels
 	 */
+
+
+	const fileUrlProcessor = function (serverToken) {
+		if (typeof serverToken === "string") {
+			return url => "/get-downloaded-file/" + encodeURIComponent(url) + "?token=" + encodeURIComponent(serverToken);
+		}
+		else {
+			return url => url;
+		}
+	}(window.DHT_SERVER_TOKEN);
+
+
 	let loadedFileMeta;
 	let loadedFileData;
 
@@ -31,6 +43,26 @@ export default (function() {
 		return loadedFileMeta.servers[id] || { "name": "<unknown>", "type": "unknown" };
 	};
 
+	const getUserIDByName = function (name) {
+		for (let userId in loadedFileMeta.users) {
+			let user = loadedFileMeta.users[userId];
+			if (user.name === name) {
+				return userId;
+			}
+		}
+		return 0;
+	};
+
+	const getUserByName = function (name) {
+		for (let userId in loadedFileMeta.users) {
+			let user = loadedFileMeta.users[userId];
+			if (user.name === name) {
+				return user;
+			}
+		}
+		return 0;
+	};
+
 	const generateChannelHierarchy = function () {
 		/**
 		 * @type {Map<string, Set>}
@@ -144,13 +176,18 @@ export default (function() {
 		const channels = loadedFileMeta.channels;
 		const channelOrder = generateChannelOrder();
 
+
 		return Object.keys(channels).map(key => ({
 			"id": key,
+			"serverId": channels[key].server,
 			"name": channels[key].name,
 			"server": getServer(channels[key].server),
 			"msgcount": getFilteredMessageKeys(key).length,
 			"topic": channels[key].topic || "",
 			"nsfw": channels[key].nsfw || false,
+			"icon": getServer(channels[key].server).type === "group"
+				? `<!--<span>${channels[key].name.split(" ").map(word => word[0]).join("")}</span>-->` //Discord default naming without a icon
+				: `<img src='${fileUrlProcessor("https://cdn.discordapp.com/avatars/" + getUserIDByName(channels[key].name) + "/" + getUserByName(channels[key].name).avatar)}'>`
 		})).sort((ac, bc) => {
 			return channelOrder[ac.id] - channelOrder[bc.id];
 		});

app/Resources/Viewer/scripts/template.mjs

@@ -6,17 +6,23 @@ export default class {
 	constructor(contents) {
 		this.contents = contents;
 	};
-	
+	7
 	apply(obj, processor) {
+
+		//Keys to not escape
+		const allowHTMLKeys = new Set(["icon"]); //Example with more: Set(["icon", "description", "content"]);
+	
 		return this.contents.replace(TEMPLATE_REGEX, (full, match) => {
 			const value = match.split(".").reduce((o, property) => o[property], obj);
 	
 			if (processor) {
 				const updated = processor(match, value);
-				return typeof updated === "undefined" ? dom.escapeHTML(value) : updated;
+				return typeof updated === "undefined" ? (allowHTMLKeys.has(match) ? value : dom.escapeHTML(value)) : updated;
 			}
 
-			return dom.escapeHTML(value);
+	
+			return allowHTMLKeys.has(match) ? value : dom.escapeHTML(value);
 		});
 	}
+	
 }

app/Resources/Viewer/styles/channels.css

@@ -4,8 +4,9 @@
   max-width: 300px;
   overflow-y: auto;
   color: #eee;
-  background-color: #1c1e22;
+  background-color: #2B2D31;
   font-size: 15px;
+  padding: 2px;
 }
 
 #channels>div.loading {
@@ -14,27 +15,93 @@
   height: 150px;
 }
 
-#channels > div.channel {
-  cursor: pointer;
-  padding: 10px 12px;
-  border-bottom: 1px solid #333333;
+#channels>div.loading {
+  background-color: rgba(0, 0, 0, 0) !important;
 }
 
-#channels > div.channel:hover, #channels > div.channel.active {
-  background-color: #282b30;
+
+#channels>div.channel.visible {
+  display: flex !important;
 }
 
+#channels>div.channel {
+  display: none !important;
+
+  cursor: pointer;
+  padding: 5px 8px;
+
+  color: #eee;
+  font-size: 15px;
+
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: flex-start;
+
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+
+  border-radius: 5px;
+}
+
+
+.ServerChannel {
+  padding: 8px 8px !important;
+}
+
+#channels>div.channel:hover,
+#channels>div.channel.active {
+  background-color: rgba(78, 80, 88, 0.6);
+}
+
+#channels>div.channel.active>.info>.name {
+  color: oklab(0.999994 0.0000455678 0.0000200868);
+}
+
+
 #channels .info {
   display: flex;
-  height: 16px;
-  margin-bottom: 4px;
+  width: 100%;
+}
+
+.ServerChannel>.info {
+  padding: 0px !important;
+}
+
+.UserChannel>.info {
+  align-self: center;
+  padding-left: 6px !important;
+  align-items: center;
+
+  width: 150px !important;
+}
+
+
+[server-type="group"]>.info {
+  padding: 6px;
+
+  width: 172px !important;
+}
+
+.UserChannel>.info>.name {
+  min-height: 18px;
 }
 
 #channels .name {
   flex-grow: 1;
+  overflow-x: hidden;
+  overflow-y: clip;
   text-overflow: ellipsis;
   white-space: nowrap;
-  overflow: hidden;
+  color: oklab(0.686636 -0.00407365 -0.0149199);
+  font-weight: 500;
+  font-size: 16px;
+  /* max-width: 200px; */
+}
+
+.ServerChannel .name {
+  height: 18px;
 }
 
 #channels .tag {
@@ -46,3 +113,25 @@
   padding: 2px 5px;
   font-size: 11px;
 }
+
+
+#channels>div:hover,
+#channels>div.active {
+  background-color: #404249
+}
+
+#channels>div>.avatar {
+  padding: 0;
+  margin: 0;
+}
+
+#channels>div>.avatar>* {
+  width: 30px;
+
+  min-width: 30px;
+  min-height: 30px;
+  /*Make not loaded images be 30px*/
+
+  border-radius: 100%;
+  font-size: 1em;
+}

app/Resources/Viewer/styles/main.css

@@ -17,6 +17,10 @@ body {
   --loading-backdrop: rgba(0, 0, 0, 0);
 }
 
+.loading:hover {
+  background-color: rgba(0, 0, 0, 0) !important;
+}
+
 .loading::after {
   content: "";
   background: var(--loading-backdrop)

app/Resources/Viewer/styles/menu.css

@@ -4,8 +4,8 @@
   align-items: stretch;
   gap: 8px;
   padding: 8px;
-  background-color: #17181c;
-  border-bottom: 1px dotted #5d626b;
+  background-color: #313338;
+  border-bottom: 2px solid #27292D
 }
 
 #menu .splitter {
@@ -23,7 +23,9 @@
   cursor: default;
 }
 
-#menu button, #menu select, #menu input[type="text"] {
+#menu button,
+#menu select,
+#menu input[type="text"] {
   height: 31px;
   padding: 0 10px;
   background-color: #7289da;
@@ -64,11 +66,13 @@
   padding: 0 8px;
 }
 
-#menu .nav > button, #menu .nav > p {
+#menu .nav>button,
+#menu .nav>p {
   margin: 0 1px;
 }
 
-#opt-filter-list > select, #opt-filter-list > input {
+#opt-filter-list>select,
+#opt-filter-list>input {
   display: none;
 }
 

app/Resources/Viewer/styles/messages.css

@@ -5,9 +5,14 @@
 }
 
 #messages>div {
-  margin: 0 24px;
-  padding: 4px 0 12px;
-  border-bottom: 1px solid rgba(255, 255, 255, 0.04);
+  padding: 0 4px 0 24px;
+
+  margin-bottom: 17px;
+}
+
+
+#messages>div:hover {
+  background-color: oklab(0.0846607 0.00000385568 0.00000169128 / 0.06);
 }
 
 #messages h2 {
@@ -23,6 +28,8 @@
   align-content: flex-start;
 }
 
+
+
 #messages .avatar-wrapper>div {
   flex: 1 1 auto;
 }
@@ -50,14 +57,9 @@
   font-size: 12px;
   font-weight: 500;
   letter-spacing: 0;
+  margin-left: 5px;
 }
 
-#messages .info::before {
-  content: "\2022";
-  text-align: center;
-  display: inline-block;
-  width: 14px;
-}
 
 #messages .jump {
   cursor: pointer;
@@ -66,20 +68,22 @@
 }
 
 .message {
-  margin-top: 6px;
-  color: rgba(255, 255, 255, 0.7);
-  font-size: 15px;
+  margin-top: 2px;
+  color: oklab(0.89908 -0.00192907 -0.0048306);
+  font-size: 16px;
   line-height: 1.1em;
   white-space: pre-wrap;
   word-wrap: break-word;
 }
 
-.message .link, .reply-message .link {
+.message .link,
+.reply-message .link {
   color: #7289da;
   background-color: rgba(115, 139, 215, 0.1);
 }
 
-.message a, .reply-message a {
+.message a,
+.reply-message a {
   color: #0096cf;
   text-decoration: none;
 }
@@ -126,7 +130,8 @@
   border-radius: 3px;
 }
 
-.message .embed:first-child, .message .download + .download {
+.message .embed:first-child,
+.message .download+.download {
   margin-top: 0;
 }
 

app/Resources/Viewer/styles/servers.css

@@ -0,0 +1,77 @@
+#servers {
+    width: 76px;
+    background-color: #1e1f22;
+    padding: 0px;
+}
+
+.Server {
+    width: 54px;
+    height: 54px;
+    margin-left: 11px;
+    margin-top: 8px;
+    border-radius: 100%;
+    transition: .15s ease-out;
+    cursor: pointer;
+    background-color: #313338;
+    display: flex;
+    align-items: center;
+}
+
+.Server:hover {
+    border-radius: 20px;
+    background-color: #5865f2;
+}
+
+.Server.active {
+    border-radius: 20px;
+    background-color: #5865f2;
+}
+
+.ServerImg {
+    width: 100%;
+    height: 100%;
+}
+
+svg.ServerImg {
+    width: 100%;
+    height: 70%;
+    /* margin-top: 15%; */
+    color: white;
+}
+
+#servers .Server .icon {
+    font-weight: bold;
+    font-size: 1.5em;
+    text-align: center;
+    word-wrap: break-word;
+    white-space: normal;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 100%;
+    color: white;
+}
+
+#servers .Server .name {
+    display: none;
+    font-weight: bold;
+    white-space: normal;
+    word-wrap: break-word;
+    text-align: center;
+}
+#servers .Server .name {
+    display: none;
+}
+
+#servers .Server:hover .name {
+    display: block;
+    position: absolute;
+    background: rgba(0, 0, 0, 0.8);
+    color: white;
+    padding: 5px;
+    border-radius: 4px;
+    margin-left: 60px;
+    white-space: nowrap;
+}

app/Server/Data/Settings/SettingsKey.cs

@@ -3,6 +3,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace DHT.Server.Data.Settings;
 
 public static class SettingsKey {
+	public static Bool SeparateFileForDownloads { get; } = new ("separate_file_for_downloads");
 	public static Bool DownloadsAutoStart { get; } = new ("downloads_auto_start");
 	public static Bool DownloadsLimitSize { get; } = new ("downloads_limit_size");
 	public static UnsignedLong DownloadsMaximumSize { get; } = new ("downloads_maximum_size");

app/Server/Database/Export/SnowflakeJsonSerializer.cs

@@ -1,16 +1,20 @@
 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(value.Id.ToString());
+		writer.WriteStringValue(Format(value, stackalloc byte[MaxUlongStringLength]));
 	}
 	
 	public override Snowflake ReadAsPropertyName(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
@@ -18,6 +22,14 @@ sealed class SnowflakeJsonSerializer : JsonConverter<Snowflake> {
 	}
 	
 	public override void WriteAsPropertyName(Utf8JsonWriter writer, Snowflake value, JsonSerializerOptions options) {
-		writer.WritePropertyName(value.Id.ToString());
+		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];
 	}
 }

app/Server/Database/Export/ViewerJson.cs

@@ -30,7 +30,7 @@ static class ViewerJson {
 		public required string Name { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-		public string? Parent { get; init; }
+		public Snowflake? 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 string? R { get; init; }
+		public Snowflake? 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 string? Id { get; init; }
+		public Snowflake? Id { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
 		public string? N { get; init; }

app/Server/Database/Export/ViewerJsonExport.cs

@@ -2,13 +2,15 @@ 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;
 
@@ -18,12 +20,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<Channel>();
+		var includedChannels = new List<DiscordChannel>();
 		var includedServerIds = new HashSet<ulong>();
 		
 		HashSet<ulong>? channelIdFilter = filter?.ChannelIds;
 		
-		await foreach (Channel channel in db.Channels.Get(cancellationToken)) {
+		await foreach (DiscordChannel channel in db.Channels.Get(cancellationToken)) {
 			if (channelIdFilter == null || channelIdFilter.Contains(channel.Id)) {
 				includedChannels.Add(channel);
 				includedServerIds.Add(channel.Server);
@@ -53,11 +55,30 @@ static class ViewerJsonExport {
 		
 		ReadOnlyMemory<byte> newLine = "\n"u8.ToArray();
 		
-		await foreach (ViewerJson.JsonMessage message in GenerateMessageList(db, filter, cancellationToken)) {
-			await JsonSerializer.SerializeAsync(stream, message, ViewerJsonMessageContext.Default.JsonMessage, cancellationToken);
+		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 stream.WriteAsync(newLine, cancellationToken);
 		}
 		
+		await writerTask;
+		
 		perf.Step("Generate and serialize messages to JSON");
 		perf.End();
 	}
@@ -93,14 +114,14 @@ static class ViewerJsonExport {
 		return servers;
 	}
 	
-	private static Dictionary<Snowflake, ViewerJson.JsonChannel> GenerateChannelList(List<Channel> includedChannels) {
+	private static Dictionary<Snowflake, ViewerJson.JsonChannel> GenerateChannelList(List<DiscordChannel> includedChannels) {
 		var channels = new Dictionary<Snowflake, ViewerJson.JsonChannel>();
 		
-		foreach (Channel channel in includedChannels) {
+		foreach (DiscordChannel channel in includedChannels) {
 			channels[channel.Id] = new ViewerJson.JsonChannel {
 				Server = channel.Server,
 				Name = channel.Name,
-				Parent = channel.ParentId?.ToString(),
+				Parent = channel.ParentId,
 				Position = channel.Position,
 				Topic = channel.Topic,
 				Nsfw = channel.Nsfw,
@@ -110,16 +131,15 @@ static class ViewerJsonExport {
 		return channels;
 	}
 	
-	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 {
+	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?.ToString(),
+			R = message.RepliedToId,
 			
 			A = message.Attachments.IsEmpty ? null : message.Attachments.Select(static attachment => {
 				var a = new ViewerJson.JsonMessageAttachment {
@@ -138,7 +158,7 @@ static class ViewerJsonExport {
 			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(),
+				Id = reaction.EmojiId,
 				N = reaction.EmojiName,
 				A = reaction.EmojiFlags.HasFlag(EmojiFlags.Animated),
 				C = reaction.Count,
@@ -146,4 +166,3 @@ static class ViewerJsonExport {
 		};
 	}
 }
-}

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();
+	IAsyncEnumerable<Data.Download> Get(DownloadItemFilter? filter = null);
 	
 	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() {
+		public IAsyncEnumerable<Data.Download> Get(DownloadItemFilter? filter) {
 			return AsyncEnumerable.Empty<Data.Download>();
 		}
 		

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

@@ -18,6 +18,8 @@ namespace DHT.Server.Database.Sqlite.Repositories;
 sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRepository(Log), IDownloadRepository {
 	private static readonly Log Log = Log.ForType<SqliteDownloadRepository>();
 	
+	public const string Schema = "downloads";
+	
 	internal sealed class NewDownloadCollector : IAsyncDisposable {
 		private readonly SqliteDownloadRepository repository;
 		private bool hasChanged = false;
@@ -71,7 +73,25 @@ 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()) {
 			await conn.BeginTransactionAsync();
 			
@@ -87,7 +107,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", item.Size);
+			metadataCmd.Set(":size", actualSize);
 			await metadataCmd.ExecuteNonQueryAsync();
 			
 			if (stream == null) {
@@ -107,10 +127,10 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 				);
 				
 				upsertBlobCmd.AddAndSet(":normalized_url", SqliteType.Text, item.NormalizedUrl);
-				upsertBlobCmd.AddAndSet(":blob_length", SqliteType.Integer, item.Size);
+				upsertBlobCmd.AddAndSet(":blob_length", SqliteType.Integer, actualSize);
 				long rowid = await upsertBlobCmd.ExecuteLongScalarAsync();
 				
-				await using var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid);
+				await using var blob = BlobReference(conn, rowid, readOnly: false);
 				await stream.CopyToAsync(blob);
 			}
 			
@@ -181,10 +201,10 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		};
 	}
 	
-	public async IAsyncEnumerable<Data.Download> Get() {
+	public async IAsyncEnumerable<Data.Download> Get(DownloadItemFilter? filter) {
 		await using var conn = await pool.Take();
 		
-		await using var cmd = conn.Command("SELECT normalized_url, download_url, status, type, size FROM download_metadata");
+		await using var cmd = conn.Command("SELECT normalized_url, download_url, status, type, size FROM download_metadata" + filter.GenerateConditions().BuildWhereClause());
 		await using var reader = await cmd.ExecuteReaderAsync();
 		
 		while (await reader.ReadAsync()) {
@@ -214,7 +234,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			rowid = reader.GetInt64(0);
 		}
 		
-		await using (var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid, readOnly: true)) {
+		await using (var blob = BlobReference(conn, rowid, readOnly: true)) {
 			await dataProcessor(blob);
 		}
 		
@@ -249,7 +269,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			rowid = reader.GetInt64(2);
 		}
 		
-		await using (var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid, readOnly: true)) {
+		await using (var blob = BlobReference(conn, rowid, readOnly: true)) {
 			await dataProcessor(new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Success, type, (ulong) blob.Length), blob, cancellationToken);
 		}
 		

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

@@ -43,10 +43,14 @@ sealed class SqliteSettingsRepository(SqliteConnectionPool pool) : ISettingsRepo
 	}
 	
 	public async Task<T?> Get<T>(SettingsKey<T> key, T? defaultValue) {
+		await using var conn = await pool.Take();
+		return await Get(conn, key, defaultValue);
+	}
+	
+	public static async Task<T?> Get<T>(ISqliteConnection conn, SettingsKey<T> key, T? defaultValue) {
 		string? value;
 		
-		await using (var conn = await pool.Take()) {
-			await using var cmd = conn.Command("SELECT value FROM metadata WHERE key = :key");
+		await using (var cmd = conn.Command("SELECT value FROM metadata WHERE key = :key")) {
 			cmd.AddAndSet(":key", SqliteType.Text, key.Key);
 			
 			await using var reader = await cmd.ExecuteReaderAsync();

app/Server/Database/Sqlite/Schema/ISchemaUpgradeCallbacks.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Threading.Tasks;
+using DHT.Server.Database.Sqlite.Utils;
 
 namespace DHT.Server.Database.Sqlite.Schema;
 
 public interface ISchemaUpgradeCallbacks {
+	Task<InitialDatabaseSettings?> GetInitialDatabaseSettings();
 	Task<bool> CanUpgrade();
 	Task Start(int versionSteps, Func<IProgressReporter, Task> doUpgrade);
 	

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -1,42 +1,46 @@
-using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using DHT.Server.Data.Settings;
 using DHT.Server.Database.Repositories;
 using DHT.Server.Database.Sqlite.Repositories;
 using DHT.Server.Database.Sqlite.Schema;
 using DHT.Server.Database.Sqlite.Utils;
-using Microsoft.Data.Sqlite;
+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) {
-		var connectionString = new SqliteConnectionStringBuilder {
-			DataSource = path,
-			Mode = SqliteOpenMode.ReadWriteCreate,
-		};
+		var connectionString = new SqliteConnectionStringFactory(path);
+		var attachedDatabaseCollector = new AttachedDatabaseCollector(path);
 		
-		var pool = await SqliteConnectionPool.Create(connectionString, DefaultPoolSize);
 		bool wasOpened;
-		
-		try {
-			await using var conn = await pool.Take();
-			wasOpened = await new SqliteSchema(conn).Setup(schemaUpgradeCallbacks);
-		} catch (Exception) {
-			await pool.DisposeAsync();
-			throw;
+		await using (var conn = await CustomSqliteConnection.OpenUnpooled(connectionString)) {
+			wasOpened = await new SqliteSchema(conn).Setup(attachedDatabaseCollector, schemaUpgradeCallbacks);
 		}
 		
 		if (wasOpened) {
+			var pool = await SqliteConnectionPool.Create(connectionString, DefaultPoolSize, attachedDatabaseCollector);
 			return new SqliteDatabaseFile(path, pool);
 		}
 		else {
-			await pool.DisposeAsync();
 			return null;
 		}
 	}
 	
+	private sealed class AttachedDatabaseCollector(string path) : ISqliteAttachedDatabaseCollector {
+		public async IAsyncEnumerable<AttachedDatabase> GetAttachedDatabases(ISqliteConnection conn) {
+			bool useSeparateFileForDownloads = await SqliteSettingsRepository.Get(conn, SettingsKey.SeparateFileForDownloads, defaultValue: false);
+			if (useSeparateFileForDownloads) {
+				yield return new AttachedDatabase(path + "_downloads", SqliteDownloadRepository.Schema);
+			}
+		}
+	}
+	
 	public string Path { get; }
 	
 	public ISettingsRepository Settings => settings;
@@ -78,6 +82,21 @@ 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");
+			}
+		}
 	}
 }

app/Server/Database/Sqlite/SqliteSchema.cs

@@ -1,28 +1,32 @@
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
 using System.Threading.Tasks;
+using DHT.Server.Data.Settings;
 using DHT.Server.Database.Exceptions;
+using DHT.Server.Database.Sqlite.Repositories;
 using DHT.Server.Database.Sqlite.Schema;
 using DHT.Server.Database.Sqlite.Utils;
 using DHT.Utils.Logging;
+using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite;
 
-sealed class SqliteSchema {
+sealed class SqliteSchema(CustomSqliteConnection conn) {
 	internal const int Version = 10;
 	
 	private static readonly Log Log = Log.ForType<SqliteSchema>();
 	
-	private readonly ISqliteConnection conn;
-	
-	public SqliteSchema(ISqliteConnection conn) {
-		this.conn = conn;
-	}
-	
-	public async Task<bool> Setup(ISchemaUpgradeCallbacks callbacks) {
+	public async Task<bool> Setup(ISqliteAttachedDatabaseCollector attachedDatabaseCollector, ISchemaUpgradeCallbacks callbacks) {
 		await conn.ExecuteAsync("CREATE TABLE IF NOT EXISTS metadata (key TEXT PRIMARY KEY, value TEXT)");
 		
 		string? dbVersionStr = await conn.ExecuteReaderAsync("SELECT value FROM metadata WHERE key = 'version'", static reader => reader?.GetString(0));
 		if (dbVersionStr == null) {
+			if (await callbacks.GetInitialDatabaseSettings() is {} initialSettings) {
+				await ApplyInitialSettings(initialSettings);
+				await AttachAdditionalDatabasesIfNecessary(attachedDatabaseCollector);
+			}
+			
 			await InitializeSchemas();
 		}
 		else if (!int.TryParse(dbVersionStr, out int dbVersion) || dbVersion < 1) {
@@ -37,12 +41,44 @@ sealed class SqliteSchema {
 				return false;
 			}
 			
+			await AttachAdditionalDatabasesIfNecessary(attachedDatabaseCollector);
 			await callbacks.Start(Version - dbVersion, async reporter => await UpgradeSchemas(dbVersion, reporter));
 		}
 		
 		return true;
 	}
 	
+	private async Task ApplyInitialSettings(InitialDatabaseSettings initialSettings) {
+		await using var cmd = conn.Command("INSERT INTO metadata (key, value) VALUES (:key, :value)");
+		cmd.Add("key", SqliteType.Text);
+		cmd.Add("value", SqliteType.Text);
+		
+		static async Task ApplySetting<T>(SqliteCommand cmd, SettingsKey<T> key, T value) {
+			cmd.Set("key", key.Key);
+			cmd.Set("value", key.ToString(value));
+			await cmd.ExecuteNonQueryAsync();
+		}
+		
+		if (initialSettings.SeparateFileForDownloads) {
+			await ApplySetting(cmd, SettingsKey.SeparateFileForDownloads, value: true);
+		}
+		
+		if (initialSettings.DownloadsAutoStart) {
+			await ApplySetting(cmd, SettingsKey.DownloadsAutoStart, value: true);
+		}
+	}
+	
+	[SuppressMessage("ReSharper", "WithExpressionModifiesAllMembers")]
+	private async Task AttachAdditionalDatabasesIfNecessary(ISqliteAttachedDatabaseCollector attachedDatabaseCollector) {
+		await foreach (var attachedDatabase in attachedDatabaseCollector.GetAttachedDatabases(conn)) {
+			if (!File.Exists(attachedDatabase.Path)) {
+				await using CustomSqliteConnection _ = await CustomSqliteConnection.OpenUnpooled(conn.ConnectionStringFactory with { Path = attachedDatabase.Path });
+			}
+			
+			await conn.AttachDatabase(attachedDatabase);
+		}
+	}
+	
 	private async Task InitializeSchemas() {
 		await conn.ExecuteAsync("""
 		                        CREATE TABLE users (
@@ -142,8 +178,10 @@ sealed class SqliteSchema {
 	}
 	
 	internal static async Task CreateDownloadTables(ISqliteConnection conn) {
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE download_metadata (
+		string schema = conn.HasAttachedDatabase(SqliteDownloadRepository.Schema) ? SqliteDownloadRepository.Schema : "main";
+		
+		await conn.ExecuteAsync($"""
+		                         CREATE TABLE {schema}.download_metadata (
 		                         	normalized_url TEXT NOT NULL PRIMARY KEY,
 		                         	download_url   TEXT NOT NULL,
 		                         	status         INTEGER NOT NULL,
@@ -152,8 +190,8 @@ sealed class SqliteSchema {
 		                         )
 		                         """);
 		
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE download_blobs (
+		await conn.ExecuteAsync($"""
+		                         CREATE TABLE {schema}.download_blobs (
 		                         	normalized_url TEXT NOT NULL PRIMARY KEY,
 		                         	blob           BLOB NOT NULL,
 		                         	FOREIGN KEY (normalized_url) REFERENCES download_metadata (normalized_url) ON UPDATE CASCADE ON DELETE CASCADE

app/Server/Database/Sqlite/Utils/AttachedDatabase.cs

@@ -0,0 +1,3 @@
+namespace DHT.Server.Database.Sqlite.Utils;
+
+sealed record AttachedDatabase(string Path, string Schema);

app/Server/Database/Sqlite/Utils/CustomSqliteConnection.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Immutable;
+using System.Data.Common;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Data.Sqlite;
+
+namespace DHT.Server.Database.Sqlite.Utils;
+
+class CustomSqliteConnection : ISqliteConnection {
+	internal static async Task<CustomSqliteConnection> OpenUnpooled(SqliteConnectionStringFactory connectionStringFactory) {
+		SqliteConnection conn = new SqliteConnection(connectionStringFactory.Create());
+		await conn.OpenAsync();
+		
+		CustomSqliteConnection custom = new CustomSqliteConnection(connectionStringFactory, conn);
+		await custom.Setup(CancellationToken.None);
+		
+		return custom;
+	}
+	
+	internal SqliteConnectionStringFactory ConnectionStringFactory { get; }
+	public SqliteConnection InnerConnection { get; }
+	
+	private ImmutableHashSet<string> attachedDatabases = [];
+	private DbTransaction? activeTransaction;
+	
+	protected CustomSqliteConnection(SqliteConnectionStringFactory connectionStringFactory, SqliteConnection innerConnection) {
+		this.ConnectionStringFactory = connectionStringFactory;
+		this.InnerConnection = innerConnection;
+	}
+	
+	internal async Task Setup(CancellationToken cancellationToken) {
+		await this.ExecuteAsync("PRAGMA journal_mode=WAL", cancellationToken);
+		await this.ExecuteAsync("PRAGMA foreign_keys=ON", cancellationToken);
+	}
+	
+	[SuppressMessage("ReSharper", "WithExpressionModifiesAllMembers")]
+	internal async Task AttachDatabase(AttachedDatabase attachedDatabase) {
+		await this.ExecuteAsync("ATTACH DATABASE '" + attachedDatabase.Path.Replace("'", "''") + "' AS " + attachedDatabase.Schema);
+		ImmutableInterlocked.Update(ref attachedDatabases, static (set, schema) => set.Add(schema), attachedDatabase.Schema);
+	}
+	
+	public bool HasAttachedDatabase(string schema) {
+		return attachedDatabases.Contains(schema);
+	}
+	
+	public async Task BeginTransactionAsync() {
+		if (activeTransaction != null) {
+			throw new InvalidOperationException("A transaction is already active.");
+		}
+		
+		activeTransaction = await InnerConnection.BeginTransactionAsync();
+	}
+	
+	public async Task CommitTransactionAsync() {
+		if (activeTransaction == null) {
+			throw new InvalidOperationException("No active transaction to commit.");
+		}
+		
+		await activeTransaction.CommitAsync();
+		await activeTransaction.DisposeAsync();
+		activeTransaction = null;
+	}
+	
+	public async Task RollbackTransactionAsync() {
+		if (activeTransaction == null) {
+			throw new InvalidOperationException("No active transaction to rollback.");
+		}
+		
+		await activeTransaction.RollbackAsync();
+		await activeTransaction.DisposeAsync();
+		activeTransaction = null;
+	}
+	
+	public void AssignActiveTransaction(SqliteCommand command) {
+		command.Transaction = (SqliteTransaction?) activeTransaction;
+	}
+	
+	public async ValueTask DisposeAsync() {
+		if (activeTransaction != null) {
+			await RollbackTransactionAsync();
+		}
+		
+		await DisposeConnection();
+	}
+	
+	private protected virtual async ValueTask DisposeConnection() {
+		await InnerConnection.DisposeAsync();
+	}
+}

app/Server/Database/Sqlite/Utils/ISqliteAttachedDatabaseCollector.cs

@@ -0,0 +1,7 @@
+using System.Collections.Generic;
+
+namespace DHT.Server.Database.Sqlite.Utils;
+
+interface ISqliteAttachedDatabaseCollector {
+	IAsyncEnumerable<AttachedDatabase> GetAttachedDatabases(ISqliteConnection conn);
+}

app/Server/Database/Sqlite/Utils/ISqliteConnection.cs

@@ -7,6 +7,8 @@ namespace DHT.Server.Database.Sqlite.Utils;
 interface ISqliteConnection : IAsyncDisposable {
 	SqliteConnection InnerConnection { get; }
 	
+	bool HasAttachedDatabase(string schema);
+	
 	Task BeginTransactionAsync();
 	Task CommitTransactionAsync();
 	Task RollbackTransactionAsync();

app/Server/Database/Sqlite/Utils/InitialDatabaseSettings.cs

@@ -0,0 +1,3 @@
+namespace DHT.Server.Database.Sqlite.Utils;
+
+public sealed record InitialDatabaseSettings(bool SeparateFileForDownloads, bool DownloadsAutoStart);

app/Server/Database/Sqlite/Utils/SqliteConnectionPool.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Common;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using DHT.Utils.Collections;
@@ -9,16 +9,13 @@ using Microsoft.Data.Sqlite;
 namespace DHT.Server.Database.Sqlite.Utils;
 
 sealed class SqliteConnectionPool : IAsyncDisposable {
-	public static async Task<SqliteConnectionPool> Create(SqliteConnectionStringBuilder connectionStringBuilder, int poolSize) {
-		var pool = new SqliteConnectionPool(poolSize);
-		await pool.InitializePooledConnections(connectionStringBuilder);
+	public static async Task<SqliteConnectionPool> Create(SqliteConnectionStringFactory connectionStringFactory, int poolSize, ISqliteAttachedDatabaseCollector attachedDatabaseCollector) {
+		SqliteConnectionPool pool = new SqliteConnectionPool(poolSize, attachedDatabaseCollector);
+		await pool.InitializePooledConnections(connectionStringFactory);
 		return pool;
 	}
 	
-	private static string GetConnectionString(SqliteConnectionStringBuilder connectionStringBuilder) {
-		connectionStringBuilder.Pooling = false;
-		return connectionStringBuilder.ToString();
-	}
+	private readonly ISqliteAttachedDatabaseCollector attachedDatabaseCollector;
 	
 	private readonly int poolSize;
 	private readonly List<PooledConnection> all;
@@ -27,24 +24,35 @@ sealed class SqliteConnectionPool : IAsyncDisposable {
 	private readonly CancellationTokenSource disposalTokenSource = new ();
 	private readonly CancellationToken disposalToken;
 	
-	private SqliteConnectionPool(int poolSize) {
+	private SqliteConnectionPool(int poolSize, ISqliteAttachedDatabaseCollector attachedDatabaseCollector) {
+		this.attachedDatabaseCollector = attachedDatabaseCollector;
+		
 		this.poolSize = poolSize;
 		this.all = new List<PooledConnection>(poolSize);
 		this.free = new ConcurrentPool<PooledConnection>(poolSize);
+		
 		this.disposalToken = disposalTokenSource.Token;
 	}
 	
-	private async Task InitializePooledConnections(SqliteConnectionStringBuilder connectionStringBuilder) {
-		string connectionString = GetConnectionString(connectionStringBuilder);
+	private async Task InitializePooledConnections(SqliteConnectionStringFactory connectionStringFactory) {
+		string connectionString = connectionStringFactory.Create();
+		
+		List<AttachedDatabase> attachedDatabases = [];
 		
 		for (int i = 0; i < poolSize; i++) {
-			var conn = new SqliteConnection(connectionString);
-			conn.Open();
+			SqliteConnection innerConnection = new SqliteConnection(connectionString);
+			await innerConnection.OpenAsync(disposalToken);
 			
-			var pooledConnection = new PooledConnection(this, conn);
+			PooledConnection pooledConnection = new PooledConnection(this, connectionStringFactory, innerConnection);
+			await pooledConnection.Setup(disposalToken);
 			
-			await pooledConnection.ExecuteAsync("PRAGMA journal_mode=WAL", disposalToken);
-			await pooledConnection.ExecuteAsync("PRAGMA foreign_keys=ON", disposalToken);
+			if (i == 0) {
+				attachedDatabases = await attachedDatabaseCollector.GetAttachedDatabases(pooledConnection).ToListAsync(disposalToken);
+			}
+			
+			foreach (var attachedDatabase in attachedDatabases) {
+				await pooledConnection.AttachDatabase(attachedDatabase);
+			}
 			
 			all.Add(pooledConnection);
 			await free.Push(pooledConnection, disposalToken);
@@ -74,48 +82,8 @@ sealed class SqliteConnectionPool : IAsyncDisposable {
 		disposalTokenSource.Dispose();
 	}
 	
-	private sealed class PooledConnection(SqliteConnectionPool pool, SqliteConnection conn) : ISqliteConnection {
-		public SqliteConnection InnerConnection { get; } = conn;
-		
-		private DbTransaction? activeTransaction;
-		
-		public async Task BeginTransactionAsync() {
-			if (activeTransaction != null) {
-				throw new InvalidOperationException("A transaction is already active.");
-			}
-			
-			activeTransaction = await InnerConnection.BeginTransactionAsync();
-		}
-		
-		public async Task CommitTransactionAsync() {
-			if (activeTransaction == null) {
-				throw new InvalidOperationException("No active transaction to commit.");
-			}
-			
-			await activeTransaction.CommitAsync();
-			await activeTransaction.DisposeAsync();
-			activeTransaction = null;
-		}
-		
-		public async Task RollbackTransactionAsync() {
-			if (activeTransaction == null) {
-				throw new InvalidOperationException("No active transaction to rollback.");
-			}
-			
-			await activeTransaction.RollbackAsync();
-			await activeTransaction.DisposeAsync();
-			activeTransaction = null;
-		}
-		
-		public void AssignActiveTransaction(SqliteCommand command) {
-			command.Transaction = (SqliteTransaction?) activeTransaction;
-		}
-		
-		public async ValueTask DisposeAsync() {
-			if (activeTransaction != null) {
-				await RollbackTransactionAsync();
-			}
-			
+	private sealed class PooledConnection(SqliteConnectionPool pool, SqliteConnectionStringFactory connectionStringFactory, SqliteConnection innerConnection) : CustomSqliteConnection(connectionStringFactory, innerConnection) {
+		private protected override async ValueTask DisposeConnection() {
 			await pool.Return(this);
 		}
 	}

app/Server/Database/Sqlite/Utils/SqliteConnectionStringFactory.cs

@@ -0,0 +1,15 @@
+using Microsoft.Data.Sqlite;
+
+namespace DHT.Server.Database.Sqlite.Utils;
+
+sealed record SqliteConnectionStringFactory(string Path) {
+	public string Create() {
+		var builder = new SqliteConnectionStringBuilder {
+			DataSource = Path,
+			Mode = SqliteOpenMode.ReadWriteCreate,
+			Pooling = false,
+		};
+		
+		return builder.ToString();
+	}
+}

app/Server/Download/DownloadExporter.cs

@@ -0,0 +1,152 @@
+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

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

app/Version.cs

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